Merge PR #417 into 16.0

Signed-off-by legalsylvain

Author: github-grap-bot

fermente_mrp_bom_form_view/__manifest__.py

@@ -14,6 +14,7 @@
         # OCA
         "web_widget_numeric_step",
         "mrp_bom_widget_section_and_note_one2many",
+        "mrp_bom_produce_delay_in_hour",
         # GRAP
         "mrp_bom_tag",
         "mrp_bom_line_net_qty",

fermente_mrp_bom_form_view/views/view_mrp_bom.xml

@@ -10,7 +10,35 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
     <!-- MRP Bill of Materials - Form -->
     <!-- ************************************************************ -->
 
-    <record id="view_fermente_mrp_bom_form" model="ir.ui.view">
+
+    <!-- ******** INHERIT BASE VIEW **************************************************** -->
+    <record id="view_fermente_mrp_bom_form_base" model="ir.ui.view">
+        <field name="model">mrp.bom</field>
+        <field name="inherit_id" ref="mrp.mrp_bom_form_view" />
+        <field name="arch" type="xml">
+            <!-- Hide fields -->
+            <xpath expr="//field[@name='type']" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </xpath>
+        </field>
+    </record>
+
+
+    <!-- ******** INHERIT PRODUCE DELAY VIEW **************************************************** -->
+    <record id="view_fermente_mrp_bom_form_produce_delay" model="ir.ui.view">
+        <field name="model">mrp.bom</field>
+        <field name="inherit_id" ref="mrp_bom_produce_delay_in_hour.view_mrp_bom_form_glue_module_produce_delay_add_fields" />
+        <field name="arch" type="xml">
+
+            <xpath expr="//label[@for='produce_delay_in_hour']" position="attributes">
+                <attribute name="string">Produce time</attribute>
+            </xpath>
+
+        </field>
+    </record>
+
+    <!-- ******** INHERIT SECTIONS AND NOTES VIEW **************************************************** -->
+    <record id="view_fermente_mrp_bom_form_sections_and_notes" model="ir.ui.view">
         <field name="model">mrp.bom</field>
         <field name="inherit_id" ref="mrp_bom_widget_section_and_note_one2many.mrp_bom_form_view_section" />
         <field name="arch" type="xml">
@@ -89,4 +117,5 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         </field>
     </record>
 
+
 </odoo>

mrp_bom_wizard_production/__manifest__.py

@@ -13,14 +13,14 @@
     "depends": [
         "mrp_bom_product_price_margin",
         "mrp_bom_simple_report",
+        "mrp_bom_simple_packaging_description",
     ],
     "data": [
         "security/ir.model.access.csv",
         "data/report_paperformat.xml",
         "report/report_bom_purchase_list.xml",
         "report/ir_actions_report.xml",
         "wizard/view_bom_print_purchase_list_wizard.xml",
-        "views/mrp_bom.xml",
         "views/action.xml",
         "views/menu.xml",
     ],

mrp_bom_wizard_production/models/mrp_bom.py

@@ -9,4 +9,3 @@ class MrpBom(models.Model):
     _inherit = "mrp.bom"
 
     currency_id = fields.Many2one(related="product_tmpl_id.currency_id")
-    description_packaging = fields.Char(string="Packaging description")

mrp_bom_wizard_production/readme/ROADMAP.rst

@@ -1,4 +1,3 @@
 - Button in wizard to create purchase and manufacturing orders ?
 - How to handle nested of nested boms ? At the moment, take one level into account
-- Field scope bom.description_packaging in this module ?
 - Fix test04