Merge lp:~donkirkby/openobject-addons/complete-procurement into lp:openobject-addons/5.0

[Don Kirkby]

This now fixes bug lp:532148, as well as adding a unit test that shows the problem.

[Olivier Dony (Odoo) (odo-openerp)]

Excellent, we'll merge this along with the bugfix.

I also propose to start putting the tests into a separate test/ subdirectory in each module, in case we have many of them (and we'll also put the future yaml ones there as well)

Many thanks for helping up with the regression testing!

review: Approve

[Don Kirkby (donkirkby)]

OK, the branch now contains a fix as well as the unit test. Please review again.

=== modified file 'mrp/__terp__.py'
--- mrp/__terp__.py	2009-02-03 17:02:20 +0000
+++ mrp/__terp__.py	2011-01-06 23:27:08 +0000
@@ -72,7 +72,7 @@
         'process/service_product_process.xml',
         'process/procurement_process.xml'
     ],
-    'demo_xml': ['mrp_demo.xml', 'mrp_order_point.xml'],
+    'demo_xml': ['mrp_demo.xml', 'mrp_order_point.xml', 'mrp_test.xml'],
     'installable': True,
     'active': False,
     'certificate': '0032052481373',

=== added file 'mrp/mrp_test.xml'
--- mrp/mrp_test.xml	1970-01-01 00:00:00 +0000
+++ mrp/mrp_test.xml	2011-01-06 23:27:08 +0000
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+    
+    	<!-- ================================================================  
+			  Smoke test for automated purchase process.
+			  
+			   0. Create a procurement order
+			   1. Run the procurement
+			   2. Check that the purchase order was created
+			   3. Confirm the purchase order
+			   4. Receive the goods
+			   5. Check that the procurement order was marked as done.
+			   
+    	     ================================================================
+    	-->
+    	
+    	<!-- ==== 0. Create a procurement order ==== -->
+		<record id="test_procurement_1" model="mrp.procurement">
+			<field name="product_uom" ref="product.product_uom_unit"/>
+			<field eval="3.0" name="product_qty"/>
+			<field name="product_uos" ref="product.product_uom_unit"/>
+			<field name="location_id" ref="stock.stock_location_stock"/>
+			<field eval="0" name="close_move"/>
+			<field name="name">test</field>
+			<field name="procure_method">make_to_order</field>
+			<field name="product_id" ref="product.product_product_mb1"/>
+		</record>
+    	
+    	<!-- ==== 1. Run the procurement ==== -->  
+        <workflow 
+        	model="mrp.procurement" 
+        	ref="test_procurement_1" 
+        	action="button_confirm" />
+        <workflow 
+        	model="mrp.procurement" 
+        	ref="test_procurement_1" 
+        	action="button_check" />
+        
+    	<!-- ==== 2. Check that the purchase order was created ==== -->  
+        <assert 
+        	model="mrp.procurement" 
+        	id="test_procurement_1" 
+        	string="Test procurement's purchase order state">
+            <test expr="purchase_id.state">draft</test>
+        </assert>
+        <assert 
+        	model="mrp.procurement" 
+        	id="test_procurement_1" 
+        	string="Test procurement's state">
+            <test expr="state">running</test>
+        </assert>
+        
+    	<!-- ==== 3. Confirm the purchase order ==== -->  
+        <workflow model="purchase.order" action="purchase_confirm" >
+        	<value 
+        		model="mrp.procurement" 
+        		eval="obj(ref('test_procurement_1')).purchase_id.id"/>
+        </workflow>
+        
+        <assert 
+        	model="mrp.procurement" 
+        	id="test_procurement_1" 
+        	string="Test procurement's purchase order state">
+            <test expr="purchase_id.state">confirmed</test>
+        </assert>
+        
+        <workflow 
+        	model="purchase.order" 
+        	action="purchase_approve" 
+        	uid="base.user_root" >
+        	<value 
+        		model="mrp.procurement" 
+        		eval="obj(ref('test_procurement_1')).purchase_id.id"/>
+        </workflow>
+        
+        <assert 
+        	model="mrp.procurement" 
+        	id="test_procurement_1" 
+        	string="Test procurement's purchase order state">
+            <test expr="purchase_id.state">approved</test>
+        </assert>
+
+    	<!-- ==== 4. Receive the goods ==== -->  
+        <!-- Do the same as in wizard_partial_picking lines 143-144
+        	(copied from purchase_unit_test.xml) -->
+        <function model="stock.picking" name="action_move">
+        	<value 
+        		model="mrp.procurement" 
+        		eval="[obj(ref('test_procurement_1')).purchase_id.picking_ids[0].id]"/>
+        </function>
+        
+        <workflow model="stock.picking" action="button_done">
+        	<value 
+        		model="mrp.procurement" 
+        		eval="obj(ref('test_procurement_1')).purchase_id.picking_ids[0].id"/>
+        </workflow>
+        
+    	<!-- ==== 5. Check that the procurement order was marked as done. ==== -->  
+        <assert 
+        	model="mrp.procurement" 
+        	id="test_procurement_1" 
+        	string="Test procurement's purchase order's picking's state">
+            <test expr="purchase_id.picking_ids[0].state">done</test>
+        </assert>
+        
+        <assert 
+        	model="mrp.procurement" 
+        	id="test_procurement_1" 
+        	string="Test procurement's purchase order's state">
+        	<!-- not done because we didn't process the invoice. -->
+            <test expr="purchase_id.state">approved</test>
+        </assert>
+        
+        <assert 
+        	model="mrp.procurement" 
+        	id="test_procurement_1" 
+        	string="Test procurement's state">
+            <test expr="state">done</test>
+        </assert>
+	</data>
+</openerp>
\ No newline at end of file

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2010-09-03 10:10:26 +0000
+++ purchase/purchase.py	2011-01-06 23:27:08 +0000
@@ -424,7 +424,18 @@
                         'purchase_line_id': order_line.id,
                     })
                     if order_line.move_dest_id:
-                        self.pool.get('stock.move').write(cr, uid, [order_line.move_dest_id.id], {'location_id':order.location_id.id})
+                        # make the procurement's stock move into a dummy move
+                        # (source == destination) and mark it as auto validate
+                        # so that the procurement will complete when the
+                        # purchase shipment arrives. 
+                        self.pool.get('stock.move').write(
+                            cr, 
+                            uid, 
+                            [order_line.move_dest_id.id], 
+                            {
+                                'location_id': order.location_id.id, 
+                                'auto_validate': True
+                            })
                     todo_moves.append(move)    
             self.pool.get('stock.move').action_confirm(cr, uid, todo_moves)
             self.pool.get('stock.move').force_assign(cr, uid, todo_moves)