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

[Quentin THEURET @Amaris]

=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
--- bin/addons/msf_outgoing/msf_outgoing.py	2016-03-02 15:57:47 +0000
+++ bin/addons/msf_outgoing/msf_outgoing.py	2016-03-03 11:06:15 +0000
@@ -4232,6 +4232,8 @@
 
     def _create_sync_message_for_field_order(self, cr, uid, picking, context=None):
         fo_obj = self.pool.get('sale.order')
+        rule_obj = self.pool.get('sync.client.message_rule')
+        msg_to_send_obj = self.pool.get('sync.client.message_to_send')
         if picking.sale_id:
             return_info = {}
             if picking.sale_id.original_so_id_sale_order:

=== modified file 'bin/addons/purchase_override/purchase.py'
--- bin/addons/purchase_override/purchase.py	2016-01-25 10:53:51 +0000
+++ bin/addons/purchase_override/purchase.py	2016-03-03 11:06:15 +0000
@@ -1373,6 +1373,7 @@
         pol_obj = self.pool.get('purchase.order.line')
         so_obj = self.pool.get('sale.order')
         sol_obj = self.pool.get('sale.order.line')
+        socl_obj = self.pool.get('sale.order.line.cancel')
         move_obj = self.pool.get('stock.move')
         proc_obj = self.pool.get('procurement.order')
         pick_obj = self.pool.get('stock.picking')
@@ -1401,6 +1402,7 @@
                 if sol_ids:
                     store_to_call += sol_ids
 
+
                     sol = sol_obj.browse(cr, uid, sol_ids[0], context=context)
                     so = sol.order_id
                     # do not update Internal Requests with internal requestor location
@@ -1435,6 +1437,13 @@
                             '|', ('order_id.id', '=', line.order_id.id), ('order_id.state', 'in', ['sourced', 'approved']),
                         ], context=context)
                         for opl in pol_obj.browse(cr, uid, other_po_lines, context=context):
+                            # Check if the other PO line will not be canceled
+                            socl_ids = socl_obj.search(cr, uid, [
+                                ('sync_order_line_db_id', '=', opl.sync_order_line_db_id),
+                            ], limit=1, order='NO_ORDER', context=context)
+                            if socl_ids:
+                                continue
+
                             if opl.product_uom.id != line.product_uom.id:
                                 line_qty += uom_obj._compute_qty(cr, uid, opl.product_uom.id, opl.product_qty, line.product_uom.id)
                             else:

=== modified file 'bin/addons/sync_so/purchase.py'
--- bin/addons/sync_so/purchase.py	2016-01-25 10:53:13 +0000
+++ bin/addons/sync_so/purchase.py	2016-03-03 11:06:15 +0000
@@ -548,7 +548,7 @@
                         if sol.procurement_id and sol.procurement_id.purchase_id:
                             self.pool.get('procurement.order').write(cr, uid, [sol.procurement_id.id], {'purchase_id': po_id}, context=context)
                             line_obj.write(cr, uid, [line.id], {'procurement_id': sol.procurement_id.id}, context=context)
-                            netsvc.LocalService("workflow").trg_change_subflow(uid, 'procurement.order', [sol.procurement_id.id], 'purchase.order', [sol.procurement_id.purchase_id.id], po_id, cr)
+                            netsvc.LocalService("workflow").trg_change_subflow(uid, 'procurement.order', [sol.procurement_id.id], 'purchase.order', [po_id], po_id, cr)
                         if sol.order_id and (not sol.order_id.procurement_request or sol.order_id.location_requestor_id.usage == 'customer'):
                             self.write(cr, uid, [po_id], {'cross_docking_ok': True}, context=context)
 
@@ -646,9 +646,13 @@
         if partner_type in ['section', 'intermission'] and 'analytic_distribution_id' in header_result:
             del header_result['analytic_distribution_id']
 
-        # UTP-661: Get the 'Cross Docking' value of the original PO, and add it into the split PO
-        header_result['cross_docking_ok'] = original_po['cross_docking_ok']
-        header_result['location_id'] = original_po.location_id.id
+        if all(l.move_dest_id and l.move_dest_id.location_id.cross_docking_location_ok for l in original_po.order_line):
+            header_result['cross_docking_ok'] = True
+            header_result['location_id'] = self.pool.get('stock.location').get_cross_docking_location(cr, uid, context=context)
+        else:
+            # UTP-661: Get the 'Cross Docking' value of the original PO, and add it into the split PO
+            header_result['cross_docking_ok'] = original_po['cross_docking_ok']
+            header_result['location_id'] = original_po.location_id.id
 
         default = {}
         default.update(header_result)

=== modified file 'bin/addons/sync_so/sale.py'
--- bin/addons/sync_so/sale.py	2016-01-15 12:59:17 +0000
+++ bin/addons/sync_so/sale.py	2016-03-03 11:06:15 +0000
@@ -335,6 +335,8 @@
         """
         Generate sync. messages manually for the FOs in ids
         """
+        sol_obj = self.pool.get('sale.order.line')
+        solc_obj = self.pool.get('sale.order.line.cancel')
         rule_obj = self.pool.get('sync.client.message_rule')
         msg_to_send_obj = self.pool.get('sync.client.message_to_send')
 
@@ -368,16 +370,30 @@
             }
             return msg_to_send_obj.create(cr, uid, data, context=context)
 
+        solccl_rule = rule_obj.get_rule_by_remote_call(cr, uid, 'sale.order.line.cancel.create_line', context=context)
         nfo_rule = rule_obj.get_rule_by_remote_call(cr, uid, 'purchase.order.normal_fo_create_po', context=context)
         vfo_rule = rule_obj.get_rule_by_remote_call(cr, uid, 'purchase.order.validated_fo_update_original_po', context=context)
         csp_rule = rule_obj.get_rule_by_remote_call(cr, uid, 'purchase.order.create_split_po', context=context)
 
+        solccl_model_obj = solccl_rule and self.pool.get(solccl_rule.model) or None
         nfo_model_obj = nfo_rule and self.pool.get(nfo_rule.model) or None
         vfo_model_obj = vfo_rule and self.pool.get(vfo_rule.model) or None
         csp_model_obj = csp_rule and self.pool.get(csp_rule.model) or None
 
         if original_id:
             orig_partner_name = self.browse(cr, uid, original_id, context=context).partner_id.name
+
+            # Generate messages for cancel lines
+            available_solc_ids = solc_obj.search(cr, uid, eval(solccl_rule.domain),
+                    order='NO_ORDER', context=context)
+            for asolc in solc_obj.browse(cr, uid, available_solc_ids, context=context):
+                sol_ids = sol_obj.search(cr, uid, [
+                    ('order_id', '=', original_id),
+                    ('sync_order_line_db_id', '=', asolc.resource_sync_line_db_id),
+                ], context=context)
+                if sol_ids:
+                    generate_msg_to_send(solccl_rule, solccl_model_obj, asolc.id, orig_partner_name)
+
             available_nfo_ids = self.search(cr, uid, eval(nfo_rule.domain),
                     order='NO_ORDER', context=context)
             if nfo_model_obj and nfo_rule and original_id in available_nfo_ids:
@@ -393,5 +409,4 @@
 
         return
 
-
 sale_order_sync()