Merge lp:~unifield-team/unifield-wm/us_543 into lp:unifield-wm

[jftempo]

=== modified file 'procurement_request/procurement_request.py'
--- procurement_request/procurement_request.py	2015-10-27 09:06:03 +0000
+++ procurement_request/procurement_request.py	2015-11-20 16:48:42 +0000
@@ -518,12 +518,31 @@
 
         return True
 
+    def test_state_done(self, cr, uid, ids, mode, *args):
+        if not self.test_state(cr, uid, ids, mode, *args):
+            return False
+
+        for ir in self.browse(cr, uid, ids):
+            is_out = ir.location_requestor_id.usage == 'customer'
+            if not is_out:
+                return True
+
+            ir_lines = [x.id for x in ir.order_line]
+            out_move_ids = self.pool.get('stock.move').search(cr, uid, [
+                ('picking_id.type', '=', 'out'),
+                ('sale_line_id', 'in', ir_lines),
+                ('state', 'not in', ['done', 'cancel']),
+            ])
+            if out_move_ids:
+                return False
+
+        return True
+
     def procurement_done(self, cr, uid, ids, context=None):
         '''
         Creates all procurement orders according to lines
         '''
         self.write(cr, uid, ids, {'state': 'done'})
-
         return True
 
     def pricelist_id_change(self, cr, uid, ids, pricelist_id):

=== modified file 'procurement_request/procurement_request_workflow.xml'
--- procurement_request/procurement_request_workflow.xml	2012-03-29 09:24:07 +0000
+++ procurement_request/procurement_request_workflow.xml	2015-11-20 16:48:42 +0000
@@ -79,7 +79,7 @@
             <field name="act_to" ref="act_proc_done"/>
             <field name="trigger_model">procurement.order</field>
             <field name="trigger_expr_id">procurement_lines_get()</field>
-            <field name="condition">test_state('finished')</field>
+            <field name="condition"> test_state_done('finished')</field>
         </record>
     
     </data>

=== modified file 'sale_override/sale.py'
=== modified file 'stock_override/stock.py'
--- stock_override/stock.py	2015-11-19 15:17:39 +0000
+++ stock_override/stock.py	2015-11-20 16:48:42 +0000
@@ -2463,12 +2463,15 @@
         wf_service = netsvc.LocalService("workflow")
 
         for wiz in self.browse(cr, uid, ids, context=context):
+            move_id = wiz.move_id.id
+            picking_id = wiz.move_id.picking_id.id
             move_obj.action_cancel(cr, uid, [wiz.move_id.id], context=context)
-            if wiz.move_id.has_to_be_resourced:
-                self.infolog(cr, uid, "The stock.move id:%s of the picking id:%s has been canceled and resourced" % (wiz.move_id.id, wiz.move_id.picking_id.id))
-            else:
-                self.infolog(cr, uid, "The stock.move id:%s of the picking id:%s has been canceled" % (wiz.move_id.id, wiz.move_id.picking_id.id))
             move_ids = move_obj.search(cr, uid, [('id', '=', wiz.move_id.id)], context=context)
+            if move_ids and  wiz.move_id.has_to_be_resourced:
+                self.infolog(cr, uid, "The stock.move id:%s of the picking id:%s has been canceled and resourced" % (move_id, picking_id))
+            else:
+                self.infolog(cr, uid, "The stock.move id:%s of the picking id:%s has been canceled" % (move_id, picking_id))
+
             if move_ids and wiz.move_id.picking_id:
                 lines = wiz.move_id.picking_id.move_lines
                 if all(l.state == 'cancel' for l in lines):