Merge lp:~unifield-team/unifield-server/us-838-new-batch-1 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py'
--- bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py	2016-03-08 15:48:47 +0000
+++ bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py	2016-05-23 07:50:39 +0000
@@ -137,10 +137,16 @@
 
         # No batch found, create a new one
         if not lot_ids:
+            # US-838: Add the prefix as instance name of the current instance into the name of the EP object
+            company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
+            prefix = ''
+            if company and company.partner_id:
+                prefix = company.partner_id.name + "_"
+            
             vals = {
                 'product_id': product_id,
                 'life_date': expiry_date,
-                'name': seq_obj.get(cr, uid, 'stock.lot.serial'),
+                'name': prefix + seq_obj.get(cr, uid, 'stock.lot.serial'),
                 'type': 'internal',
             }
             lot_id = lot_obj.create(cr, uid, vals, context)
@@ -215,7 +221,8 @@
                    and not line.prodlot_id \
                    and line.expiry_date:
                     if line.type_check == 'in':
-                        prodlot_id = self._get_prodlot_from_expiry_date(cr, uid, line.expiry_date, line.product_id.id, context=context)
+                        # US-838: The method has been moved to addons/stock_batch_recall/product_expiry.py
+                        prodlot_id = self.pool.get('stock.production.lot')._get_prodlot_from_expiry_date(cr, uid, line.expiry_date, line.product_id.id, context=context)
                         in_proc_obj.write(cr, uid, [line.id], {'prodlot_id': prodlot_id}, context=context)
                     else:
                         # Should not be reached thanks to UI checks

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2016-05-12 12:09:25 +0000
+++ bin/addons/msf_profile/data/patches.xml	2016-05-23 07:50:39 +0000
@@ -33,6 +33,7 @@
             <field name="method">us_1185_patch</field>
         </record>
 
+<<<<<<< TREE
         <record id="us_1061_patch" model="patch.scripts">
             <field name="method">us_1061_patch</field>
         </record>
@@ -40,5 +41,12 @@
         <record id="us_1263_patch" model="patch.scripts">
             <field name="method">us_1263_patch</field>
         </record>
+=======
+        <record id="us_838_patch" model="patch.scripts">
+            <field name="method">us_838_migrate_dup_batch</field>
+            <field name="model">stock.production.lot</field>
+        </record>
+
+>>>>>>> MERGE-SOURCE
     </data>
 </openerp>

=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv'
--- bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv	2016-04-25 15:54:40 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv	2016-05-23 07:50:39 +0000
@@ -10,15 +10,15 @@
 fo_updates_po_ref,TRUE,TRUE,"['name','state','client_order_ref']","['&','&','&',('partner_type','!=','external'),('client_order_ref','!=',False),('split_type_sale_order','=','original_sale_order'),'!',('client_order_ref', 'like', 'invalid_by_recovery')]",partner_id,MISSION,purchase.order.update_fo_ref,sale.order,FO updates PO ref,9,Valid
 update_in_ref,TRUE,TRUE,"['name','shipment_ref']","['&',('shipment_ref','!=',False),'!',('shipment_ref', 'like', 'invalid_by_recovery')]",partner_id,MISSION,stock.picking.update_in_ref,stock.picking,IN updates ref to OUT SHIP,10,Valid
 canceled_fo_cancels_po,TRUE,TRUE,"['name','state', 'client_order_ref']","[('state', '=', 'cancel'), ('client_order_ref', '!=', '')]",partner_id,MISSION,purchase.order.canceled_fo_cancel_po,sale.order,Canceled FO cancels PO,18,Valid
-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/original_qty_partial', '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), ('do_not_sync', '=', False)]",partner_id,MISSION,stock.picking.partial_shipped_fo_updates_in_po,stock.picking,Partial shipped at Coordo updates IN at Project,19,Valid
-moves_from_dpo_closed_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'subtype', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', '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/dpo_line_id']","['&', '&', '&', ('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['picking', 'standard']), ('dpo_out', '=', True)]",partner_id,MISSION,stock.picking.partial_shippped_dpo_updates_in_po,stock.picking,Moves from DPO closed at Coordo updates IN at Project,20,Valid
+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/original_qty_partial', '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/prodlot_id/name','move_lines/prodlot_id/life_date', '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), ('do_not_sync', '=', False)]",partner_id,MISSION,stock.picking.partial_shipped_fo_updates_in_po,stock.picking,Partial shipped at Coordo updates IN at Project,19,Valid
+moves_from_dpo_closed_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'subtype', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', '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/prodlot_id/name','move_lines/prodlot_id/life_date', '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/dpo_line_id']","['&', '&', '&', ('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['picking', 'standard']), ('dpo_out', '=', True)]",partner_id,MISSION,stock.picking.partial_shippped_dpo_updates_in_po,stock.picking,Moves from DPO closed at Coordo updates IN at Project,20,Valid
 dpo_service_lines_update_in_at_project,TRUE,TRUE,"['order_id/name', 'order_id/delivery_confirmed_date', 'fake_id', 'origin', 'confirmed_delivery_date', 'name', 'product_uom/id', 'product_uom/name', 'link_sol_id/line_number', 'notes', 'product_qty', 'product_id/name', 'product_id/id']","[('dest_partner_id.partner_type', '=', 'internal'), ('order_id.order_type', '=', 'direct'), ('order_id.state', 'in', ['approved', 'done']), ('product_id.type', 'in', ['service', 'service_recep'])]",dest_partner_id,MISSION,purchase.order.line.confirmed_dpo_service_lines_update_in_po,purchase.order.line,DPO service lines update IN at Project,21,Valid
 cancel_out_at_coordo_cancels_in_at_project,TRUE,TRUE,"['name', 'state', 'origin']","['&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'),('state', '=', 'cancel'),('subtype', '=', 'standard'),('do_not_sync', '=', False)]",partner_id,MISSION,stock.picking.cancel_out_pick_cancel_in,stock.picking,Canceled OUT at Coordo cancels IN at Project,22,Valid
 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),('do_not_sync', '=', False)]",partner_id,MISSION,stock.picking.cancel_out_pick_cancel_in,stock.picking,Canceled PICK at Coordo cancels IN at Project,23,Valid
 cancel_stock_move_at_coordo_cancels_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'date_cancel']","['&','&','&','&','&','&',('picking_id.partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'),('state', '=', 'cancel'),('picking_id.state', '=', 'done'),('picking_id.do_not_sync', '=', False),('to_be_sent', '=', True), '&', '|', ('picking_id.subtype', '=', 'picking'), ('picking_id.subtype', '=', 'standard'), ('picking_id.already_shipped', '=', False)]",partner_id,MISSION,stock.picking.cancel_stock_move_of_pick_cancel_in,stock.move,Canceled stock move cancels IN,24,Valid
 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), ('dpo_incoming', '=', False)]",partner_id,MISSION,stock.picking.closed_in_validates_delivery_out_ship,stock.picking,Closed IN validates delivery of OUT-SHIP,26,Valid
 closed_in_confirms_dpo_reception,TRUE,TRUE,"['name', 'state', 'dpo_line_id']","['&','&','&','&',('picking_id.partner_type_stock_picking', '!=', 'external'), ('picking_id.type', '=', 'in'), ('picking_id.subtype', 'in', ['standard']), ('state', '=', 'done'), ('dpo_line_id', '!=', 0)]",partner_id,MISSION,stock.picking.closed_in_confirms_dpo_reception,stock.move,Closed IN confirms DPO reception,27,Valid
-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,Valid
+create_batch_object,FALSE,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,Valid
 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,Valid
 reset_ref_by_recovery_mode,TRUE,TRUE,['name'],"[('name', '=', False)]",partner_id,MISSION,sale.order.reset_ref_by_recovery_mode,sale.order,Reset Due to Recovery,1003,Valid
 USB_replicate_po,TRUE,TRUE,"['name', 'analytic_distribution_id/id', 'partner_id/id','pricelist_id/id','delivery_requested_date','details','notes', 'origin', 'categ', 'order_type', 'priority', 'loan_duration', 'is_a_counterpart', 'cross_docking_ok', '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/is_line_split','order_line/date_planned','order_line/procurement_id/id']","[('state','in',['approved', 'done'])]",partner_id,USB,purchase.order.usb_replicate_po,purchase.order,USB_replicate_po,2000,Valid

=== modified file 'bin/addons/product_expiry/product_expiry.py'
--- bin/addons/product_expiry/product_expiry.py	2011-01-14 00:11:01 +0000
+++ bin/addons/product_expiry/product_expiry.py	2016-05-23 07:50:39 +0000
@@ -21,9 +21,12 @@
 import datetime
 from osv import fields, osv
 import pooler
+import logging
+
 
 class stock_production_lot(osv.osv):
     _inherit = 'stock.production.lot'
+    _logger = logging.getLogger('------US-838: Migrate duplicate BNs')
 
     def _get_date(dtype):
         """Return a function to compute the limit date for this type"""
@@ -54,6 +57,10 @@
     }
     # Assign dates according to products data
     def create(self, cr, uid, vals, context=None):
+        
+        if self.violate_ed_unique(cr, uid, False, vals, context):
+            raise osv.except_osv('Error', 'An expiry date with same date for this product exists already!.')        
+        
         newid = super(stock_production_lot, self).create(cr, uid, vals, context=context)
         obj = self.browse(cr, uid, newid, context=context)
         towrite = []
@@ -66,6 +73,175 @@
         self.write(cr, uid, [obj.id], self.default_get(cr, uid, towrite, context=context))
         return newid
 
+    # US-838: this method is to check if the expiry date values are valid    
+    def violate_ed_unique(self, cr, uid, ids, vals, context):
+        if not('product_id' in vals and 'life_date' in vals):
+            return False
+        
+        prod_obj = self.pool.get('product.product')
+        prod = prod_obj.browse(cr, uid, vals['product_id'], context=context)
+        
+        # In case it's a EP only product, then search for date and product, no need to search for batch name
+        if prod.perishable and not prod.batch_management: 
+            search_arg = [('life_date', '=', vals['life_date']), ('type', '=', 'internal'), ('product_id', '=', prod.id)]
+             
+            if ids: # in case it's a write call, then exclude the current ids
+                search_arg.append(('id', 'not in', ids))
+                
+            lot_ids = self.search(cr, uid, search_arg, context=context)
+            if lot_ids:
+                return True
+        return False
+
+    def write(self, cr, uid, ids, vals, context=None):
+        '''
+        force writing of expired_date which is readonly for batch management products
+        '''
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        # US-838: Check if the values are in conflict with the existing data
+        if self.violate_ed_unique(cr, uid, ids, vals, context):
+            raise osv.except_osv('Error', 'An expiry date with same date for this product exists already!')
+        
+        return super(stock_production_lot, self).write(cr, uid, ids, vals, context=context)
+    
+    #US-838: migrate all the duplicated batch into single batch
+    '''
+    
+        US-838: The 3 following methods will be moved to the patch call, it is called only when a patch is applied.
+        Check the steps to be executed in the description, but basically it will migrate the references to the wrong BN in relevant objects
+        to the lead BN, then delete these wrong BNs, and finally redefine the unique constraint on the table BN 
+    
+        method to move: migrate_dup_batch, remap_reference_tables, update_table
+    
+    '''
+    def us_838_migrate_dup_batch(self, cr, uid, *a, **b):
+        '''
+        Step to do:
+        
+        1. Search list of dup batches, that have the same name + product + xmlname values.
+        2. Go through this list, for each element do the following:
+            2.1. Get the 2 batch id of the same name, order by id ---> the smaller id will be kept, the other will be set as inactive
+            2.2. Search all tables that refer to the bigger_id, then map them to the smaller_id
+            2.3. Set the non-lead batches to become inactive
+            2.4. Update ir_model_data
+        3. Modify the unique constraint to be prod + BN + ED, and no more partner_name involved, because we will not use partner_name anymore  
+        
+        4. For the messages in the pipeline ---> treated in sync message
+        
+        '''
+        
+        cr.execute('''select id, name from stock_production_lot where name in  
+                (select name from (select name, product_id, count(name) as amount_bn from stock_production_lot group by name, product_id, life_date) as foo_bn where amount_bn>1) order by name, id;''')
+        all_dup_batches = cr.dictfetchall()
+        self._logger.info("__________Start to migrate duplicate batch objects in instance: %s - with total of %s duplicate batches!" % (cr.dbname, len(all_dup_batches)))
+        
+        context = {}
+                    
+        lead_id = 0 # This id will be used as the main batch id
+        to_be_deleted = []
+        same_name = None 
+        for r in all_dup_batches:
+            if lead_id == 0:
+                same_name = r['name']
+                lead_id = r['id']
+            else:
+                if same_name == r['name']: # same batch --> replace in all table to the lead_id
+                    # Do step 2.2, search the following tables to replace the link to the
+                    self.remap_reference_tables(cr, uid, r['id'], lead_id, same_name, context)
+                    
+                    # 2.3: Add this wrong batch id into the list, then delete them at the end
+                    to_be_deleted.append(r['id'])
+                else:
+                    lead_id = r['id'] # when the name change --> replace by the new lead_id
+                    same_name = r['name'] 
+
+        # 2.3 call to delete all the wrong batch objects
+        if to_be_deleted:
+            self._logger.info("Delete duplicate batch objects (%s batches - keep only the lead batch)" % len(to_be_deleted))
+            self.unlink(cr, uid, to_be_deleted, context=context)
+        else:
+            self._logger.info("No duplicate batch found for this instance %s.", cr.dbname)
+        
+        self._logger.info("Last step: update the unique constraint for the table stock_production_lot.")
+        # 3. Now alter the constraint unique of this table: first drop the current constraint, then create a new one with name+prod+life_date
+        cr.execute('''ALTER TABLE stock_production_lot DROP CONSTRAINT stock_production_lot_batch_name_uniq,  
+                ADD CONSTRAINT stock_production_lot_batch_name_uniq UNIQUE (name, product_id, life_date);''')
+        
+        self._logger.info("__________Finish the migration task on duplicate batch objects for instance: %s", cr.dbname)
+        return True
+    
+    def remap_reference_tables(self, cr, uid, wrong_id, lead_id, batch_name, context=None):
+        '''
+        -- with fkey = prodlot_id (total=13)
+            TABLE "create_picking_move_processor" CONSTRAINT "create_picking_move_processor_prodlot_id_fkey" FOREIGN KEY (prodlot_id) REFERENCES stock_production_lot(id) ON DELETE SET NULL
+            TABLE "export_report_stock_inventory" CONSTRAINT "export_report_stock_inventory_prodlot_id_fkey" FOREIGN KEY (prodlot_id) REFERENCES stock_production_lot(id) ON DELETE SET NULL
+            TABLE "export_report_stock_move" CONSTRAINT "export_report_stock_move_prodlot_id_fkey" FOREIGN KEY (prodlot_id) REFERENCES stock_production_lot(id) ON DELETE SET NULL
+            TABLE "internal_move_processor" CONSTRAINT "internal_move_processor_prodlot_id_fkey" FOREIGN KEY (prodlot_id) REFERENCES stock_production_lot(id) ON DELETE SET NULL
+            TABLE "outgoing_delivery_move_processor" CONSTRAINT "outgoing_delivery_move_processor_prodlot_id_fkey" FOREIGN KEY (prodlot_id) REFERENCES stock_production_lot(id) ON DELETE SET NULL
+            TABLE "ppl_move_processor" CONSTRAINT "ppl_move_processor_prodlot_id_fkey" FOREIGN KEY (prodlot_id) REFERENCES stock_production_lot(id) ON DELETE SET NULL
+            TABLE "real_average_consumption_line" CONSTRAINT "real_average_consumption_line_prodlot_id_fkey" FOREIGN KEY (prodlot_id) REFERENCES stock_production_lot(id) ON DELETE SET NULL
+            TABLE "return_ppl_move_processor" CONSTRAINT "return_ppl_move_processor_prodlot_id_fkey" FOREIGN KEY (prodlot_id) REFERENCES stock_production_lot(id) ON DELETE SET NULL
+            TABLE "stock_move_in_processor" CONSTRAINT "stock_move_in_processor_prodlot_id_fkey" FOREIGN KEY (prodlot_id) REFERENCES stock_production_lot(id) ON DELETE SET NULL
+            TABLE "stock_move_processor" CONSTRAINT "stock_move_processor_prodlot_id_fkey" FOREIGN KEY (prodlot_id) REFERENCES stock_production_lot(id) ON DELETE SET NULL
+            TABLE "stock_move" CONSTRAINT "stock_move_prodlot_id_fkey" FOREIGN KEY (prodlot_id) REFERENCES stock_production_lot(id) ON DELETE SET NULL
+            TABLE "unconsistent_stock_report_line" CONSTRAINT "unconsistent_stock_report_line_prodlot_id_fkey" FOREIGN KEY (prodlot_id) REFERENCES stock_production_lot(id) ON DELETE CASCADE
+            TABLE "validate_move_processor" CONSTRAINT "validate_move_processor_prodlot_id_fkey" FOREIGN KEY (prodlot_id) REFERENCES stock_production_lot(id) ON DELETE SET NULL
+        
+        -- with fkey = lot_id (2)
+            TABLE "stock_production_lot_revision" CONSTRAINT "stock_production_lot_revision_lot_id_fkey" FOREIGN KEY (lot_id) REFERENCES stock_production_lot(id) ON DELETE CASCADE
+            TABLE "product_likely_expire_report_item_line" CONSTRAINT "product_likely_expire_report_item_line_lot_id_fkey" FOREIGN KEY (lot_id) REFERENCES stock_production_lot(id) ON DELETE SET NULL
+        
+        -- with fkey = prod_lot_id (2)
+            TABLE "stock_inventory_line" CONSTRAINT "stock_inventory_line_prod_lot_id_fkey" FOREIGN KEY (prod_lot_id) REFERENCES stock_production_lot(id) ON DELETE SET NULL
+            TABLE "initial_stock_inventory_line" CONSTRAINT "initial_stock_inventory_line_prod_lot_id_fkey" FOREIGN KEY (prod_lot_id) REFERENCES stock_production_lot(id) ON DELETE SET NULL
+        
+        -- with fkey = no common name (3)
+            TABLE "claim_product_line" CONSTRAINT "claim_product_line_lot_id_claim_product_line_fkey" FOREIGN KEY (lot_id_claim_product_line) REFERENCES stock_production_lot(id) ON DELETE SET NULL
+            TABLE "composition_kit" CONSTRAINT "composition_kit_composition_lot_id_fkey" FOREIGN KEY (composition_lot_id) REFERENCES stock_production_lot(id) ON DELETE SET NULL
+            TABLE "wizard_import_in_line_simulation_screen" CONSTRAINT "wizard_import_in_line_simulation_screen_imp_batch_id_fkey" FOREIGN KEY (imp_batch_id) REFERENCES stock_production_lot(id) ON DELETE SET 
+        '''
+        # Tables with foreign key prodlot_id (total 13 tables) 
+        self._logger.info("__ Migrating batch number:     %s", batch_name)
+        list_table_fields = [
+                             ('create_picking_move_processor', 'prodlot_id'),
+                             ('export_report_stock_inventory', 'prodlot_id'),
+                             ('export_report_stock_move', 'prodlot_id'),
+                             ('internal_move_processor', 'prodlot_id'),
+                             ('outgoing_delivery_move_processor', 'prodlot_id'),
+                             ('ppl_move_processor', 'prodlot_id'),
+                             ('real_average_consumption_line', 'prodlot_id'),
+                             ('return_ppl_move_processor', 'prodlot_id'),
+                             ('stock_move_in_processor', 'prodlot_id'),
+                             ('stock_move_processor', 'prodlot_id'),
+                             ('stock_move', 'prodlot_id'),
+                             ('unconsistent_stock_report_line', 'prodlot_id'),
+                             ('validate_move_processor', 'prodlot_id'),
+                             ('stock_production_lot_revision', 'lot_id'),
+                             ('product_likely_expire_report_item_line', 'lot_id'),
+                             ('stock_inventory_line', 'prod_lot_id'),
+                             ('initial_stock_inventory_line', 'prod_lot_id'),
+                             ('claim_product_line', 'lot_id_claim_product_line'),
+                             ('composition_kit', 'composition_lot_id'),
+                             ('wizard_import_in_line_simulation_screen', 'imp_batch_id')
+                             ]
+        for element in list_table_fields:
+            # Tables with foreign key prod_lot_id (total 2) 
+            self.update_table(cr, uid, element[0] , element[1], wrong_id, lead_id, batch_name)
+        
+        
+    def update_table(self, cr, uid, table_name, field_id, wrong_id, lead_id, batch_name):
+        cr.execute('select count(*) as amount from ' + table_name + ' where ' + field_id + ' = %s;' %(wrong_id,))
+        count = cr.fetchone()[0]
+        if count > 0: # Only update the table if wrong bn exists
+            self._logger.info("Table %s has %s batch objects (%s) and will be-mapped." %(table_name, count, batch_name,))
+            sql_update = "update " + table_name + " set " + field_id + "=" + str(lead_id) + " where " + field_id + "=" + str(wrong_id)
+            cr.execute(sql_update)
+        else:
+            self._logger.info("Table %s has NO duplicate batch (%s)." %(table_name, batch_name,))
+
     _defaults = {
         'life_date': _get_date('life_time'),
         'use_date': _get_date('use_time'),

=== modified file 'bin/addons/specific_rules/specific_rules.py'
--- bin/addons/specific_rules/specific_rules.py	2016-04-25 09:24:04 +0000
+++ bin/addons/specific_rules/specific_rules.py	2016-05-23 07:50:39 +0000
@@ -1365,7 +1365,7 @@
             if not batch.delete_ok:
                 raise osv.except_osv(_('Error'), _('You cannot remove a batch number which has stock !'))
 
-        return super(stock_production_lot, self).unlink(cr, uid, batch.id, context=context)
+        return super(stock_production_lot, self).unlink(cr, uid, ids, context=context)
 
 
 stock_production_lot()

=== modified file 'bin/addons/specific_rules/specific_rules_view.xml'
--- bin/addons/specific_rules/specific_rules_view.xml	2016-03-17 08:30:04 +0000
+++ bin/addons/specific_rules/specific_rules_view.xml	2016-05-23 07:50:39 +0000
@@ -107,7 +107,6 @@
                         <attribute name="colors">red:life_date &lt; current_date</attribute>
                     </xpath>
                     <field name="ref" position="replace">
-                        <field name="partner_name"/>
                         <field name="type" />
                         <field name="life_date" />
                     </field>
@@ -198,7 +197,6 @@
 
                     <field name="name" position="replace">
                         <field name="name" colspan="2" attrs="{'readonly': [('type', '=', 'internal')]}" />
-                        <field name="partner_name" colspan="2" readonly='1'/>
                     </field>
 
                     <field name="date" position="replace">

=== modified file 'bin/addons/stock_batch_recall/product_expiry.py'
--- bin/addons/stock_batch_recall/product_expiry.py	2014-10-07 12:45:45 +0000
+++ bin/addons/stock_batch_recall/product_expiry.py	2016-05-23 07:50:39 +0000
@@ -67,29 +67,59 @@
         return super(stock_production_lot, self).copy_data(cr, uid, id, default, context=context)
 
     # UF-1617: Handle the instance in the batch number object
-    def create(self, cr, uid, vals, context=None):
+    # US-838: this method is removed in integration, because the 2 fields are no more used, xmlid_name and partner name
+    
+    
+#    def create(self, cr, uid, vals, context=None):
         '''
         override create method to set the instance id to the current instance if it has not been provided
-        '''
+        
+        # UF-2148: make the xmlid_name from batch name for building xmlid if the value is not given in vals
+        if 'product_id' in vals and ('xmlid_name' not in vals or not vals['xmlid_name']):
+            prod_name = self.pool.get('product.product').browse(cr, uid, vals['product_id'], context=context)
+            #US-838: xmlid_name now takes product code, batch name and expiry date as value, this value must be unique (soft constraint) 
+            vals['xmlid_name'] = '%s_%s_%s' % (prod_name.default_code, vals['name'], vals['life_date'])
+        
         if 'partner_name' not in vals or not vals['partner_name']:
             company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
             if company and company.partner_id:
                 vals['partner_name'] = company.partner_id.name
-
-        
-        # UF-2148: make the xmlid_name from batch name for building xmlid if the value is not given in vals
-        if 'product_id' in vals and ('xmlid_name' not in vals or not vals['xmlid_name']):
-            prod_name = self.pool.get('product.product').browse(cr, uid, vals['product_id'], context=context)
-            vals['xmlid_name'] = '%s_%s' % (prod_name.default_code, vals['name'])
-        
-        if 'xmlid_name' in vals:
-            exist = self.search(cr, uid, [('xmlid_name', '=', vals['xmlid_name']), ('partner_name', '=', vals['partner_name']), ('product_id', '=', vals['product_id'])], context=context)
-            if exist:
-                # but if the value exist for xmlid_name, then add a suffix to differentiate, no constraint unique required here  
-                vals['xmlid_name'] = vals['xmlid_name'] + "_1"
         
         return super(stock_production_lot, self).create(cr, uid, vals, context)
 
+        '''
+
+    # US-838: This method got moved from addons/msf_outgoing/wizard/incoming_shipment_processor.py
+    def _get_prodlot_from_expiry_date(self, cr, uid, expiry_date, product_id, context=None):
+        """
+        Search if an internal batch exists in the system with this expiry date.
+        If no, create the batch.
+        """ 
+        # Objects
+        seq_obj = self.pool.get('ir.sequence')
+
+        # Double check to find the corresponding batch
+        lot_ids = self.search(cr, uid, [
+                            ('life_date', '=', expiry_date),
+                            ('type', '=', 'internal'),
+                            ('product_id', '=', product_id),
+                            ], context=context)
+
+        # No batch found, create a new one
+        if not lot_ids:
+            seq_ed = seq_obj.get(cr, uid, 'stock.lot.serial')
+            vals = {
+                'product_id': product_id,
+                'life_date': expiry_date,
+                'name': seq_ed,
+                'type': 'internal',
+            }
+            lot_id = self.create(cr, uid, vals, context)
+        else:
+            lot_id = lot_ids[0]
+
+        return lot_id
+
     _columns = {
         # renamed from End of Life Date
         'life_date': fields.date('Expiry Date',
@@ -102,8 +132,8 @@
 
         # UF-1617: field only used for sync purpose
         'partner_id': fields.many2one('res.partner', string="Supplier", readonly=True, required=False),
-        'partner_name': fields.char('Partner', size=128, required=True),
-        'xmlid_name': fields.char('XML Code, hidden field', size=128, required=True), # UF-2148, this field is used only for xml_id
+        'partner_name': fields.char('Partner', size=128),
+        'xmlid_name': fields.char('XML Code, hidden field', size=128), # UF-2148, this field is used only for xml_id
     }
 
     _defaults = {

=== modified file 'bin/addons/sync_so/picking.py'
--- bin/addons/sync_so/picking.py	2016-01-22 14:29:49 +0000
+++ bin/addons/sync_so/picking.py	2016-05-23 07:50:39 +0000
@@ -97,7 +97,7 @@
 
         # product
         product_name = data['product_id']['name']
-        product_id = self.pool.get('product.product').find_sd_ref(cr, uid, xmlid_to_sdref(data['product_id']['id']), context=context)
+        product_id = prod_obj.find_sd_ref(cr, uid, xmlid_to_sdref(data['product_id']['id']), context=context)
         if not product_id:
             product_ids = prod_obj.search(cr, uid, [('name', '=', product_name)], context=context)
             if not product_ids:
@@ -112,15 +112,54 @@
         # uom
         uom_id = uom_obj.find_sd_ref(cr, uid, xmlid_to_sdref(data['product_uom']['id']), context=context)
         if not uom_id:
-            raise Exception, "The corresponding uom does not exist here. Uom name: %s" % uom_name
+            raise Exception, "The corresponding uom does not exist here. Uom name: %s" % uom_id
 
         # UF-1617: Handle batch and asset object
         batch_id = False
-        if data['prodlot_id']:
-            batch_id = self.pool.get('stock.production.lot').find_sd_ref(cr, uid, xmlid_to_sdref(data['prodlot_id']['id']), context=context)
+        batch_values = data['prodlot_id']
+        if batch_values and product_id:
+            # us-838: WORK IN PROGRESS ..................................
+            # US-838: check first if this product is EP-only? if yes, treat differently, here we treat only for BN 
+            prodlot_obj = self.pool.get('stock.production.lot')
+            prod = prod_obj.browse(cr, uid,product_id,context=context)
+            
+            '''
+            US-838: The following block is for treating the sync message in pipeline!
+            If the sync message was made with old message rule, then in the message it contains ONLY the xmlid of the batch, NO life_date.
+            For this case, we have to retrieve the batch name from this xmlid, by using the double product_code in the search.
+            From this batch name + product_id, we can find the batch object in the system. There should only be one batch name for the same product 
+            since the migration has already done, which merged all dup batch name into one.
+            
+            The old sync message has the following xmlid format: sd.batch_numer_se_HQ1C1_DORADIDA15T_DORADIDA15T_MSFBN/000005
+            '''
+            xmlid = batch_values['id']
+            if 'life_date' not in batch_values and 'batch_numer' in xmlid: # it must have the 'batch_numer' as prefix
+                prod_code = "_" + prod.default_code + "_" + prod.default_code + "_" # This is how the old xmlid has been made: using double prod.default_code
+                indexOfProdCode = xmlid.find(prod_code) + len(prod_code)
+                batch_name = xmlid[indexOfProdCode:]
+                existing_bn = prodlot_obj.search(cr, uid, [('name', '=', batch_name), ('product_id', '=', product_id)], context=context)
+                if existing_bn:
+                    batch_id = existing_bn[0]
+            else:
+                if prod.perishable and not prod.batch_management:
+                    # In case it's a EP only product, then search for date and product, no need to search for batch name
+                    if 'life_date' in batch_values:
+                        # If name exists in the sync message, search by name and product, not by xmlid 
+                        life_date = batch_values['life_date']
+                        # US-838: use different way to retrieve the EP object
+                        batch_id = prodlot_obj._get_prodlot_from_expiry_date(cr, uid, life_date, product_id, context=context)
+                        if not batch_id:
+                            raise Exception, "Error while retrieving or creating the expiry date %s for the product %s" % (batch_values, prod.name)
+                else:
+                    # US-838: for BN, retrieve it or create it, in the follwing method
+                    batch_id, msg = self.retrieve_batch_number(cr, uid, product_id, batch_values, context) # return False if the batch object is not found, or cannot be created
+                
+            ################## TODO: Treat the case for Remote Warehouse: WORK IN PROGRESS BELOW!!!!!!!!!!
+            
+            
             if not batch_id:
-                raise Exception, "Batch Number %s not found for this sync data record" % data['prodlot_id']
-
+                raise Exception, "Batch Number %s not found for this sync data record" % batch_values
+                
         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)
@@ -697,10 +736,12 @@
         return message
 
 
+    #US-838: This method is no more use, the message will do nothing.
     def create_batch_number(self, cr, uid, source, out_info, context=None):
         if not context:
             context = {}
-        self._logger.info("+++ Create batch number that comes with the SHIP/OUT from %s" % source)
+        self._logger.info("+++ Create batch number that comes with the SHIP/OUT from %s - This message is deprecated." % source)
+
         so_po_common = self.pool.get('so.po.common')
         batch_obj = self.pool.get('stock.production.lot')
 
@@ -733,6 +774,32 @@
         self._logger.info(message)
         return message
 
+    # US-838: Retrieve batch object, if not found then create new 
+    def retrieve_batch_number(self, cr, uid, product_id, batch_dict, context=None):
+        if not context:
+            context = {}
+        #self._logger.info("+++ Retrieve batch number for the SHIP/OUT from %s")
+        so_po_common = self.pool.get('so.po.common')
+        batch_obj = self.pool.get('stock.production.lot')
+        prod_obj = self.pool.get('product.product')
+        
+        if not ('name' in batch_dict and 'life_date' in batch_dict):
+            # Search for the batch object with the given data
+            return False, "Batch Number: Missing batch name or expiry date!" 
+        
+        existing_bn = batch_obj.search(cr, uid, [('name', '=', batch_dict['name']), ('product_id', '=', product_id), 
+                                                 ('life_date', '=', batch_dict['life_date'])], context=context)
+        if existing_bn:  # existed already, then don't need to create a new one
+            message = "Batch object exists in the current system. No new batch created."
+            self._logger.info(message)
+            return existing_bn[0], message
+
+        # If not exists, then create this new batch object
+        new_bn_vals = {'name': batch_dict['name'], 'product_id': product_id, 'life_date': batch_dict['life_date']}
+        message = "The new BN " + batch_dict['name'] + " has been created"
+        self._logger.info(message)
+        bn_id = batch_obj.create(cr, uid, new_bn_vals, context=context)
+        return bn_id, message
 
     def create_asset(self, cr, uid, source, out_info, context=None):
         if not context:
@@ -863,8 +930,10 @@
 
 
             # for each new batch number object and for each partner, create messages and put into the queue for sending on next sync round
-            for item in list_batch:
-                so_po_common.create_message_with_object_and_partner(cr, uid, 1001, item, partner.name, context)
+            
+            #US-838: THIS METHOD IS NO MORE USED, AS THE BN OBJECT WILL NOT BE SENT EXPLICITLY, BUT TOGETHER WITH THE MESSAGE!
+            #for item in list_batch:
+            #    so_po_common.create_message_with_object_and_partner(cr, uid, 1001, item, partner.name, context)
 
             # for each new asset object and for each partner, create messages and put into the queue for sending on next sync round
             for item in list_asset:

=== modified file 'bin/addons/sync_so/picking_rw.py'
--- bin/addons/sync_so/picking_rw.py	2016-04-25 15:54:40 +0000
+++ bin/addons/sync_so/picking_rw.py	2016-05-23 07:50:39 +0000
@@ -588,7 +588,7 @@
             raise Exception, "The corresponding uom does not exist here. Uom name: %s" % uom_name
         uom_id = uom_ids[0]
         
-
+        # US-838: RW, need to check the new mechanism of the BN and ED object!!!!!!!
         batch_id = False
         if data['prodlot_id']:
             batch_id = self.pool.get('stock.production.lot').find_sd_ref(cr, uid, xmlid_to_sdref(data['prodlot_id']['id']), context=context)

=== modified file 'bin/addons/sync_so/specific_xml_id.py'
--- bin/addons/sync_so/specific_xml_id.py	2016-01-25 10:53:13 +0000
+++ bin/addons/sync_so/specific_xml_id.py	2016-05-23 07:50:39 +0000
@@ -787,6 +787,10 @@
 
 product_asset()
 
+
+'''
+
+US-838: xmlid of batch number is no more used --- REMOVE THIS BLOCK OF CODE WHEN INTEGRATE THE TICKET!
 class batch_number(osv.osv):
     _inherit = "stock.production.lot"
 
@@ -794,10 +798,12 @@
     def get_unique_xml_name(self, cr, uid, uuid, table_name, res_id):
         batch = self.browse(cr, uid, res_id)
         #UF-2148: use the xmlid_name for building the xml for this object
-        return get_valid_xml_name('batch_numer', (batch.partner_name or 'no_partner'), (batch.product_id.code or 'noprod'), (batch.xmlid_name or 'noname'))
+        return get_valid_xml_name('batch_number', (batch.partner_name or 'no_partner'), (batch.product_id.code or 'noprod'), (batch.xmlid_name or 'noname'))
 
 batch_number()
 
+'''
+
 class ir_model_access(osv.osv):
     """
     UF-2146 To allow synchronisation of ir.model.access, must have same sd ref across all instances