[FIX] MRP fix in production operation [IMP] removing phantom on bom.line

3 files changed, 26 insertions, 52 deletions

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 60fcf5b5ffd..c1642412642 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1001,7 +1001,7 @@ class mrp_production(osv.osv):
                 if not float_is_zero(remaining_qty, precision_digits=precision):
                     #consumed more in wizard than previously planned
                     product = self.pool.get('product.product').browse(cr, uid, consume['product_id'], context=context)
-                    extra_move_id = self._make_consume_line_from_data(cr, uid, production, product, product.uom_id.id, remaining_qty, False, 0, context=context)
+                    extra_move_id = self._make_consume_line_from_data(cr, uid, production, product, product.uom_id.id, remaining_qty, context=context)
                     stock_mov_obj.write(cr, uid, [extra_move_id], {'restrict_lot_id': consume['lot_id'],
                                                                     'consumed_for': main_production_move}, context=context)
                     stock_mov_obj.action_done(cr, uid, [extra_move_id], context=context)
diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index e6e85b8e96a..3cd918d5e41 100644
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -238,12 +238,14 @@
         <!-- Resource: mrp.bom -->
 
 
+        <record id="product.product_product_18_product_template" model="product.template">
+            <field name="route_ids" eval="[(6, 0, [ref('stock.route_warehouse0_mto'), ref('mrp.route_warehouse0_manufacture')])]"/>
+        </record>
         <record id="mrp_bom_1" model="mrp.bom">
             <field name="product_tmpl_id" ref="product.product_product_18_product_template"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">5</field>            
+            <field name="sequence">5</field>
             <field name="routing_id" ref="mrp_routing_0"/>
-            <field name="type">normal</field>
         </record>
 
         <record id="mrp_bom_line_1" model="mrp.bom.line">
@@ -251,16 +253,17 @@
             <field name="product_qty">2</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">5</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_1"/>
         </record>
 
+        <record id="product.product_product_19_product_template" model="product.template">
+            <field name="route_ids" eval="[(6, 0, [ref('mrp.route_warehouse0_manufacture')])]"/>
+        </record>
         <record id="mrp_bom_2" model="mrp.bom">
             <field name="product_tmpl_id" ref="product.product_product_19_product_template"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">5</field>            
             <field name="routing_id" ref="mrp_routing_1"/>
-            <field name="type">normal</field>
         </record>
 
         <record id="mrp_bom_line_2" model="mrp.bom.line">
@@ -268,7 +271,6 @@
             <field name="product_qty">4</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">5</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_2"/>
         </record>
 
@@ -276,7 +278,6 @@
             <field name="product_tmpl_id" ref="product.product_product_19_product_template"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">10</field>            
-            <field name="type">normal</field>
         </record>
 
         <record id="mrp_bom_line_3" model="mrp.bom.line">
@@ -284,16 +285,17 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">5</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_3"/>
         </record>
 
+        <record id="product.product_product_27_product_template" model="product.template">
+            <field name="route_ids" eval="[(6, 0, [ref('mrp.route_warehouse0_manufacture')])]"/>
+        </record>
         <record id="mrp_bom_4" model="mrp.bom">
             <field name="product_tmpl_id" ref="product.product_product_27_product_template"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">5</field>            
             <field name="routing_id" ref="mrp_routing_1"/>
-            <field name="type">normal</field>
         </record>
 
         <record id="mrp_bom_line_4" model="mrp.bom.line">
@@ -301,7 +303,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">2</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_4"/>
         </record>
 
@@ -310,7 +311,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">4</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_4"/>
         </record>
 
@@ -319,7 +319,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">6</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_4"/>
         </record>
 
@@ -327,7 +326,6 @@
             <field name="product_tmpl_id" ref="product.product_product_27_product_template"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">10</field>            
-            <field name="type">normal</field>
         </record>
 
         <record id="mrp_bom_line_7" model="mrp.bom.line">
@@ -335,7 +333,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">2</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_5"/>
         </record>
 
@@ -344,7 +341,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">4</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_5"/>
         </record>
 
@@ -353,15 +349,16 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">6</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_5"/>
         </record>
 
+        <record id="product.product_product_16_product_template" model="product.template">
+            <field name="route_ids" eval="[(6, 0, [ref('mrp.route_warehouse0_manufacture')])]"/>
+        </record>
         <record id="mrp_bom_6" model="mrp.bom">
             <field name="product_tmpl_id" ref="product.product_product_16_product_template"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">5</field>            
-            <field name="type">normal</field>
         </record>
 
         <record id="mrp_bom_line_10" model="mrp.bom.line">
@@ -369,7 +366,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">4</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_6"/>
         </record>
 
@@ -378,7 +374,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">6</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_6"/>
         </record>
 
@@ -387,7 +382,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">8</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_6"/>
         </record>
 
@@ -395,7 +389,6 @@
             <field name="product_tmpl_id" ref="product.product_product_16_product_template"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">10</field>            
-            <field name="type">normal</field>
         </record>
 
         <record id="mrp_bom_line_13" model="mrp.bom.line">
@@ -403,7 +396,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">2</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_7"/>
         </record>
 
@@ -412,7 +404,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">4</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_7"/>
         </record>
 
@@ -421,7 +412,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">6</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_7"/>
         </record>
 
@@ -430,22 +420,22 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">10</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_7"/>
         </record>
 
+        <record id="product.product_product_3_product_template" model="product.template">
+            <field name="route_ids" eval="[(6, 0, [ref('mrp.route_warehouse0_manufacture')])]"/>
+        </record>
         <record id="mrp_bom_8" model="mrp.bom">
             <field name="product_tmpl_id" ref="product.product_product_3_product_template"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">5</field>            
-            <field name="type">normal</field>
         </record>
 
         <record id="mrp_bom_property_0" model="mrp.bom">
             <field name="product_tmpl_id" ref="product.product_product_3_product_template"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">5</field>
-            <field name="type">normal</field>
             <field name="property_ids" eval="[(6,0,[ref('mrp_property_0')])]"/>
         </record>
 
@@ -463,7 +453,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">2</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_8"/>
         </record>
 
@@ -472,7 +461,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">4</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_8"/>
         </record>
 
@@ -481,7 +469,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">6</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_8"/>
         </record>
 
@@ -490,7 +477,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">8</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_8"/>
         </record>
 
@@ -499,7 +485,6 @@
             <field name="product_qty">2</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">10</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_8"/>
         </record>
 
@@ -516,7 +501,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">2</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_9"/>
         </record>
 
@@ -525,7 +509,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">4</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_9"/>
         </record>
 
@@ -534,7 +517,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">6</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_9"/>
         </record>
 
@@ -543,7 +525,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">8</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_9"/>
         </record>
 
@@ -552,10 +533,12 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">10</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_9"/>
         </record>
 
+        <record id="product.product_product_5_product_template" model="product.template">
+            <field name="route_ids" eval="[(6, 0, [ref('mrp.route_warehouse0_manufacture')])]"/>
+        </record>
         <record id="mrp_bom_10" model="mrp.bom">
             <field name="product_tmpl_id" ref="product.product_product_5_product_template"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -569,7 +552,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">2</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_10"/>
         </record>
 
@@ -578,7 +560,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">4</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_10"/>
         </record>
 
@@ -587,7 +568,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">6</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_10"/>
         </record>
 
@@ -596,7 +576,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">8</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_10"/>
         </record>
 
@@ -605,22 +584,22 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">10</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_10"/>
         </record>
 
+        <record id="product.product_product_4_product_template" model="product.template">
+            <field name="route_ids" eval="[(6, 0, [ref('mrp.route_warehouse0_manufacture')])]"/>
+        </record>
         <record id="mrp_bom_11" model="mrp.bom">
             <field name="product_tmpl_id" ref="product.product_product_4_product_template"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">1</field>            
-            <field name="type">normal</field>
         </record>
         <record id="mrp_bom_line_32" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_14"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">1</field>            
-            <field name="type">normal</field>
             <field name="attribute_value_ids" eval="[(6,0,[ref('product.product_attribute_value_1')])]"/>
             <field name="bom_id" ref="mrp_bom_11"/>
         </record>
@@ -629,7 +608,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">2</field>            
-            <field name="type">normal</field>
             <field name="attribute_value_ids" eval="[(6,0,[ref('product.product_attribute_value_2')])]"/>
             <field name="bom_id" ref="mrp_bom_11"/>
         </record>
@@ -638,7 +616,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">3</field>            
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_11"/>
         </record>
 
@@ -647,7 +624,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">1</field>
-            <field name="type">normal</field>
             <field name="property_ids" eval="[(6,0,[ref('mrp_property_8')])]"/>
             <field name="bom_id" ref="mrp_bom_property_line"/>
         </record>
@@ -657,7 +633,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">1</field>
-            <field name="type">normal</field>
             <field name="property_ids" eval="[(6,0,[ref('mrp_property_0')])]"/>
             <field name="bom_id" ref="mrp_bom_property_line"/>
         </record>
@@ -667,7 +642,6 @@
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">1</field>
-            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_property_line"/>
         </record>
 
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 7b44e84d72c..ee023b9d0df 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -406,7 +406,7 @@
                                     <field name="date_start"/>
                                     <field name="date_stop"/>
                                     <field name="attribute_value_ids" widget="many2many_tags" domain="[('product_ids.product_tmpl_id', '=', parent.product_tmpl_id)]" groups="product.group_product_variant"/>
-                                    <field name="property_ids" widget="many2many_tags"/>
+                                    <field name="property_ids" widget="many2many_tags" groups="product.group_mrp_properties"/>
                                 </tree>
                             </field>
                         </page>
@@ -514,7 +514,7 @@
                     <field name="date_stop"/>
                     <field name="routing_id"/>
                     <field name="attribute_value_ids" widget="many2many_tags" groups="product.group_product_variant"/>
-                    <field name="property_ids" widget="many2many_tags"/>
+                    <field name="property_ids" widget="many2many_tags" groups="product.group_mrp_properties"/>
                 </tree>
             </field>
         </record>
@@ -950,7 +950,7 @@
                 </xpath>
                 <xpath expr="//field[@name='origin']" position="after">
                     <group colspan="4"  groups="product.group_mrp_properties">
-                        <field colspan="4" name="property_ids" widget="many2many_tags"/>
+                        <field colspan="4" name="property_ids" widget="many2many_tags" groups="product.group_mrp_properties"/>
                     </group>
                 </xpath>
                </data>