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

[jftempo]

=== modified file 'bin/addons/purchase_override/purchase.py'
--- bin/addons/purchase_override/purchase.py	2016-09-08 12:01:45 +0000
+++ bin/addons/purchase_override/purchase.py	2016-09-29 12:10:17 +0000
@@ -1361,9 +1361,6 @@
             list_po_name = ', '.join([linked_po['name'] for linked_po in self.read(cr, uid, ids_to_read, ['name'], context)])
             self.log(cr, uid, ids[0], _("The order %s is in confirmed (waiting) state and will be confirmed once the related orders [%s] would have been confirmed"
                                  ) % (self.read(cr, uid, ids[0], ['name'])['name'], list_po_name))
-        # sale order lines with modified state
-        if sol_ids:
-            sol_obj.write(cr, uid, sol_ids, {'state': 'confirmed'}, context=context)
 
         # !!BEWARE!! we must update the So lines before any writing to So objects
         for po in self.browse(cr, uid, ids, context=context):
@@ -1373,6 +1370,10 @@
             del context['wait_order']
             self.infolog(cr, uid, "The PO id:%s (%s) has been confirmed" % (po.id, po.name))
 
+        # sale order lines with modified state
+        if sol_ids:
+            sol_obj.write(cr, uid, sol_ids, {'state': 'confirmed'}, context=context)
+
         return True
 
     def compute_confirmed_delivery_date(self, cr, uid, ids, confirmed, prep_lt, ship_lt, est_transport_lead_time, db_date_format, context=None):