Merge lp:~mallorymarcot/unifield-server/us-1804 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py'
--- bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py	2016-11-09 09:07:38 +0000
+++ bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py	2016-12-15 08:31:58 +0000
@@ -155,10 +155,6 @@
                       'return to IN form view and re-try.'),
                 )
 
-            self.write(cr, uid, [proc.id], {
-                'already_processed': True,
-            }, context=context)
-
             for line in proc.move_ids:
                 # If one line as an error, return to wizard
                 if line.integrity_status != 'empty':
@@ -172,6 +168,10 @@
                         'context': context,
                     }
 
+            self.write(cr, uid, [proc.id], {
+                'already_processed': True,
+            }, context=context)
+
             for line in proc.move_ids:
                 # if no quantity, don't process the move
                 if not line.quantity:
@@ -318,7 +318,16 @@
                 _('Processing Error'),
                 _('No data to process !'),
             )
-        incoming_obj.write(cr, uid, ids, {'draft': True}, context=context)
+
+        # make sure that the current incoming proc is not already processed :
+        for r in incoming_obj.read(cr, uid, ids, ['already_processed']):
+            if not r['already_processed']:
+                incoming_obj.write(cr, uid, ids, {'draft': True}, context=context)
+            else:
+                raise osv.except_osv(
+                    _('Error'), _('The incoming shipment as already been processed, you can not save it as draft.')
+                )
+
         return {}
 
     def force_process(self, cr, uid, ids, context=None):

=== modified file 'bin/addons/order_types/stock.py'
--- bin/addons/order_types/stock.py	2016-05-17 12:12:38 +0000
+++ bin/addons/order_types/stock.py	2016-12-15 08:31:58 +0000
@@ -326,10 +326,8 @@
 
                 # US-148
                 if pick.type == 'in':
-                    args = [('picking_id', '=', pick.id),
-                            ('draft', '=', True)]
-                    wiz_ids = wizard_obj.search(cr, uid, args=args,
-                                                context=context)
+                    domain = [('picking_id', '=', pick.id), ('draft', '=', True), ('already_processed', '=', False)]
+                    wiz_ids = wizard_obj.search(cr, uid, domain, context=context)
                     if wiz_ids:
                         proc_id = wiz_ids[0]
                     else: