Merge lp:~numerigraphe/openobject-addons/trunk-extra-sale_picking_reservation-procurements into lp:openobject-addons/extra-trunk

[Numérigraphe]

This branch changes sale_picking_reservation so that canceling reservations also cancels the associated procurements.
Otherwise, goods will be purchased or manufactured for nothing.

You can't delete the pickings and cancel the procurements, so I propose to cancel the pickings instead of deleting them.
To this end I added a missing transition to the picking workflow.
Canceling the picking raises exceptions in procurements, which can then be canceled.
Lionel Sausin.

=== modified file 'sale_picking_reservation/__openerp__.py'
--- sale_picking_reservation/__openerp__.py	2012-03-06 16:29:20 +0000
+++ sale_picking_reservation/__openerp__.py	2012-03-06 17:50:26 +0000
@@ -22,7 +22,7 @@
 
 {
     'name': 'sale_picking_reservation',
-    'version': '0.1',
+    'version': '0.2',
     'category': 'Generic Modules',
     'license': 'AGPL-3',
     'description': """This module add the possibility to reserve the product of the quotation line before validating the sale order.""",

=== modified file 'sale_picking_reservation/sale.py'
--- sale_picking_reservation/sale.py	2012-03-06 16:29:20 +0000
+++ sale_picking_reservation/sale.py	2012-03-06 17:50:26 +0000
@@ -54,17 +54,30 @@
 
     def action_reserve(self, cr, uid, ids, *args):
         """Reserve the goods"""
+        self.action_ship_create(cr, uid, ids, {'reserved': True})
         self.write(cr, uid, ids, {'reserved': True})
-        self.action_ship_create(cr, uid, ids, {'reserved': True})
         return True
 
     def action_unreserve(self, cr, uid, ids, *args):
         """Cancel the reservation"""
+        wf_service = netsvc.LocalService("workflow")
         self.write(cr, uid, ids, {'reserved': False})
         for sale in self.browse(cr, uid, ids):
-            # FIXME procurements should be canceled first!
+            # Cancel the picking (deleting it would not cancel the procurements!)
             for picking in sale.picking_ids:
-                picking.unlink()
+                wf_service.trg_validate(uid, 'stock.picking', picking.id,
+                                        'button_cancel', cr)
+            # Cancel the procurements
+            for move in sale.order_line:
+                if move.procurement_id:
+                    # Check that canceling the picking raised procurement exceptions
+                    wf_service.trg_validate(uid, 'procurement.order', 
+                                            move.procurement_id.id,
+                                            'button_check', cr)
+                    # Cancel the procurement
+                    wf_service.trg_validate(uid, 'procurement.order', 
+                                            move.procurement_id.id,
+                                            'button_cancel', cr)
         return True
 
     def action_ship_create(self, cr, uid, ids, *args):

=== modified file 'sale_picking_reservation/stock_workflow.xml'
--- sale_picking_reservation/stock_workflow.xml	2011-11-14 14:57:34 +0000
+++ sale_picking_reservation/stock_workflow.xml	2012-03-06 17:50:26 +0000
@@ -2,7 +2,7 @@
 <!--
   sale_picking_reservation for OpenERP
   Copyright (C) 2011 Akretion Sébastien BEAU <[e-mail]>
-  The licence is in the file __terp__.py
+  The licence is in the file __openerp__.py
 -->
 <openerp>
     <data>
@@ -32,6 +32,13 @@
             <field name="act_to" ref="stock.act_confirmed"/>
             <field name="signal">button_confirm_reserved</field>
         </record>
+        
+        <record id="trans_reserved_picking_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_picking_reserved"/>
+            <field name="act_to" ref="stock.act_cancel"/>
+            <field name="condition">allow_cancel()</field>
+            <field name="signal">button_cancel</field>
+        </record>
 
     </data>
 </openerp>