Merge lp:~unifield-team/unifield-wm/sync-utp-872-various-fixes into lp:unifield-wm/sync

[jftempo]

=== modified file 'msf_sync_data_server/data/sync_server.message_rule.csv'
--- msf_sync_data_server/data/sync_server.message_rule.csv	2013-12-12 16:31:10 +0000
+++ msf_sync_data_server/data/sync_server.message_rule.csv	2013-12-18 20:24:09 +0000
@@ -7,11 +7,19 @@
 po_updates_so_ref,TRUE,TRUE,"['name','state','partner_ref']","['&','&',('partner_type','!=','external'),('state','in',['confirmed','sourced','split', 'approved']),('partner_ref','!=',False)]",partner_id,MISSION,sale.order.update_sub_so_ref,purchase.order,PO updates SO ref,6
 validated_po_updates_so,FALSE,TRUE,"['name', 'partner_ref','analytic_distribution_id/id', 'delivery_requested_date','details','notes', 'categ', 'order_type', 'priority', 'loan_duration','order_line/product_id/id', 'order_line/product_id/name','order_line/id', 'order_line/name', 'order_line/product_qty', 'order_line/product_uom', 'order_line/price_unit', 'order_line/analytic_distribution_id/id','order_line/comment','order_line/have_analytic_distribution_from_header','order_line/line_number', 'order_line/nomen_manda_0/id','order_line/nomen_manda_1/id','order_line/nomen_manda_2/id','order_line/nomen_manda_3/id', 'order_line/sync_order_line_db_id', 'order_line/nomenclature_description','order_line/notes','order_line/default_name','order_line/default_code','order_line/date_planned']","['&',('partner_type','!=','external'),('state','in',['sourced', 'approved'])]",partner_id,MISSION,sale.order.validated_po_update_validated_so,purchase.order,Validated PO updates SO,7
 canceled_fo_cancels_po,TRUE,TRUE,"['name','state', 'client_order_ref']","[('state', '=', 'cancel')]",partner_id,MISSION,purchase.order.canceled_fo_cancel_po,sale.order,Canceled FO cancels PO,18
-partial_shipped_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/usage']","['&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['standard', 'packing']), ('state', '=', 'done'), ('already_shipped', '=', True)]",partner_id,MISSION,stock.picking.partial_shipped_fo_updates_in_po,stock.picking,Partial shipped at Coordo updates IN at Project,19
+partial_shipped_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/prodlot_id/id', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/usage']","['&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['standard', 'packing']), ('state', '=', 'done'), ('already_shipped', '=', True)]",partner_id,MISSION,stock.picking.partial_shipped_fo_updates_in_po,stock.picking,Partial shipped at Coordo updates IN at Project,19
 cancel_out_at_coordo_cancels_in_at_project,TRUE,TRUE,"['name', 'state', 'origin']","['&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'),('state', '=', 'cancel'),('subtype', '=', 'standard')]",partner_id,MISSION,stock.picking.cancel_out_pick_cancel_in,stock.picking,Canceled OUT at Coordo cancels IN at Project,20
+<<<<<<< TREE
 cancel_pick_at_coordo_cancels_in_at_project,TRUE,TRUE,"['name', 'state', 'origin']","['&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'),('state', '=', 'cancel'),('subtype', '=', 'picking'),('backorder_id', '=', False)]",partner_id,MISSION,stock.picking.cancel_out_pick_cancel_in,stock.picking,Canceled PICK at Coordo cancels IN at Project,21
 closed_in_validates_delivery_out_ship,TRUE,TRUE,"['name', 'state', 'shipment_ref']","['&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'in'),('subtype', 'in', ['standard']), ('state', '=', 'done'), ('shipment_ref', '!=', False)]",partner_id,MISSION,stock.picking.closed_in_validates_delivery_out_ship,stock.picking,Closed IN validates delivery of OUT-SHIP,22
 create_batch_object,TRUE,TRUE,"['name', 'xmlid_name', 'prefix', 'product_id/id', 'partner_id/id', 'date', 'ref','life_date','sequence_id','type']","[('name', '=', False)]",partner_id,MISSION,stock.picking.create_batch_number,stock.production.lot,Create Batch Object,1001
 create_asset_object,TRUE,TRUE,"['name', 'xmlid_name', 'arrival_date', 'asset_type_id/id', 'partner_id/id', 'brand', 'comment', 'description', 'hq_ref', 'international_po', 'invo_certif_depreciation', 'invo_currency/id', 'invo_date', 'invo_donator_code', 'invo_num', 'invo_supplier', 'invo_value', 'local_ref', 'model', 'orig_mission_code', 'product_id/id', 'project_po', 'receipt_place', 'serial_nb', 'type', 'year']","[('name', '=', False)]",partner_id,MISSION,stock.picking.create_asset,product.asset,Create Asset Object,1002
+=======
+cancel_pick_at_coordo_cancels_in_at_project,TRUE,TRUE,"['name', 'state', 'origin']","['&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'),('state', '=', 'cancel'),('subtype', '=', 'picking')]",partner_id,MISSION,stock.picking.cancel_out_pick_cancel_in,stock.picking,Canceled PICK at Coordo cancels IN at Project,21
+cancel_stock_move_at_coordo_cancels_in_at_project,TRUE,TRUE,"['name', 'state', 'origin']","['&','&','&','&',('picking_id.partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'),('state', '=', 'cancel'),('picking_id.subtype', '=', 'picking'),('picking_id.state', '=', 'done')]",partner_id,MISSION,stock.picking.cancel_stock_move_of_pick_cancel_in,stock.move,Canceled stock move cancels IN,22
+closed_in_validates_delivery_out_ship,TRUE,TRUE,"['name', 'state', 'shipment_ref']","['&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'in'),('subtype', 'in', ['standard']), ('state', '=', 'done'), ('shipment_ref', '!=', False)]",partner_id,MISSION,stock.picking.closed_in_validates_delivery_out_ship,stock.picking,Closed IN validates delivery of OUT-SHIP,25
+create_batch_object,TRUE,TRUE,"['name', 'xmlid_name', 'prefix', 'product_id/id', 'instance_id/id', 'date', 'ref','life_date','sequence_id','type']","[('name', '=', False)]",partner_id,MISSION,stock.picking.create_batch_number,stock.production.lot,Create Batch Object,1001
+create_asset_object,TRUE,TRUE,"['name', 'xmlid_name', 'arrival_date', 'asset_type_id/id', 'instance_id/id', 'brand', 'comment', 'description', 'hq_ref', 'international_po', 'invo_certif_depreciation', 'invo_currency/id', 'invo_date', 'invo_donator_code', 'invo_num', 'invo_supplier', 'invo_value', 'local_ref', 'model', 'orig_mission_code', 'product_id/id', 'project_po', 'receipt_place', 'serial_nb', 'type', 'year']","[('name', '=', False)]",partner_id,MISSION,stock.picking.create_asset,product.asset,Create Asset Object,1002
+>>>>>>> MERGE-SOURCE
 USB_purchase_order_close,TRUE,TRUE,['name'],,name,USB,purchase.order.msg_close,purchase.order,[PO] close,1500
 USB_incoming_shipment_close,TRUE,TRUE,['name'],,name,USB,stock.picking.msg_close,stock.picking,[IN] close,1501

=== modified file 'sync_so/picking.py'
--- sync_so/picking.py	2013-12-12 16:31:10 +0000
+++ sync_so/picking.py	2013-12-18 20:24:09 +0000
@@ -71,6 +71,11 @@
 
         expired_date = data['expired_date']
 
+        # UTP-872: Add also the state into the move line, but if it is done, then change it to assigned (available)
+        state = data['state'] 
+        if state == 'done':
+            state = 'assigned'
+
         # build a dic which can be used directly to update the stock move
         result = {'line_number': data['line_number'],
                   'product_id': product_id,
@@ -78,6 +83,7 @@
                   'product_uos': uom_id,
                   'date': data['date'],
                   'date_expected': data['date_expected'],
+                  'state': state, 
 
                   'prodlot_id': batch_id,
                   'expired_date': expired_date,
@@ -143,7 +149,7 @@
             shipment_ref = source + "." +  pick_dict.get('name', False) # the case of OUT
         
         # Then from this PO, get the IN with the reference to that PO, and update the data received from the OUT of FO to this IN
-        in_id = so_po_common.get_in_id_by_state(cr, uid, po_id, po_name, 'assigned', context)
+        in_id = so_po_common.get_in_id_by_state(cr, uid, po_id, po_name, ['assigned'], context)
         if in_id:
             partial_datas = {}
             partial_datas[in_id] = {}
@@ -201,7 +207,7 @@
             return message
         else:
             # still try to check whether this IN has already been manually processed
-            in_id = so_po_common.get_in_id_by_state(cr, uid, po_id, po_name, 'done', context)
+            in_id = so_po_common.get_in_id_by_state(cr, uid, po_id, po_name, ['done', 'shipped'], context)
             if not in_id:
                 message = "The IN linked to " + po_name + " is not found in the system!"
                 self._logger.info(message)
@@ -255,6 +261,9 @@
 
 
     def cancel_out_pick_cancel_in(self, cr, uid, source, out_info, context=None):
+        '''
+        ' Cancel the OUT/PICK at the supplier side cancels the corresponding IN at the project side
+        '''
         if not context:
             context = {}
         self._logger.info("+++ Cancel the relevant IN at %s due to the cancel of OUT at supplier %s"%(cr.dbname, source))
@@ -274,8 +283,59 @@
                 # Cancel the IN object
                 wf_service.trg_validate(uid, 'stock.picking', in_id, 'button_cancel', cr)
                 return True
-
-        raise Exception("There is a problem when cancel of the IN at project")
+            else:
+                # UTP-872: If there is no IN corresponding to the give OUT/SHIP/PICK, then check if the PO has any line
+                # if it has no line, then no need to raise error, because PO without line does not generate any IN
+                po = po_obj.browse(cr, uid, [po_id], context=context)[0]
+                if len(po.order_line) == 0:
+                    message = "The message is ignored as there is no corresponding IN (because the PO " + po.name + " has no line)"
+                    self._logger.info(message)
+                    return message
+
+        raise Exception("There is a problem (no PO or IN found) when cancel the IN at project")
+
+    def cancel_stock_move_of_pick_cancel_in(self, cr, uid, source, out_info, context=None):
+        '''
+        ' UTP-872: Cancel only a few move lines of a closed PICK ticket in Coordo will also need to cancel the relevant lines at the IN
+        '''
+        if not context:
+            context = {}
+        self._logger.info("+++ Cancel the relevant IN at %s due to the cancel of some specific move of the Pick ticket at supplier %s"%(cr.dbname, source))
+
+        wf_service = netsvc.LocalService("workflow")
+        so_po_common = self.pool.get('so.po.common')
+        po_obj = self.pool.get('purchase.order')
+        pick_dict = out_info.to_dict()
+
+        # Look for the PO name, which has the reference to the FO on Coordo as source.out_info.origin
+        so_ref = source + "." + pick_dict['origin']
+        po_id = so_po_common.get_po_id_by_so_ref(cr, uid, so_ref, context)
+        if po_id:
+            # Then from this PO, get the IN with the reference to that PO, and update the data received from the OUT of FO to this IN
+            in_id = so_po_common.get_in_id_from_po_id(cr, uid, po_id, context)
+            if in_id:
+                # Cancel the IN object to have all lines cancelled, but the IN object remained as closed, so the update of state is done right after
+                wf_service.trg_validate(uid, 'stock.picking', in_id, 'button_cancel', cr)
+                self.write(cr, uid, in_id, {'state': 'done'}, context) # UTP-872: reset state of the IN to become closed
+                return True
+            else:
+                po = po_obj.browse(cr, uid, [po_id], context=context)[0]
+                if len(po.order_line) == 0:
+                    message = "The message is ignored as there is no corresponding IN (because the PO " + po.name + " has no line)"
+                    self._logger.info(message)
+                    return message
+                
+                # UTP-872: If there is no IN corresponding to the give OUT/SHIP/PICK, then check if the PO has any line
+                # if it has no line, then no need to raise error, because PO without line does not generate any IN
+                # still try to check whether this IN has already been manually processed
+                in_id = so_po_common.get_in_id_by_state(cr, uid, po_id, po.name, ['done'], context)
+                if in_id:
+                    message = "The IN linked to " + po.name + " has been closed already, this message is thus ignored!"
+                    self._logger.info(message)
+                    return message
+
+        raise Exception("There is a problem (no PO or IN found) when cancel the IN at project")
+
 
     def closed_in_validates_delivery_out_ship(self, cr, uid, source, out_info, context=None):
         if not context:
@@ -588,9 +648,14 @@
                     cr, uid,
                     context['changes']['stock.move'].keys(),
                     context=context):
+<<<<<<< TREE
                 if self.pool.get('stock.move').exists(cr, uid, rec_line.id, context):
                     lines.setdefault(rec_line.picking_id.id, {})[rec_line.id] = \
                          context['changes']['stock.move'][rec_line.id]
+=======
+                if self.pool.get('stock.move').exists(cr, uid, rec_line.id, context): # check the line exists
+                    lines.setdefault(rec_line.picking_id.id, {})[rec_line.id] = context['changes']['stock.move'][rec_line.id]
+>>>>>>> MERGE-SOURCE
         # monitor changes on purchase.order
         for id, changes in changes.items():
             logger = get_sale_purchase_logger(cr, uid, self, id, \

=== modified file 'sync_so/purchase.py'
--- sync_so/purchase.py	2013-12-12 16:31:10 +0000
+++ sync_so/purchase.py	2013-12-18 20:24:09 +0000
@@ -293,6 +293,11 @@
                 
         return True
 
+    # UTP-872: If the PO is a split one, then still allow it to be confirmed without po_line 
+    def _hook_check_po_no_line(self, po, context):
+        if not po.split_po and not po.order_line:
+            raise osv.except_osv(_('Error !'), _('You can not confirm purchase order without Purchase Order Lines.'))
+
     def validated_fo_update_original_po(self, cr, uid, source, so_info, context=None):
         if not context:
             context = {}
@@ -368,6 +373,7 @@
         #    dict_of_purchase.order.line_changes
         lines = {}
         if 'purchase.order.line' in context['changes']:
+<<<<<<< TREE
             lines_changed = context['changes']['purchase.order.line']
             # UF-2244: remove the lines that have been deleted --
             lines_to_delete = []
@@ -380,6 +386,14 @@
             
             for rec_line in self.pool.get('purchase.order.line').browse(cr, uid,lines_changed.keys(),context=context):
                 lines.setdefault(rec_line.order_id.id, {})[rec_line.id] = lines_changed[rec_line.id]
+=======
+            for rec_line in self.pool.get('purchase.order.line').browse(
+                    cr, uid,
+                    context['changes']['purchase.order.line'].keys(),
+                    context=context):
+                if self.pool.get('purchase.order.line').exists(cr, uid, rec_line.id, context): # check the line exists
+                    lines.setdefault(rec_line.order_id.id, {})[rec_line.id] = context['changes']['purchase.order.line'][rec_line.id]
+>>>>>>> MERGE-SOURCE
         # monitor changes on purchase.order
         for id, changes in changes.items():
             logger = get_sale_purchase_logger(cr, uid, self, id, \

=== modified file 'sync_so/sale.py'
--- sync_so/sale.py	2013-12-02 16:25:20 +0000
+++ sync_so/sale.py	2013-12-18 20:24:09 +0000
@@ -180,8 +180,8 @@
                     cr, uid,
                     context['changes']['sale.order.line'].keys(),
                     context=context):
-                lines.setdefault(rec_line.order_id.id, {})[rec_line.id] = \
-                     context['changes']['sale.order.line'][rec_line.id]
+                if self.pool.get('sale.order.line').exists(cr, uid, rec_line.id, context): # check the line exists
+                    lines.setdefault(rec_line.order_id.id, {})[rec_line.id] = context['changes']['sale.order.line'][rec_line.id]
         # monitor changes on purchase.order
         for id, changes in changes.items():
             logger = get_sale_purchase_logger(cr, uid, self, id, \

=== modified file 'sync_so/so_po_common.py'
--- sync_so/so_po_common.py	2013-12-12 16:31:10 +0000
+++ sync_so/so_po_common.py	2013-12-18 20:24:09 +0000
@@ -119,30 +119,39 @@
 
         in_ids = self.pool.get('stock.picking').search(cr, uid, [('purchase_id', '=', po_id), ('state', '=', 'assigned')], 0, None, None, context)
         if not in_ids:
-            raise Exception, "The IN of the PO not found!"
+            return False
         return in_ids[0]
 
-    def get_in_id_by_state(self, cr, uid, po_id, po_ref, state, context):
+    def get_in_id_by_state(self, cr, uid, po_id, po_ref, states, context):
         # Get the Id of the original PO to update these info back 
         if not po_id:
             return False
 
-        in_ids = self.pool.get('stock.picking').search(cr, uid, [('purchase_id', '=', po_id), ('state', '=', state)], 0, None, None, context)
+        in_ids = self.pool.get('stock.picking').search(cr, uid, [('purchase_id', '=', po_id), ('state', 'in', states)], 0, None, None, context)
         return in_ids[0] if in_ids else False 
 
     # Update the next line number for the FO, PO that have been created by the synchro
     def update_next_line_number_fo_po(self, cr, uid, order_id, fo_po_obj, order_line_object, context):
         sequence_id = fo_po_obj.read(cr, uid, [order_id], ['sequence_id'], context=context)[0]['sequence_id'][0]
+        seq_tools = self.pool.get('sequence.tools')
         
         # Make sure that even if the FO/PO has no line, then the default value is 1
         cr.execute("select max(line_number) from " + order_line_object + " where order_id = " + str(order_id))
         for x in cr.fetchall():
+<<<<<<< TREE
             seq_tools = self.pool.get('sequence.tools')
             val = 1
             if x and x[0]:
                 val = int(x[0]) + 1
             seq_tools.reset_next_number(cr, uid, sequence_id, val, context=context)
         
+=======
+            # For the FO without any line
+            val = 1
+            if x and x[0]:
+                val = int(x[0]) + 1
+            seq_tools.reset_next_number(cr, uid, sequence_id, val, context=context)
+>>>>>>> MERGE-SOURCE
         return True
 
     def get_original_so_id(self, cr, uid, so_ref, context):