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

[jftempo]

=== modified file 'bin/addons/msf_doc_import/sale_order.py'
--- bin/addons/msf_doc_import/sale_order.py	2016-08-18 08:32:03 +0000
+++ bin/addons/msf_doc_import/sale_order.py	2017-02-02 13:42:30 +0000
@@ -327,6 +327,8 @@
                     vals['to_correct_ok'] = False
                     vals['text_error'] = False
 
+        if vals.get('state') in ('done', 'cancel'):
+            context['bypass_product_constraints'] = True
         return super(sale_order_line, self).write(cr, uid, ids, vals, context=context)
 
     def create(self, cr, uid, vals, context=None):

=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
--- bin/addons/msf_outgoing/msf_outgoing.py	2017-01-31 10:50:12 +0000
+++ bin/addons/msf_outgoing/msf_outgoing.py	2017-02-02 13:42:30 +0000
@@ -1271,7 +1271,7 @@
                     today = time.strftime(date_format)
                     today_db = time.strftime(db_date_format)
                     so_obj.write(cr, uid, [new_packing.sale_id.id], {'shipment_date': today_db, }, context=context)
-                    so_obj.log(cr, uid, new_packing.sale_id.id, _("Shipment Date of the Field Order '%s' has been updated to %s.") % (new_packing.sale_id.name, today))
+                    so_obj.log(cr, uid, new_packing.sale_id.id, _("Shipment Date of the Field Order '%s' has been updated to %s.") % (new_packing.sale_id.name, tools.ustr(today)))
 
                 # update locations of stock moves
                 for move in new_packing.move_lines:

=== modified file 'bin/addons/purchase_override/purchase.py'
--- bin/addons/purchase_override/purchase.py	2017-01-23 16:14:11 +0000
+++ bin/addons/purchase_override/purchase.py	2017-02-02 13:42:30 +0000
@@ -1264,8 +1264,8 @@
                 if line.soq_updated:
                     reset_soq.append(line.id)
 
-                # check if the current product is stopped or not :
-                if line.product_id and line.product_id.state and line.product_id.state.id == stopped_id:
+                # check if the current product is stopped or not : If the PO was created by Sync. engine, do not check
+                if not po.push_fo and line.product_id and line.product_id.state and line.product_id.state.id == stopped_id:
                     raise osv.except_osv(_('Error'), _('You can not validate a PO with stopped products (line %s).') % (line.line_number, ))
 
             message = _("Purchase order '%s' is validated.") % (po.name,)
@@ -1600,9 +1600,7 @@
 
                     sol = sol_obj.browse(cr, uid, sol_ids[0], context=context)
                     so = sol.order_id
-                    # do not update Internal Requests with internal requestor location
-                    if so and so.procurement_request and so.location_requestor_id.usage != 'customer':
-                        continue
+                    # US-1931: Remove code that do not update Internal Requests with internal requestor location
 
                     line_confirmed = False
                     # compute confirmed date for line

=== modified file 'bin/addons/sourcing/sale_order_line.py'
--- bin/addons/sourcing/sale_order_line.py	2016-11-17 10:50:45 +0000
+++ bin/addons/sourcing/sale_order_line.py	2017-02-02 13:42:30 +0000
@@ -1027,7 +1027,7 @@
                         _("You can't Source to an 'External' partner if you don't have product."),
                     )
 
-            if line.state not in ('draft', 'cancel') and line.product_id and line.supplier:
+            if line.state not in ('draft', 'cancel') and line.product_id and line.supplier and not context.get('bypass_product_constraints'):
                 # Check product constraints (no external supply, no storage...)
                 check_fnct = product_obj._get_restriction_error
                 self._check_product_constraints(cr, uid, line.type, line.po_cft, line.product_id.id, line.supplier.id, check_fnct, context=context)