[FIX] vineyard: remove comments

Author: chga-odoo

vineyard/__manifest__.py

@@ -68,11 +68,11 @@
         'demo/mrp_production.xml',
         'demo/mrp_eco_stage.xml',
         'demo/mrp_eco.xml',
-        'demo/mrp_eco_bom_change.xml',
         'demo/ir_attachment_post.xml',
         'demo/project_tags.xml',
-        'demo/project_task_recurrence.xml',
         'demo/project_task.xml',
+        'demo/project_task_recurrence.xml',
+        'demo/project_task_post.xml',
         'demo/quality_point.xml',
         'demo/quality_check.xml',
         'demo/product_supplierinfo.xml',

vineyard/data/ir_actions_act_window.xml

@@ -49,7 +49,7 @@
             ]]></field>
   </record>
   <record id="quality_check_tests_action_window" model="ir.actions.act_window">
-    <!-- <field name="context">{'search_default_x_recipe_iteration': active_id,'default_x_recipe_iteration': active_id}</field> -->
+    <field name="context">{'default_x_recipe_iteration': active_id}</field>
     <field name="context">{}</field>
     <field name="domain">[('x_recipe_iteration', '=', active_id)]</field>
     <field name="name">Tests</field>

vineyard/demo/mrp_eco.xml

@@ -11,8 +11,6 @@
     <field name="kanban_state">normal</field>
     <field name="product_tmpl_id" ref="product_template_15"/>
     <field name="bom_id" ref="mrp_bom_4"/>
-    <!-- <field name="bom_change_ids" eval="[(6, 0, [ref('mrp_eco_bom_change_1'), ref('mrp_eco_bom_change_2'), ref('mrp_eco_bom_change_3'), ref('mrp_eco_bom_change_4')])]"/> -->
-    <!-- <field name="bom_change_ids_on_line" eval="[(6, 0, [ref('mrp_eco_bom_change_1'), ref('mrp_eco_bom_change_2'), ref('mrp_eco_bom_change_3'), ref('mrp_eco_bom_change_4')])]"/> -->
   </record>
   <record id="mrp_eco_2" model="mrp.eco">
     <field name="name">Trial 2</field>
@@ -24,7 +22,5 @@
     <field name="kanban_state">normal</field>
     <field name="product_tmpl_id" ref="product_template_15"/>
     <field name="bom_id" ref="mrp_bom_4"/>
-    <!-- <field name="bom_change_ids" eval="[(6, 0, [ref('mrp_eco_bom_change_8'), ref('mrp_eco_bom_change_9'), ref('mrp_eco_bom_change_10')])]"/> -->
-    <!-- <field name="bom_change_ids_on_line" eval="[(6, 0, [ref('mrp_eco_bom_change_8'), ref('mrp_eco_bom_change_9'), ref('mrp_eco_bom_change_10')])]"/> -->
   </record>
 </odoo>

vineyard/demo/mrp_eco_bom_change.xml

@@ -3,42 +3,30 @@
   <record id="mrp_plm.ecostage_new" model="mrp.eco.stage" forcecreate="1">
     <field name="name">New</field>
     <field name="sequence">1</field>
-    <!-- <field name="type_ids" eval="[(6, 0, [ref('mrp_plm.ecotype0')])]"/> -->
   </record>
   <record id="mrp_plm.ecostage_progress" model="mrp.eco.stage" forcecreate="1">
     <field name="name">In Progress</field>
     <field name="sequence">2</field>
-    <!-- <field name="type_ids" eval="[(6, 0, [ref('mrp_plm.ecotype0')])]"/> -->
   </record>
   <record id="mrp_plm.ecostage_validated" model="mrp.eco.stage" forcecreate="1">
     <field name="name">Validated</field>
     <field name="sequence">3</field>
-    <!-- <field name="allow_apply_change" eval="True"/> -->
-    <!-- <field name="type_ids" eval="[(6, 0, [ref('mrp_plm.ecotype0')])]"/> -->
   </record>
   <record id="mrp_plm.ecostage_effective" model="mrp.eco.stage" forcecreate="1">
     <field name="name">Effective</field>
     <field name="sequence">4</field>
-    <!-- <field name="folded" eval="True"/> -->
-    <!-- <field name="allow_apply_change" eval="True"/> -->
-    <!-- <field name="final_stage" eval="True"/> -->
-    <!-- <field name="type_ids" eval="[(6, 0, [ref('mrp_plm.ecotype0')])]"/> -->
   </record>
   <record id="mrp_plm.ecostage_bom_update_new" model="mrp.eco.stage" forcecreate="1">
     <field name="name">New</field>
     <field name="sequence">5</field>
-    <!-- <field name="type_ids" eval="[(6, 0, [ref('mrp_plm.ecotype_bom_update')])]"/> -->
   </record>
   <record id="mrp_plm.ecostage_bom_update_progress" model="mrp.eco.stage" forcecreate="1">
     <field name="name">In Progress</field>
     <field name="sequence">6</field>
-    <!-- <field name="type_ids" eval="[(6, 0, [ref('mrp_plm.ecotype_bom_update')])]"/> -->
   </record>
   <record id="mrp_plm.ecostage_bom_update_validated" model="mrp.eco.stage" forcecreate="1">
     <field name="name">Validated</field>
     <field name="sequence">7</field>
-    <!-- <field name="allow_apply_change" eval="True"/> -->
-    <!-- <field name="type_ids" eval="[(6, 0, [ref('mrp_plm.ecotype_bom_update')])]"/> -->
   </record>
   <record id="mrp_eco_stage_9" model="mrp.eco.stage">
     <field name="name">Discarded</field>
@@ -50,9 +38,5 @@
   <record id="mrp_plm.ecostage_bom_update_effective" model="mrp.eco.stage" forcecreate="1">
     <field name="name">Effective</field>
     <field name="sequence">9</field>
-    <!-- <field name="folded" eval="True"/>
-    <field name="allow_apply_change" eval="True"/>
-    <field name="final_stage" eval="True"/> -->
-    <!-- <field name="type_ids" eval="[(6, 0, [ref('mrp_plm.ecotype_bom_update')])]"/> -->
   </record>
 </odoo>

vineyard/demo/mrp_eco_stage.xml

@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <odoo noupdate="1">
   <record id="mrp_production_17" model="mrp.production">
-    <!-- <field name="name">WH/MO/000008</field> -->
     <field name="bom_id" ref="mrp_bom_8"/>
     <field name="product_id" ref="product_product_12"/>
     <field name="product_qty">6.0</field>
@@ -13,7 +12,6 @@
     <field name="consumption">warning</field>
   </record>
   <record id="mrp_production_18" model="mrp.production">
-    <!-- <field name="name">WH/MO/000009</field> -->
     <field name="bom_id" ref="mrp_bom_7"/>
     <field name="product_id" ref="product_product_14"/>
     <field name="product_qty">3.0</field>
@@ -25,7 +23,6 @@
     <field name="consumption">warning</field>
   </record>
   <record id="mrp_production_19" model="mrp.production">
-    <!-- <field name="name">WH/MO/000010</field> -->
     <field name="bom_id" ref="mrp_bom_9"/>
     <field name="product_id" ref="product_product_13"/>
     <field name="product_qty">4.0</field>
@@ -37,7 +34,6 @@
     <field name="consumption">warning</field>
   </record>
   <record id="mrp_production_20" model="mrp.production">
-    <!-- <field name="name">WH/MO/000011</field> -->
     <field name="bom_id" ref="mrp_bom_5"/>
     <field name="product_id" ref="product_product_16"/>
     <field name="product_qty">3.0</field>
@@ -49,7 +45,6 @@
     <field name="consumption">warning</field>
   </record>
   <record id="mrp_production_21" model="mrp.production">
-    <!-- <field name="name">WH/MO/000012</field> -->
     <field name="bom_id" ref="mrp_bom_6"/>
     <field name="product_id" ref="product_product_17"/>
     <field name="product_qty">2.5</field>
@@ -61,7 +56,6 @@
     <field name="consumption">warning</field>
   </record>
   <record id="mrp_production_22" model="mrp.production">
-    <!-- <field name="name">WH/MO/000013</field> -->
     <field name="bom_id" ref="mrp_bom_4"/>
     <field name="product_id" ref="product_product_15"/>
     <field name="product_qty">3.0</field>
@@ -73,7 +67,6 @@
     <field name="consumption">warning</field>
   </record>
   <record id="mrp_production_23" model="mrp.production">
-    <!-- <field name="name">WH/MO/000014</field> -->
     <field name="bom_id" ref="mrp_bom_13"/>
     <field name="product_id" ref="product_product_27"/>
     <field name="product_qty">225.0</field>
@@ -85,7 +78,6 @@
     <field name="consumption">warning</field>
   </record>
   <record id="mrp_production_24" model="mrp.production">
-    <!-- <field name="name">WH/MO/000015</field> -->
     <field name="bom_id" ref="mrp_bom_14"/>
     <field name="product_id" ref="product_product_25"/>
     <field name="product_qty">150.0</field>
@@ -97,7 +89,6 @@
     <field name="consumption">warning</field>
   </record>
   <record id="mrp_production_25" model="mrp.production">
-    <!-- <field name="name">WH/MO/000016</field> -->
     <field name="bom_id" ref="mrp_bom_15"/>
     <field name="product_id" ref="product_product_26"/>
     <field name="product_qty">187.5</field>
@@ -109,7 +100,6 @@
     <field name="consumption">warning</field>
   </record>
   <record id="mrp_production_29" model="mrp.production">
-    <!-- <field name="name">WH/MO/000020</field> -->
     <field name="bom_id" ref="mrp_bom_8"/>
     <field name="product_id" ref="product_product_12"/>
     <field name="product_qty">6.0</field>
@@ -121,7 +111,6 @@
     <field name="consumption">warning</field>
   </record>
   <record id="mrp_production_30" model="mrp.production">
-    <!-- <field name="name">WH/MO/000021</field> -->
     <field name="bom_id" ref="mrp_bom_7"/>
     <field name="product_id" ref="product_product_14"/>
     <field name="product_qty">4.5</field>
@@ -133,7 +122,6 @@
     <field name="consumption">warning</field>
   </record>
   <record id="mrp_production_31" model="mrp.production">
-    <!-- <field name="name">WH/MO/000022</field> -->
     <field name="bom_id" ref="mrp_bom_9"/>
     <field name="product_id" ref="product_product_13"/>
     <field name="product_qty">4.0</field>

vineyard/demo/mrp_production.xml

@@ -5,7 +5,7 @@
     <field name="project_id" ref="industry_fsm.fsm_project"/>
     <field name="partner_id" ref="res_partner_29"/>
     <field name="recurring_task" eval="True"/>
-    <field name="recurrence_id" ref="project_task_recurrence_1"/>
+    <!-- <field name="recurrence_id" ref="project_task_recurrence_6"/> -->
     <field name="tag_ids" eval="[(6, 0, [ref('project_tags_3')])]"/>
     <field name="user_ids" eval="[(6, 0, [ref('base.user_admin')])]"/>
     <field name="date_deadline" eval="(datetime.today() - timedelta(days=3)).strftime('%Y-%m-%d 16:00:00')"/>
@@ -17,7 +17,7 @@
     <field name="project_id" ref="industry_fsm.fsm_project"/>
     <field name="partner_id" ref="res_partner_30"/>
     <field name="recurring_task" eval="True"/>
-    <field name="recurrence_id" ref="project_task_recurrence_1"/>
+    <!-- <field name="recurrence_id" ref="project_task_recurrence_7"/> -->
     <field name="tag_ids" eval="[(6, 0, [ref('project_tags_3')])]"/>
     <field name="user_ids" eval="[(6, 0, [ref('base.user_admin')])]"/>
     <field name="date_deadline" eval="(datetime.today() - timedelta(days=1)).strftime('%Y-%m-%d 16:00:00')"/>
@@ -29,7 +29,7 @@
     <field name="project_id" ref="industry_fsm.fsm_project"/>
     <field name="partner_id" ref="res_partner_28"/>
     <field name="recurring_task" eval="True"/>
-    <field name="recurrence_id" ref="project_task_recurrence_1"/>
+    <!-- <field name="recurrence_id" ref="project_task_recurrence_4"/> -->
     <field name="tag_ids" eval="[(6, 0, [ref('project_tags_3')])]"/>
     <field name="user_ids" eval="[(6, 0, [ref('base.user_admin')])]"/>
     <field name="date_deadline" eval="(datetime.today() - timedelta(days=1)).strftime('%Y-%m-%d 16:00:00')"/>
@@ -41,7 +41,7 @@
     <field name="project_id" ref="industry_fsm.fsm_project"/>
     <field name="partner_id" ref="res_partner_28"/>
     <field name="recurring_task" eval="True"/>
-    <field name="recurrence_id" ref="project_task_recurrence_1"/>
+    <!-- <field name="recurrence_id" ref="project_task_recurrence_1"/> -->
     <field name="tag_ids" eval="[(6, 0, [ref('project_tags_1')])]"/>
     <field name="user_ids" eval="[(6, 0, [ref('base.user_admin')])]"/>
     <field name="date_deadline" eval="(datetime.today() + timedelta(days=1)).strftime('%Y-%m-%d 15:30:00')"/>
@@ -53,7 +53,7 @@
     <field name="project_id" ref="industry_fsm.fsm_project"/>
     <field name="partner_id" ref="res_partner_29"/>
     <field name="recurring_task" eval="True"/>
-    <field name="recurrence_id" ref="project_task_recurrence_1"/>
+    <!-- <field name="recurrence_id" ref="project_task_recurrence_2"/> -->
     <field name="tag_ids" eval="[(6, 0, [ref('project_tags_1')])]"/>
     <field name="user_ids" eval="[(6, 0, [ref('base.user_admin')])]"/>
     <field name="date_deadline" eval="(datetime.today() + timedelta(days=1)).strftime('%Y-%m-%d 15:00:00')"/>
@@ -65,7 +65,7 @@
     <field name="project_id" ref="industry_fsm.fsm_project"/>
     <field name="partner_id" ref="res_partner_30"/>
     <field name="recurring_task" eval="True"/>
-    <field name="recurrence_id" ref="project_task_recurrence_1"/>
+    <!-- <field name="recurrence_id" ref="project_task_recurrence_3"/> -->
     <field name="tag_ids" eval="[(6, 0, [ref('project_tags_1')])]"/>
     <field name="user_ids" eval="[(6, 0, [ref('base.user_admin')])]"/>
     <field name="date_deadline" eval="(datetime.today() + timedelta(days=2)).strftime('%Y-%m-%d 10:00:00')"/>
@@ -78,7 +78,7 @@
     <field name="partner_id" ref="base.main_partner"/>
     <field name="partner_phone">+1 650-691-3277</field>
     <field name="recurring_task" eval="True"/>
-    <field name="recurrence_id" ref="project_task_recurrence_1"/>
+    <!-- <field name="recurrence_id" ref="project_task_recurrence_5"/> -->
     <field name="tag_ids" eval="[(6, 0, [ref('project_tags_2')])]"/>
     <field name="user_ids" eval="[(6, 0, [ref('base.user_admin')])]"/>
     <field name="date_deadline" eval="(datetime.today() + timedelta(days=15)).strftime('%Y-%m-%d 15:00:00')"/>

vineyard/demo/project_task.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo noupdate="1">
+  <function model="project.task" name="action_fsm_validate">
+    <value eval="[
+      ref('project_task_7'),
+      ref('project_task_8'),
+      ref('project_task_9')]"
+    />
+  </function>
+</odoo>

vineyard/demo/project_task_post.xml

@@ -1,8 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <odoo noupdate="1">
-    <record id="project_task_recurrence_1" model="project.task.recurrence">
-        <field name="repeat_interval">1</field>
-        <field name="repeat_unit">year</field>
-        <field name="repeat_type">forever</field>
-    </record>
+  <record id="project_task_recurrence_1" model="project.task.recurrence">
+    <field name="repeat_interval">1</field>
+    <field name="repeat_unit">year</field>
+    <field name="repeat_type">forever</field>
+    <field name="task_ids" eval="[(6, 0, [ref('project_task_3')])]"/>
+  </record>
+  <record id="project_task_recurrence_2" model="project.task.recurrence">
+    <field name="repeat_interval">1</field>
+    <field name="repeat_unit">year</field>
+    <field name="repeat_type">forever</field>
+    <field name="task_ids" eval="[(6, 0, [ref('project_task_4')])]"/>
+  </record>
+  <record id="project_task_recurrence_3" model="project.task.recurrence">
+    <field name="repeat_interval">1</field>
+    <field name="repeat_unit">year</field>
+    <field name="repeat_type">forever</field>
+    <field name="task_ids" eval="[(6, 0, [ref('project_task_5')])]"/>
+  </record>
+  <record id="project_task_recurrence_4" model="project.task.recurrence">
+    <field name="repeat_interval">1</field>
+    <field name="repeat_unit">year</field>
+    <field name="repeat_type">forever</field>
+    <field name="task_ids" eval="[(6, 0, [ref('project_task_7')])]"/>
+  </record>
+  <record id="project_task_recurrence_5" model="project.task.recurrence">
+    <field name="repeat_interval">1</field>
+    <field name="repeat_unit">year</field>
+    <field name="repeat_type">forever</field>
+    <field name="task_ids" eval="[(6, 0, [ref('project_task_6')])]"/>
+  </record>
+  <record id="project_task_recurrence_6" model="project.task.recurrence">
+    <field name="repeat_interval">1</field>
+    <field name="repeat_unit">year</field>
+    <field name="repeat_type">forever</field>
+    <field name="task_ids" eval="[(6, 0, [ref('project_task_8')])]"/>
+  </record>
+  <record id="project_task_recurrence_7" model="project.task.recurrence">
+    <field name="repeat_interval">1</field>
+    <field name="repeat_unit">year</field>
+    <field name="repeat_type">forever</field>
+    <field name="task_ids" eval="[(6, 0, [ref('project_task_9')])]"/>
+  </record>
 </odoo>

vineyard/demo/project_task_recurrence.xml

@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <odoo noupdate="1">
   <record id="quality_check_1" model="quality.check">
-    <!-- <field name="name">QC00001</field> -->
     <field name="point_id" ref="quality_point_8"/>
     <field name="x_recipe_iteration" ref="mrp_eco_1"/>
     <field name="test_type_id" ref="quality_control.test_type_passfail"/>
@@ -17,7 +16,6 @@
 <li><p><strong>Maturation / oak recommendations:</strong> Medium oak aging recommended to integrate tannins and enhance finish.</p></li></ol>]]></field>
   </record>
   <record id="quality_check_5" model="quality.check">
-    <!-- <field name="name">QC00005</field> -->
     <field name="point_id" ref="quality_point_8"/>
     <field name="x_recipe_iteration" ref="mrp_eco_2"/>
     <field name="test_type_id" ref="quality_control.test_type_passfail"/>