Merge lp:~jfb-tempo-consulting/unifield-server/US-3196 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/purchase/purchase_order.py'
--- bin/addons/purchase/purchase_order.py	2018-04-03 10:31:44 +0000
+++ bin/addons/purchase/purchase_order.py	2018-04-27 10:13:06 +0000
@@ -1686,6 +1686,9 @@
         elif order_type == 'direct':
             v['cross_docking_ok'] = False
 
+        if order_type == 'regular' and v['invoice_method'] == 'picking':
+            v['cross_docking_ok'] = True
+
         if order_type == 'purchase_list' and delivery_requested_date:
             v.update({'delivery_confirmed_date': delivery_requested_date})
         # UF-1440: Add today's date if no date and you choose "purchase_list" PO