testing 2

Author: dhrs-odoo

cleaning_services/__manifest__.py

@@ -9,9 +9,9 @@
         'crm_sale_subscription',
         'hr_skills',
         'industry_fsm_sale_report',
+        'knowledge',
         'project_purchase',
         'project_sale_subscription',
-        'knowledge',
         'web_studio',
     ],
     'data': [
@@ -49,9 +49,7 @@
         'demo/product_supplierinfo.xml',
         'demo/sale_order.xml',
         'demo/sale_order_line.xml',
-        # 'demo/sale_order_confirm.xml',
-        # 'demo/sale_order_state.xml',
-        'demo/project_task.xml',
+        'demo/sale_order_confirm.xml',
         'demo/account_analytic_line.xml',
         'demo/purchase_order.xml',
         'demo/purchase_order_line.xml',

cleaning_services/data/product_product.xml

@@ -13,6 +13,7 @@
     <field name="service_type">manual</field>
     <field name="invoice_policy">order</field>
     <field name="default_code">CLN-CRP-07</field>
+    <field name="project_id" ref="industry_fsm.fsm_project"/>
   </record>
   <record id="product_product_56" model="product.product">
     <field name="name">Air Duct Cleaning</field>
@@ -27,6 +28,7 @@
     <field name="service_type">manual</field>
     <field name="invoice_policy">order</field>
     <field name="default_code">CLN-DCT-09</field>
+    <field name="project_id" ref="industry_fsm.fsm_project"/>
   </record>
   <record id="product_product_57" model="product.product">
     <field name="name">Graffiti Removal</field>
@@ -40,6 +42,7 @@
     <field name="service_type">manual</field>
     <field name="invoice_policy">order</field>
     <field name="default_code">CLN-GRF-10</field>
+    <field name="project_id" ref="industry_fsm.fsm_project"/>
   </record>
   <record id="product_product_18" model="product.product">
     <field name="name">Residential Cleaning</field>
@@ -54,6 +57,7 @@
     <field name="service_type">manual</field>
     <field name="invoice_policy">order</field>
     <field name="default_code">CLN-HM-02</field>
+    <field name="project_id" ref="industry_fsm.fsm_project"/>
   </record>
   <record id="product_product_58" model="product.product">
     <field name="name">Kitchen Degreasing Service</field>
@@ -67,6 +71,7 @@
     <field name="service_type">manual</field>
     <field name="invoice_policy">order</field>
     <field name="default_code">CLN-KIT-11</field>
+    <field name="project_id" ref="industry_fsm.fsm_project"/>
   </record>
   <record id="product_product_17" model="product.product">
     <field name="name">Office Deep Cleaning</field>
@@ -81,6 +86,7 @@
     <field name="service_type">manual</field>
     <field name="invoice_policy">order</field>
     <field name="default_code">CLN-OFC-01</field>
+    <field name="project_id" ref="industry_fsm.fsm_project"/>
   </record>
   <record id="product_product_55" model="product.product">
     <field name="name">Post-Construction Cleanup</field>
@@ -95,6 +101,7 @@
     <field name="service_type">manual</field>
     <field name="invoice_policy">order</field>
     <field name="default_code">CLN-PC-08</field>
+    <field name="project_id" ref="industry_fsm.fsm_project"/>
   </record>
   <record id="product_product_59" model="product.product">
     <field name="name">Pressure Washing</field>
@@ -109,6 +116,7 @@
     <field name="service_type">manual</field>
     <field name="invoice_policy">order</field>
     <field name="default_code">CLN-PW-12</field>
+    <field name="project_id" ref="industry_fsm.fsm_project"/>
   </record>
   <record id="product_product_60" model="product.product">
     <field name="name">Commercial Restroom Cleaning</field>
@@ -123,6 +131,7 @@
     <field name="service_type">manual</field>
     <field name="invoice_policy">order</field>
     <field name="default_code">CLN-RST-13</field>
+    <field name="project_id" ref="industry_fsm.fsm_project"/>
   </record>
   <record id="product_product_20" model="product.product">
     <field name="name">Sanitization Service</field>
@@ -137,6 +146,7 @@
     <field name="service_type">manual</field>
     <field name="invoice_policy">order</field>
     <field name="default_code">CLN-SNT-04</field>
+    <field name="project_id" ref="industry_fsm.fsm_project"/>
   </record>
   <record id="product_product_61" model="product.product">
     <field name="name">Upholstery Cleaning</field>
@@ -150,6 +160,7 @@
     <field name="service_type">manual</field>
     <field name="invoice_policy">order</field>
     <field name="default_code">CLN-UPH-14</field>
+    <field name="project_id" ref="industry_fsm.fsm_project"/>
   </record>
   <record id="product_product_19" model="product.product">
     <field name="name">Window Cleaning</field>
@@ -163,6 +174,7 @@
     <field name="service_type">manual</field>
     <field name="invoice_policy">order</field>
     <field name="default_code">CLN-WND-03</field>
+    <field name="project_id" ref="industry_fsm.fsm_project"/>
   </record>
   <record id="product_product_65" model="product.product">
     <field name="name">Heavy-Duty Scrub Brushes</field>
@@ -271,5 +283,6 @@
     <field name="invoice_policy">order</field>
     <field name="recurring_invoice" eval="True"/>
     <field name="product_subscription_pricing_ids" eval="[(6,0,[ref('sale_subscription_pricing_1')])]"/>
+    <field name="project_id" ref="industry_fsm.fsm_project"/>
   </record>
 </odoo>

cleaning_services/demo/account_analytic_line.xml

@@ -1,54 +1,63 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <odoo noupdate="1">
     <record id="account_analytic_line_11" model="account.analytic.line">
+    <field name="name">Regular cleaning Visit</field>
     <field name="product_id" ref="product_product_68"/>
     <field name="unit_amount">3.0</field>
-    <field name="task_id" search="[('sale_line_id', '=', ref('sale_order_line_9'))]"/>
+    <field name="task_id" model="project.task" eval="obj().search([('sale_line_id', '=', ref('sale_order_line_9'))]).id"/>
     <field name="employee_id" ref="hr.employee_admin"/>
   </record>
   <record id="account_analytic_line_10" model="account.analytic.line">
+    <field name="name">Regular cleaning Visit</field>
     <field name="product_id" ref="product_product_68"/>
     <field name="unit_amount">3.0</field>
-    <field name="task_id" search="[('sale_line_id', '=', ref('sale_order_line_9'))]"/>
+    <field name="task_id" model="project.task" eval="obj().search([('sale_line_id', '=', ref('sale_order_line_9'))]).id"/>
     <field name="employee_id" ref="hr.employee_admin"/>
   </record>
   <record id="account_analytic_line_7" model="account.analytic.line">
+    <field name="name">Regular cleaning Visit</field>
     <field name="product_id" ref="product_product_68"/>
     <field name="unit_amount">1.0</field>
-    <field name="task_id" search="[('sale_line_id', '=', ref('sale_order_line_9'))]"/>
+    <field name="task_id" model="project.task" eval="obj().search([('sale_line_id', '=', ref('sale_order_line_9'))]).id"/>
     <field name="employee_id" ref="hr.employee_admin"/>
   </record>
   <record id="account_analytic_line_6" model="account.analytic.line">
+    <field name="name">Regular cleaning Visit</field>
     <field name="product_id" ref="product_product_68"/>
     <field name="unit_amount">1.0</field>
-    <field name="task_id" search="[('sale_line_id', '=', ref('sale_order_line_9'))]"/>
+    <field name="task_id" model="project.task" eval="obj().search([('sale_line_id', '=', ref('sale_order_line_9'))]).id"/>
     <field name="employee_id" ref="hr.employee_admin"/>
   </record>
   <record id="account_analytic_line_5" model="account.analytic.line">
+    <field name="name">Regular cleaning Visit</field>
     <field name="product_id" ref="product_product_68"/>
     <field name="unit_amount">3.0</field>
-    <field name="task_id" search="[('sale_line_id', '=', ref('sale_order_line_9'))]"/>
+    <field name="task_id" model="project.task" eval="obj().search([('sale_line_id', '=', ref('sale_order_line_9'))]).id"/>
     <field name="employee_id" ref="hr.employee_admin"/>
   </record>
   <record id="account_analytic_line_9" model="account.analytic.line">
+    <field name="name">Regular cleaning Visit</field>
     <field name="product_id" ref="product_product_68"/>
     <field name="unit_amount">1.0</field>
-    <field name="task_id" search="[('sale_line_id', '=', ref('sale_order_line_9'))]"/>
+    <field name="task_id" model="project.task" eval="obj().search([('sale_line_id', '=', ref('sale_order_line_9'))]).id"/>
     <field name="employee_id" ref="hr.employee_admin"/>
   </record>
   <record id="account_analytic_line_8" model="account.analytic.line">
+    <field name="name">Regular cleaning Visit</field>
     <field name="product_id" ref="product_product_68"/>
     <field name="unit_amount">1.0</field>
-    <field name="task_id" search="[('sale_line_id', '=', ref('sale_order_line_9'))]"/>
+    <field name="task_id" model="project.task" eval="obj().search([('sale_line_id', '=', ref('sale_order_line_9'))]).id"/>
     <field name="employee_id" ref="hr.employee_admin"/>
   </record>
   <record id="account_analytic_line_4" model="account.analytic.line">
+    <field name="name">Office deep clean</field>
     <field name="employee_id" ref="hr.employee_admin"/>
-    <field name="task_id" search="[('sale_line_id', '=', ref('sale_order_line_11'))]"/>
+    <field name="task_id" model="project.task" eval="obj().search([('sale_line_id', '=', ref('sale_order_line_11'))]).id"/>
     <field name="product_id" ref="product_product_17"/>
   </record>
   <record id="account_analytic_line_3" model="account.analytic.line">
-    <field name="task_id" search="[('sale_line_id', '=', ref('sale_order_line_3'))]"/>
+    <field name="name">Carpet Cleaning</field>
+    <field name="task_id" model="project.task" eval="obj().search([('sale_line_id', '=', ref('sale_order_line_3'))]).id"/>
     <field name="employee_id" ref="hr_employee_3"/>
     <field name="product_id" ref="product_product_54"/>
   </record>