Merge lp:~zaber/openobject-addons/phantom-bom-moves into lp:openobject-addons/5.0

[Don Kirkby]

Test and bug fix for bug lp:700154.

Unmerged revisions

2881. By Don Kirkby on 2011-01-07

[FIX] Link move_dest_id to original phantom product move for bug lp:700154.

2880. By Don Kirkby on 2011-01-07

[FIX] Call action_confirm() to fix part of bug lp:700154.

2879. By Don Kirkby on 2011-01-07

[IMP] Add failing test for bug lp:700154 phantom BOM sales order

2878. By Don Kirkby on 2011-01-07

[MERGE] tweak demo data so that we can sell a product with a phantom BOM (PC0). Merged from phantom-bom-workflow branch.

=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2010-12-30 06:18:22 +0000
+++ mrp/mrp.py	2011-01-07 23:47:54 +0000
@@ -1208,9 +1208,6 @@
                 factor = move.product_qty
                 bom_point = self.pool.get('mrp.bom').browse(cr, uid, bis[0])
                 res = self.pool.get('mrp.bom')._bom_explode(cr, uid, bom_point, factor, [])
-                state = 'confirmed'
-                if move.state=='assigned':
-                    state='assigned'
                 for line in res[0]:
                     valdef = {
                         'picking_id': move.picking_id.id,
@@ -1219,13 +1216,15 @@
                         'product_qty': line['product_qty'],
                         'product_uos': line['product_uos'],
                         'product_uos_qty': line['product_uos_qty'],
-                        'state': state,
+                        'state': 'draft',
                         'name': line['name'],
+                        'move_dest_id': move.id,
                         'move_history_ids': [(6,0,[move.id])],
                         'move_history_ids2': [(6,0,[])],
                         'procurements': []
                     }
                     mid = self.pool.get('stock.move').copy(cr, uid, move.id, default=valdef)
+                    self.action_confirm(cr, uid, [mid], context)
                     prodobj = self.pool.get('product.product').browse(cr, uid, line['product_id'], context=context)
                     proc_id = self.pool.get('mrp.procurement').create(cr, uid, {
                         'name': (move.picking_id.origin or ''),
@@ -1272,10 +1271,10 @@
     #
     # Explode picking by replacing phantom BoMs
     #
-    def action_explode(self, cr, uid, picks, *args):
-        for move in self.pool.get('stock.move').browse(cr, uid, picks):
+    def action_explode(self, cr, uid, moves, *args):
+        for move in self.pool.get('stock.move').browse(cr, uid, moves):
             self.pool.get('stock.move')._action_explode(cr, uid, move)
-        return picks
+        return moves
 
 StockPicking()
 

=== modified file 'mrp/mrp_demo.xml'
--- mrp/mrp_demo.xml	2010-02-17 12:18:07 +0000
+++ mrp/mrp_demo.xml	2011-01-07 23:47:54 +0000
@@ -238,12 +238,6 @@
             <field name="name">Complete PC with peripherals</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
-            <field model="product.product" name="product_id" ref="product.product_product_23"/>
-        </record>
-        <record id="mrp_bom_11" model="mrp.bom">
-            <field name="name">RAM on demand</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
             <field model="product.product" name="product_id" ref="product.product_product_23"/>
         </record>
@@ -260,9 +254,9 @@
             <field name="name">Kit Mouse</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
-            <field name="type">normal</field>
+            <field name="type">phantom</field>
             <field name="bom_id" ref="mrp_bom_10"/>
-            <field model="product.product" name="product_id" ref="product.product_product_25"/>
+            <field model="product.product" name="product_id" ref="product.product_product_26"/>
         </record>
         <record id="mrp_bom_clavier" model="mrp.bom">
             <field name="name">Keyboard</field>
@@ -306,13 +300,6 @@
             <field name="bom_id" ref="mrp_bom_13"/>
             <field model="product.product" name="product_id" ref="product.product_product_fan"/>
         </record>
-        <record id="mrp_bom_23" model="mrp.bom">
-            <field name="name">DDR 256MB PC333</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_qty">1.0</field>
-            <field name="bom_id" ref="mrp_bom_11"/>
-            <field model="product.product" name="product_id" ref="product.product_product_ram"/>
-        </record>
         <record id="mrp_bom_1901" model="mrp.bom">
             <field name="name">DDR 512MB PC400</field>
             <field name="product_uom" ref="product.product_uom_unit"/>

=== modified file 'mrp_jit/test/mrp_jit_test.xml'
--- mrp_jit/test/mrp_jit_test.xml	2010-03-11 13:05:02 +0000
+++ mrp_jit/test/mrp_jit_test.xml	2011-01-07 23:47:54 +0000
@@ -166,6 +166,114 @@
         <assert id="smoke_test_sale_order" model="sale.order" string="the sale order is now done">
             <test expr="state">done</test>
         </assert>
+
+
+
+    	<!-- ================================================================  
+			  Test phantom bill of materials with MRP-JIT installed,
+			  based on a similar smoke test in 'sale' module
+			  
+			   0. Check that the set product is configured correctly
+			   1. creates a simple sale order with 1 line using a set product
+			   2. confirms the sale order
+			   3. Check that a chained move got created for each component
+			   4. Check that no production order is created
+			   
+    	     ================================================================
+    	-->
+    	
+    	<!-- ==== 0. Check that the set product is configured correctly ==== -->
+        <assert 
+        	id="product.product_product_23" 
+        	model="product.product" 
+        	string="The PC with peripherals product is configured as a set.">
+            <test expr="name">Complete PC With Peripherals</test>
+            <test expr="code">PC0</test>
+            <test expr="supply_method">produce</test>
+            <test expr="procure_method">make_to_order</test>
+        </assert>
+        <assert 
+        	id="mrp.mrp_bom_10"
+        	model="mrp.bom"
+        	string="The PC with peripherals product has a phantom BOM.">
+            <test expr="type">phantom</test>
+            <test expr="product_id.code">PC0</test>
+        </assert>
+        <assert 
+        	id="product.product_product_26" 
+        	model="product.product" 
+        	string="The keyboard + mouse product is configured as a set.">
+            <test expr="name">Kit Keyboard + Mouse</test>
+            <test expr="code">KIT0</test>
+            <test expr="supply_method">produce</test>
+            <test expr="procure_method">make_to_order</test>
+        </assert>
+        <assert
+        	id="mrp.mrp_bom_kit" 
+        	model="mrp.bom"
+        	string="The keyboard + mouse product has a phantom BOM.">
+            <test expr="type">phantom</test>
+            <test expr="product_id.code">KIT0</test>
+        </assert>
+
+    	<!-- ==== 1. creates a simple sale order with 1 line using a set product ==== -->  
+        <!-- Resource: sale.order -->
+        <record id="phantom_sale_order" model="sale.order">
+            <field name="shop_id" ref="sale.shop"/>
+            <field model="product.pricelist" name="pricelist_id" search="[]"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field model="res.partner" name="partner_id" search="[]"/>
+            <field name="order_policy">manual</field> <!-- force manual invoicing -->
+            <field name="picking_policy">one</field> <!-- full delivery only -->
+            <field name="invoice_quantity">order</field> <!-- invoice based on ordered quantities -->
+            <field model="res.partner.address" name="partner_invoice_id" search="[]"/>
+            <field model="res.partner.address" name="partner_shipping_id" search="[]"/>
+            <field model="res.partner.address" name="partner_order_id" search="[]"/>
+            <field name="name">SO-PHANTOM-JIT</field>
+        </record>
+        <record id="phantom_sale_order_line_1" model="sale.order.line">
+            <field name="order_id" ref="phantom_sale_order"/>
+            <field name="name">[PC0] Complete PC With Peripherals</field>
+            <field name="product_id" ref="product.product_product_23"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+            <field name="price_unit">750</field>
+            <field name="product_uom_qty">1</field>
+            <field name="product_uos_qty">1</field>
+            <field name="type">make_to_order</field>
+        </record>
+
+        <!-- ==== 2. confirms the sale order ==== --> 
+        <workflow action="order_confirm" model="sale.order" ref="phantom_sale_order"/>
+
+        <assert 
+        	id="phantom_sale_order" 
+        	model="sale.order" 
+        	string="the sale order is now in 'Manual in progress' state">
+            <test expr="state">manual</test>
+        </assert>
+        
+        <!-- ==== 3. Check that both packing lists contain set contents ==== -->
+        <assert 
+        	model="sale.order" 
+        	id="phantom_sale_order"
+        	string="stock moves for phantom product (stock to output and output to cust)">
+            <test expr="str(len(order_line[0].move_ids)) + ' stock moves'">7 stock moves</test>
+            <test expr="order_line[0].move_ids[0].product_id.code">PC0</test>
+            <test expr="order_line[0].move_ids[1].product_id.code + ' - ' + order_line[0].move_ids[1].picking_id.type">KEYA - out</test>
+            <test expr="order_line[0].move_ids[2].product_id.code + ' - ' + order_line[0].move_ids[2].picking_id.type">KEYA - delivery</test>
+            <test expr="order_line[0].move_ids[3].product_id.code + ' - ' + order_line[0].move_ids[3].picking_id.type">MOU - out</test>
+            <test expr="order_line[0].move_ids[4].product_id.code + ' - ' + order_line[0].move_ids[4].picking_id.type">MOU - delivery</test>
+            <test expr="order_line[0].move_ids[5].product_id.code + ' - ' + order_line[0].move_ids[5].picking_id.type">PC1 - out</test>
+            <test expr="order_line[0].move_ids[6].product_id.code + ' - ' + order_line[0].move_ids[6].picking_id.type">PC1 - delivery</test>
+        </assert>
+        
+        <!-- ==== 4. Check that no production order is created ==== -->
+        <assert 
+        	model="mrp.production"
+        	search="[('product_id', '=', ref('product.product_product_23'))]"
+        	string="There should not be any production orders for the set product">
+            <test expr="False"/>
+        </assert>
     </data>
     
     <data>

=== modified file 'product/product_demo.xml'
--- product/product_demo.xml	2010-04-23 13:26:04 +0000
+++ product/product_demo.xml	2011-01-07 23:47:54 +0000
@@ -349,6 +349,7 @@
         <record id="product_product_23" model="product.product">
             <field name="default_code">PC0</field>
             <field name="supply_method">produce</field>
+            <field name="procure_method">make_to_order</field>
             <field name="list_price">750.0</field>
             <field name="standard_price">500.0</field>
             <field name="uom_id" ref="product_uom_unit"/>
@@ -378,6 +379,7 @@
         <record id="product_product_26" model="product.product">
             <field name="default_code">KIT0</field>
             <field name="supply_method">produce</field>
+            <field name="procure_method">make_to_order</field>
             <field name="list_price">7.0</field>
             <field name="standard_price">5.0</field>
             <field name="uom_id" ref="product_uom_unit"/>

=== modified file 'sale/test/sale_test.xml'
--- sale/test/sale_test.xml	2010-06-10 13:40:19 +0000
+++ sale/test/sale_test.xml	2011-01-07 23:47:54 +0000
@@ -173,6 +173,152 @@
         <assert id="smoke_test_sale_order" model="sale.order" string="the sale order is now done">
             <test expr="state">done</test>
         </assert>
+
+    
+    	<!-- ================================================================  
+			  Test phantom bill of materials
+			  
+			   0. Check that the set product is configured correctly
+			   1. creates a simple sale order with 1 line using a set product
+			   2. confirms the sale order
+			   3. Check that a chained move got created for each component 
+			   4. Check that no production order is created
+			   5. Picking: check availability
+			   6. Make the delivery
+			   7. Verify that everything is done
+			   
+    	     ================================================================
+    	-->
+    	
+    	<!-- ==== 0. Check that the set product is configured correctly ==== -->
+        <assert 
+        	id="product.product_product_23" 
+        	model="product.product" 
+        	string="The PC with peripherals product is configured as a set.">
+            <test expr="name">Complete PC With Peripherals</test>
+            <test expr="code">PC0</test>
+            <test expr="supply_method">produce</test>
+            <test expr="procure_method">make_to_order</test>
+        </assert>
+        <assert 
+        	id="mrp.mrp_bom_10"
+        	model="mrp.bom"
+        	string="The PC with peripherals product has a phantom BOM.">
+            <test expr="type">phantom</test>
+            <test expr="product_id.code">PC0</test>
+        </assert>
+        <assert 
+        	id="product.product_product_26" 
+        	model="product.product" 
+        	string="The keyboard + mouse product is configured as a set.">
+            <test expr="name">Kit Keyboard + Mouse</test>
+            <test expr="code">KIT0</test>
+            <test expr="supply_method">produce</test>
+            <test expr="procure_method">make_to_order</test>
+        </assert>
+        <assert
+        	id="mrp.mrp_bom_kit" 
+        	model="mrp.bom"
+        	string="The keyboard + mouse product has a phantom BOM.">
+            <test expr="type">phantom</test>
+            <test expr="product_id.code">KIT0</test>
+        </assert>
+
+    	<!-- ==== 1. creates a simple sale order with 1 line using a set product ==== -->  
+        <!-- Resource: sale.order -->
+        <record id="phantom_sale_order" model="sale.order">
+            <field name="shop_id" ref="shop"/>
+            <field model="product.pricelist" name="pricelist_id" search="[]"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field model="res.partner" name="partner_id" search="[]"/>
+            <field name="order_policy">manual</field> <!-- force manual invoicing -->
+            <field name="picking_policy">one</field> <!-- full delivery only -->
+            <field name="invoice_quantity">order</field> <!-- invoice based on ordered quantities -->
+            <field model="res.partner.address" name="partner_invoice_id" search="[]"/>
+            <field model="res.partner.address" name="partner_shipping_id" search="[]"/>
+            <field model="res.partner.address" name="partner_order_id" search="[]"/>
+            <field name="name">SO-PHANTOM</field>
+        </record>
+        <record id="phantom_sale_order_line_1" model="sale.order.line">
+            <field name="order_id" ref="phantom_sale_order"/>
+            <field name="name">[PC0] Complete PC With Peripherals</field>
+            <field name="product_id" ref="product.product_product_23"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+            <field name="price_unit">750</field>
+            <field name="product_uom_qty">1</field>
+            <field name="product_uos_qty">1</field>
+            <field name="type">make_to_order</field>
+        </record>
+
+        <!-- ==== 2. confirms the sale order ==== --> 
+        <workflow action="order_confirm" model="sale.order" ref="phantom_sale_order"/>
+
+        <assert 
+        	id="phantom_sale_order" 
+        	model="sale.order" 
+        	string="the sale order is now in 'Manual in progress' state">
+            <test expr="state">manual</test>
+        </assert>
+        
+        <!-- ==== 3. Check that a chained move got created for each component ==== -->
+        <assert 
+        	model="sale.order" 
+        	id="phantom_sale_order"
+        	string="stock moves for phantom product (stock to output and output to cust)">
+            <test expr="str(len(order_line[0].move_ids)) + ' stock moves'">7 stock moves</test>
+            <test expr="order_line[0].move_ids[0].product_id.code">PC0</test>
+            <test expr="order_line[0].move_ids[1].product_id.code + ' - ' + order_line[0].move_ids[1].picking_id.type">KEYA - out</test>
+            <test expr="order_line[0].move_ids[2].product_id.code + ' - ' + order_line[0].move_ids[2].picking_id.type">KEYA - delivery</test>
+            <test expr="order_line[0].move_ids[3].product_id.code + ' - ' + order_line[0].move_ids[3].picking_id.type">MOU - out</test>
+            <test expr="order_line[0].move_ids[4].product_id.code + ' - ' + order_line[0].move_ids[4].picking_id.type">MOU - delivery</test>
+            <test expr="order_line[0].move_ids[5].product_id.code + ' - ' + order_line[0].move_ids[5].picking_id.type">PC1 - out</test>
+            <test expr="order_line[0].move_ids[6].product_id.code + ' - ' + order_line[0].move_ids[6].picking_id.type">PC1 - delivery</test>
+        </assert>
+        
+        <!-- ==== 4. Check that no production order is created ==== -->
+        <assert 
+        	model="mrp.production"
+        	search="[('product_id', '=', ref('product.product_product_23'))]"
+        	string="There should not be any production orders for the set product">
+            <test expr="False"/>
+        </assert>
+		<!-- ==== 5. Picking: check availability  ==== -->
+        <!-- Here we need to directly call the function tag because action_assign is a method of stock_picking and not part of the workflow -->
+        <function model="stock.picking" name="action_assign">
+            <value eval="[obj(ref('phantom_sale_order')).picking_ids[0].id]" model="sale.order"/>
+        </function>
+        <assert id="phantom_sale_order" model="sale.order" severity="error" string="the sale order's picking is now assigned">
+            <test expr="picking_ids[0].state">assigned</test>
+        </assert>
+        
+        <!-- The above step could also be replaced by the following call to the mrp schedulers:  -->
+        <!-- <function model="mrp.procurement" name="run_scheduler"/> -->
+
+        <!-- ==== 6. Make the delivery ==== -->
+        <!-- See wizard_picking_make or wizard_partial_picking in stock module. -->
+        <function model="stock.picking" name="action_move">
+            <value eval="[obj(ref('phantom_sale_order')).picking_ids[0].id]" model="sale.order"/>
+        </function>
+        <workflow action="button_done" model="stock.picking">
+            <value eval="obj(ref('phantom_sale_order')).picking_ids[0].id" model="sale.order"/>
+        </workflow>
+        <function model="stock.picking" name="action_move">
+            <value eval="[obj(ref('phantom_sale_order')).order_line[0].move_ids[6].picking_id.id]" model="sale.order"/>
+        </function>
+        <workflow action="button_done" model="stock.picking">
+            <value eval="obj(ref('phantom_sale_order')).order_line[0].move_ids[6].picking_id.id" model="sale.order"/>
+        </workflow>
+        
+        
+        <!-- ==== 7. Verify that everything is done ==== -->
+        <assert id="phantom_sale_order" model="sale.order" string="the main procurement is now done">
+            <test expr="order_line[0].procurement_id.state">done</test>
+        </assert>
+        <assert id="phantom_sale_order" model="sale.order" string="the sale order's picking is now done">
+            <test expr="picking_ids[0].state">done</test>
+            <test expr="order_line[0].move_ids[3].picking_id.state">done</test>
+            <test expr="shipped == True"/>
+        </assert>
     </data>