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

[jftempo]

=== modified file 'bin/addons/msf_button_access_rights/osv_override.py'
--- bin/addons/msf_button_access_rights/osv_override.py	2015-12-07 14:33:24 +0000
+++ bin/addons/msf_button_access_rights/osv_override.py	2016-07-22 12:29:25 +0000
@@ -124,6 +124,10 @@
     def __init__(self, fakeUid, realUid):
         self.realUid = realUid
 
+    def __reduce__(self):
+        res = super(fakeUid, self).__reduce__()
+        return (res[0], (res[1][1], res[1][1], self.realUid))
+
 super_execute_cr = osv.object_proxy.execute_cr
 
 def execute_cr(self, cr, uid, obj, method, *args, **kw):
 
=== modified file 'bin/addons/purchase/purchase.py'
--- bin/addons/purchase/purchase.py	2015-05-12 07:21:37 +0000
+++ bin/addons/purchase/purchase.py	2016-07-22 12:29:25 +0000
@@ -566,6 +566,7 @@
          @return: new purchase order id
 
         """
+        line_obj = self.pool.get('purchase.order.line')
         wf_service = netsvc.LocalService("workflow")
         def make_key(br, fields):
             list_key = []
@@ -615,6 +616,7 @@
                     order_infos['origin'] = (order_infos['origin'] or '') + ' ' + porder.origin
             order_infos = self._hook_order_infos(cr, uid, order_infos=order_infos, order_id=porder)
 
+            no_proc_ids = []
             for order_line in porder.order_line:
                 line_key = make_key(order_line, ('id', 'order_id', 'name', 'date_planned', 'taxes_id', 'price_unit', 'notes', 'product_id', 'move_dest_id', 'account_analytic_id'))
                 o_line = order_infos['order_line'].setdefault(line_key, {})
@@ -631,8 +633,11 @@
                         o_line[field] = field_val
                     o_line['uom_factor'] = order_line.product_uom and order_line.product_uom.factor or 1.0
                     o_line = self._hook_o_line_value(cr, uid, o_line=o_line, order_line=order_line)
-
-
+                if order_line.procurement_id:
+                    no_proc_ids.append(order_line.id)
+
+            if no_proc_ids:
+                line_obj.write(cr, uid, no_proc_ids, {'procurement_id': False}, context=context)
 
         allorders = []
         orders_info = {}
 
=== modified file 'bin/addons/purchase_override/purchase.py'
--- bin/addons/purchase_override/purchase.py	2016-06-01 08:29:43 +0000
+++ bin/addons/purchase_override/purchase.py	2016-07-22 12:29:25 +0000
@@ -2384,10 +2384,11 @@
                   'confirmed_delivery_date', 'nomenclature_description', 'default_code',
                   'nomen_manda_0', 'nomen_manda_1', 'nomen_manda_2', 'nomen_manda_3',
                   'nomenclature_code', 'name', 'default_name', 'comment', 'date_planned',
-                  'to_correct_ok', 'text_error',
+                  'to_correct_ok', 'text_error', 'select_fo', 'project_ref', 'external_ref',
                   'nomen_sub_0', 'nomen_sub_1', 'nomen_sub_2', 'nomen_sub_3', 'nomen_sub_4',
                   'nomen_sub_5', 'procurement_id', 'change_price_manually', 'old_price_unit',
-                  'origin', 'account_analytic_id', 'product_id', 'company_id', 'notes', 'taxes_id']
+                  'origin', 'account_analytic_id', 'product_id', 'company_id', 'notes', 'taxes_id',
+                  'link_so_id', 'from_fo', 'sale_order_line_id', 'tender_line_id', 'dest_partner_id']
 
         for field in fields:
             field_val = getattr(order_line, field)