Merge lp:~unifield-team/unifield-server/us-1267 into lp:unifield-server

[Quentin THEURET @Amaris]

=== modified file 'bin/addons/delivery_mechanism/delivery_mechanism.py'
--- bin/addons/delivery_mechanism/delivery_mechanism.py	2016-05-24 08:44:23 +0000
+++ bin/addons/delivery_mechanism/delivery_mechanism.py	2016-06-06 06:52:40 +0000
@@ -933,6 +933,7 @@
         # Objects
         inc_proc_obj = self.pool.get('stock.incoming.processor')
         move_proc_obj = self.pool.get('stock.move.in.processor')
+        proc_obj = self.pool.get('procurement.order')
         loc_obj = self.pool.get('stock.location')
         uom_obj = self.pool.get('product.uom')
         move_obj = self.pool.get('stock.move')
@@ -1188,6 +1189,7 @@
                             move_obj.write(cr, uid, [proc.move_id.id],
                                 {'product_qty': diff_qty}, context=context)
                         else:
+                            proc_obj.write(cr, uid, [proc.id], {'move_id': move.id}, context=context)
                             # note: do not close move until a diff qty is applied above
                             move_obj.write(cr, uid, [proc.move_id.id], {'product_qty': 0.00, 'state': 'done'}, context=context)