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

[jftempo]

[lp:~jfb-tempo-consulting/unifield-server/US-7353-no7158]

5690. By jftempo on 2020-04-22

Hidden merge button at HQ + Proj / reverse order of sync updates to prevent NR if attrib on Z prod has been changed at coordo

5691. By jftempo on 2020-04-22

Check if product is used

5692. By jftempo on 2020-04-23

Msg if NSL product used

5693. By jftempo on 2020-04-23

Wizard merge: order of checks

5694. By jftempo on 2020-04-23

Sync merge: keep cost and field prices

5695. By jftempo on 2020-04-23

Sync merge: keep cost price

5696. By jftempo on 2020-04-24

Merge all UD prod

5697. By jftempo on 2020-04-24

Merge prod: m2o autocomplete list must search only on NSL

5698. By jftempo on 2020-04-27

COO: deactivate UD + merge + sync: product is kept active at proj

5699. By jftempo on 2020-04-27

Filter

5700. By jftempo on 2020-04-29

US-7353: ST+NS must be active

5701. By jftempo on 2020-04-30

US-7353 Show UD

5702. By jftempo on 2020-04-30

the active test hell

Unmerged revisions

5702. By jftempo on 2020-04-30

the active test hell

5701. By jftempo on 2020-04-30

US-7353 Show UD

5700. By jftempo on 2020-04-29

US-7353: ST+NS must be active

5699. By jftempo on 2020-04-27

Filter

5698. By jftempo on 2020-04-27

COO: deactivate UD + merge + sync: product is kept active at proj

5697. By jftempo on 2020-04-24

Merge prod: m2o autocomplete list must search only on NSL

5696. By jftempo on 2020-04-24

Merge all UD prod

5695. By jftempo on 2020-04-23

Sync merge: keep cost price

5694. By jftempo on 2020-04-23

Sync merge: keep cost and field prices

5693. By jftempo on 2020-04-23

Wizard merge: order of checks

=== modified file 'bin/addons/account/invoice.py'
=== modified file 'bin/addons/account_override/account_invoice_view.xml'
=== modified file 'bin/addons/account_override/invoice.py'
=== modified file 'bin/addons/msf_audittrail/data/audittrail_data_products.yml'
--- bin/addons/msf_audittrail/data/audittrail_data_products.yml	2019-10-28 09:41:26 +0000
+++ bin/addons/msf_audittrail/data/audittrail_data_products.yml	2020-04-30 18:52:36 +0000
@@ -31,7 +31,7 @@
     object_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'product.product')], context=context)
     rule_id = self.search(cr, uid, [('name', '=', name)], context=context)
     if object_ids:
-        fields = ['default_code', 'old_code', 'new_code', 'type', 'subtype', 'categ_id', 'international_status', 'state', 'active', 'perishable', 'batch_management', 'heat_sensitive_item', 'controlled_substance', 'dangerous_goods', 'standard_ok', 'justification_code_id', 'restricted_country', 'country_restriction', 'form_value', 'fit_value', 'function_value', 'procure_delay', 'soq_volume', 'soq_weight', 'soq_quantity', 'valuation', 'donation_expense_account']
+        fields = ['default_code', 'old_code', 'new_code', 'type', 'subtype', 'categ_id', 'international_status', 'state', 'active', 'perishable', 'batch_management', 'heat_sensitive_item', 'controlled_substance', 'dangerous_goods', 'standard_ok', 'justification_code_id', 'restricted_country', 'country_restriction', 'form_value', 'fit_value', 'function_value', 'procure_delay', 'soq_volume', 'soq_weight', 'soq_quantity', 'valuation', 'donation_expense_account', 'replace_product_id', 'replaced_by_product_id']
         fields_ids = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=' ,'product.product'), ('name', 'in', fields)], context=context)
         vals = {'name': name,
                 'object_id': object_ids[0],

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_product_line.py'
--- bin/addons/msf_doc_import/wizard/wizard_import_product_line.py	2019-10-07 10:36:15 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_import_product_line.py	2020-04-30 18:52:36 +0000
@@ -152,7 +152,7 @@
                             # Cell 0: Product
                             if row[0]:
                                 prod_ids = product_obj.search(cr, uid, [('default_code', '=ilike', row[0].data),
-                                                                        ('active', 'in', ['t', 'f'])], context=context)
+                                                                        ('active', 'in', ['t', 'f']), ('replaced_by_product_id', '=', False)], context=context)
                                 if prod_ids and prod_ids[0] not in product_ids:
                                     prod = product_obj.browse(cr, uid, prod_ids[0], fields_to_fetch=['international_status'], context=context)
                                     if prod_creator_id and prod.international_status.id in prod_creator_id:

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2020-04-29 09:38:09 +0000
+++ bin/addons/msf_profile/data/patches.xml	2020-04-30 18:52:36 +0000
@@ -522,6 +522,7 @@
             <field name="method">us_7025_7039_fix_nr_empty_ins</field>
         </record>
 
+<<<<<<< TREE
         <!-- UF17.0 -->
         <record id="us_7221_reset_starting_balance" model="patch.scripts">
             <field name="method">us_7221_reset_starting_balance</field>
@@ -535,5 +536,12 @@
             <field name="method">us_7236_remove_reg_wkf_and_partial_close_state</field>
         </record>
 
+=======
+        <!-- UF17.0 -->
+        <record id="us_7221_reset_starting_balance" model="patch.scripts">
+            <field name="method">us_7221_reset_starting_balance</field>
+        </record>
+
+>>>>>>> MERGE-SOURCE
     </data>
 </openerp>

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2020-04-29 09:38:09 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2020-04-30 18:52:36 +0000
@@ -109130,6 +109130,7 @@
 msgid "This is an NSL (Non-standard Local) product, please ensure that there is no duplicate “Local” product with which this product should be merged. If you activate and start to use this product it will no longer be possible to merge it with another."
 msgstr "Ce produit est NSL (Non-standard Local), veuillez vous assurer qu'il n'y a pas de produit “Local” doublon avec lequel ce produit devrait être fusionné. Si vous activez ce produit et commencez à l'utiliser, il ne sera plus possible de le fusionner avec un autre."
 
+<<<<<<< TREE
 #. module: msf_instance
 #: view:res.company:0
 msgid "Liquidity Accounts"
@@ -109298,3 +109299,39 @@
 #, python-format
 msgid "Theoretical Balance is not equal to the Cashbox Balance."
 msgstr "Le Solde Théorique n'est pas égal au Solde de Caisse."
+=======
+#. module: msf_instance
+#: view:res.company:0
+msgid "Liquidity Accounts"
+msgstr "Comptes de Trésorerie"
+
+#. module: account_override
+#: field:res.company,cheque_debit_account_id:0
+msgid "Cheque Default Debit Account"
+msgstr "Compte de Débit par défaut pour les Journaux de Chèques"
+
+#. module: account_override
+#: field:res.company,cheque_credit_account_id:0
+msgid "Cheque Default Credit Account"
+msgstr "Compte de Crédit par défaut pour les Journaux de Chèques"
+
+#. module: account_override
+#: field:res.company,bank_debit_account_id:0
+msgid "Bank Default Debit Account"
+msgstr "Compte de Débit par défaut pour les Journaux de Banque"
+
+#. module: account_override
+#: field:res.company,bank_credit_account_id:0
+msgid "Bank Default Credit Account"
+msgstr "Compte de Crédit par défaut pour les Journaux de Banque"
+
+#. module: account_override
+#: field:res.company,cash_debit_account_id:0
+msgid "Cash Default Debit Account"
+msgstr "Compte de Débit par défaut pour les Journaux de Liquidités"
+
+#. module: account_override
+#: field:res.company,cash_credit_account_id:0
+msgid "Cash Default Credit Account"
+msgstr "Compte de Crédit par défaut pour les Journaux de Liquidités"
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2020-04-29 09:38:09 +0000
+++ bin/addons/msf_profile/msf_profile.py	2020-04-30 18:52:36 +0000
@@ -53,6 +53,7 @@
     }
 
 
+<<<<<<< TREE
     # UF17.0
     def us_7015_del_rac_line_sql(self, cr, uid, *a, **b):
         cr.drop_constraint_if_exists('real_average_consumption_line', 'real_average_consumption_line_unique_lot_poduct')
@@ -123,6 +124,36 @@
         return True
 
     # UF16.1
+=======
+    # UF17.0
+    def us_7221_reset_starting_balance(self, cr, uid, *a, **b):
+        """
+        Reset the Starting Balance of the first register created for each journal if it is still in Draft state
+        """
+        # Cashbox details set to zero
+        cr.execute("""
+                   UPDATE account_cashbox_line
+                   SET number = 0 
+                   WHERE starting_id IN (
+                       SELECT id FROM account_bank_statement
+                       WHERE state = 'draft'
+                       AND prev_reg_id IS NULL
+                       AND journal_id IN (SELECT id FROM account_journal WHERE type='cash')
+                   );
+                   """)
+        # Starting Balance set to zero
+        cr.execute("""
+                   UPDATE account_bank_statement
+                   SET balance_start = 0.0
+                   WHERE state = 'draft'
+                   AND prev_reg_id IS NULL
+                   AND journal_id IN (SELECT id FROM account_journal WHERE type in ('bank', 'cash'));
+                   """)
+        self._logger.warn('Starting Balance set to zero in %s registers.' % (cr.rowcount,))
+        return True
+
+    # UF16.1
+>>>>>>> MERGE-SOURCE
     def remove_ir_actions_linked_to_deleted_modules(self, cr, uid, *a, **b):
         # delete remove actions
         cr.execute("delete from ir_act_window where id in (select res_id from ir_model_data where module in ('procurement_report', 'threshold_value') and model='ir.actions.act_window')")

=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv'
--- bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2020-03-04 17:30:01 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2020-04-30 18:52:36 +0000
@@ -123,9 +123,10 @@
 msf_sync_data_server.price_list_version,FALSE,TRUE,FALSE,FALSE,bidirectional,Bidirectional,[],"['active', 'date_end', 'date_start', 'name', 'pricelist_id/id']",MISSION,product.pricelist.version,,Price List Version,Valid,,561
 msf_sync_data_server.country_restrictions,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,[],['name'],MISSION,res.country.restriction,,Country restrictions,Valid,,570
 msf_sync_data_server.country_code_mapping,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,[],"['instance_id/id', 'mapping_value']",COORDINATIONS,country.export.mapping,,Country Code Mapping,Valid,,571
-msf_sync_data_server.oc_product_creator_itc_esc_hq,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"['|','|','|',('international_status','=','UniData'),('international_status','=','ITC'),('international_status','=','ESC'),('international_status','=','HQ'), ('active', 'in', ['t','f'])]","['alert_time', 'batch_management', 'categ_id/id', 'closed_article', 'manufacturer_txt', 'manufacturer_ref', 'code', 'cold_chain/id', 'composed_kit', 'xmlid_code', 'cost_method', 'country_restriction/id', 'dangerous_goods', 'default_code', 'description', 'description2', 'description_purchase', 'description_sale', 'gmdn_code', 'gmdn_description', 'heat_sensitive_item/id', 'international_status/id', 'justification_code_id/id', 'library', 'life_time', 'list_ids/id','med_device_class', 'name', 'name_template', 'controlled_substance', 'nomen_manda_0/id', 'nomen_manda_1/id', 'nomen_manda_2/id', 'nomen_manda_3/id', 'options_ids/id', 'perishable', 'procure_delay', 'procure_method', 'produce_delay', 'product_catalog_page', 'product_catalog_path', 'property_account_expense/id', 'property_account_income/id', 'property_stock_account_input/id', 'property_stock_account_output/id', 'restricted_country', 'short_shelf_life', 'single_use', 'sterilized', 'standard_price', 'sublist', 'subtype', 'asset_type_id', 'supply_method', 'type', 'un_code', 'uom_id/id', 'uom_po_id/id','use_time', 'valuation', 'weight', 'weight_net', 'active', 'state', 'state_ud', 'old_code', 'new_code', 'function_value', 'form_value', 'fit_value', 'standard_ok', 'local_from_hq', 'transport_ok','volume', 'soq_quantity', 'soq_weight', 'soq_volume', 'msfid', 'oc_subscription']",OC,product.product,,"OC Product (Creator = ITC, ESC, UniData or HQ)",Valid,,600
+msf_sync_data_server.oc_product_creator_itc_esc_hq,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"['|','|','|',('international_status','=','UniData'),('international_status','=','ITC'),('international_status','=','ESC'),('international_status','=','HQ'), ('active', 'in', ['t','f'])]","['alert_time', 'batch_management', 'categ_id/id', 'closed_article', 'manufacturer_txt', 'manufacturer_ref', 'code', 'cold_chain/id', 'composed_kit', 'xmlid_code', 'cost_method', 'country_restriction/id', 'dangerous_goods', 'default_code', 'description', 'description2', 'description_purchase', 'description_sale', 'gmdn_code', 'gmdn_description', 'heat_sensitive_item/id', 'international_status/id', 'justification_code_id/id', 'library', 'life_time', 'list_ids/id','med_device_class', 'name', 'name_template', 'controlled_substance', 'nomen_manda_0/id', 'nomen_manda_1/id', 'nomen_manda_2/id', 'nomen_manda_3/id', 'options_ids/id', 'perishable', 'procure_delay', 'procure_method', 'produce_delay', 'product_catalog_page', 'product_catalog_path', 'property_account_expense/id', 'property_account_income/id', 'property_stock_account_input/id', 'property_stock_account_output/id', 'restricted_country', 'short_shelf_life', 'single_use', 'sterilized', 'standard_price', 'sublist', 'subtype', 'asset_type_id', 'supply_method', 'type', 'un_code', 'uom_id/id', 'uom_po_id/id','use_time', 'valuation', 'weight', 'weight_net', 'active', 'state', 'state_ud', 'old_code', 'new_code', 'function_value', 'form_value', 'fit_value', 'standard_ok', 'local_from_hq', 'local_activation_from_merge', 'transport_ok','volume', 'soq_quantity', 'soq_weight', 'soq_volume', 'msfid', 'oc_subscription']",OC,product.product,,"OC Product (Creator = ITC, ESC, UniData or HQ)",Valid,,600
 msf_sync_data_server.mission_product_creator_local,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('international_status','=','Local'), ('active', 'in', ['t','f'])]","['alert_time', 'batch_management', 'categ_id/id', 'closed_article', 'manufacturer_txt', 'manufacturer_ref', 'code', 'xmlid_code','cold_chain/id', 'composed_kit', 'cost_method', 'country_restriction/id', 'dangerous_goods', 'default_code', 'description', 'description2', 'description_purchase', 'description_sale', 'gmdn_code', 'gmdn_description', 'heat_sensitive_item/id', 'international_status/id', 'justification_code_id/id', 'library', 'life_time', 'list_ids/id','med_device_class', 'name', 'name_template', 'controlled_substance', 'nomen_manda_0/id', 'nomen_manda_1/id', 'nomen_manda_2/id', 'nomen_manda_3/id', 'options_ids/id', 'perishable', 'procure_delay', 'procure_method', 'produce_delay', 'product_catalog_page', 'product_catalog_path', 'property_account_expense/id', 'property_account_income/id', 'property_stock_account_input/id', 'property_stock_account_output/id', 'restricted_country', 'short_shelf_life', 'single_use', 'sterilized', 'standard_price', 'sublist', 'subtype', 'asset_type_id',  'supply_method', 'type', 'un_code', 'uom_id/id', 'uom_po_id/id','use_time', 'valuation', 'weight', 'weight_net', 'active', 'state', 'old_code', 'new_code', 'function_value', 'form_value', 'fit_value', 'standard_ok','transport_ok','volume', 'soq_quantity', 'soq_weight','soq_volume']",MISSION,product.product,,Mission Product (Creator = local),Valid,,601
 msf_sync_data_server.standard_product_list,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('standard_list_ok','=','True')]","['creation_date', 'creator', 'description', 'last_update_date', 'name', 'order_list_print_ok', 'ref', 'standard_list_ok', 'type']",OC,product.list,,Standard Product List,Valid,,605
+msf_sync_data_server.merge_product,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[]","['new_product_id/id', 'old_product_id/id']",MISSION,product.merged,,Merge Product,Valid,,608
 msf_sync_data_server.standard_product_list_line,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('list_id' , 'in', ('product.list', 'id', [('standard_list_ok','=','True')]))]","['comment','list_id/id','ref','name/id']",OC,product.list.line,,Standard Product List Line,Valid,,606
 msf_sync_data_server.tax_code,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,[],"['code', 'info', 'name', 'notprintable', 'sign']",OC,account.tax.code,,Tax Code,Valid,,610
 msf_sync_data_server.tax_code_tree,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('parent_id','!=','')]",['parent_id/id'],OC,account.tax.code,,Tax Code Tree,Valid,,611

=== modified file 'bin/addons/product/product.py'
--- bin/addons/product/product.py	2019-12-11 14:54:37 +0000
+++ bin/addons/product/product.py	2020-04-30 18:52:36 +0000
@@ -641,6 +641,8 @@
             if arg[0] == 'expected_prod_creator':
                 prod_creator_ids = self._get_authorized_creator(cr, uid, arg[2]=='bned', context)
 
+        if arg[2]!='bned':
+            return [('international_status', 'in', prod_creator_ids), ('replaced_by_product_id', '=', False)]
         return [('international_status', 'in', prod_creator_ids)]
 
     _defaults = {

=== modified file 'bin/addons/product_asset/product_asset.py'
--- bin/addons/product_asset/product_asset.py	2019-09-18 14:06:52 +0000
+++ bin/addons/product_asset/product_asset.py	2020-04-30 18:52:36 +0000
@@ -411,7 +411,7 @@
         #UF-2170: remove the standard price value from the list if the value comes from the sync
         #US-803: If the price comes from rw_sync, then take it
         # US-3254: update standard_pricde during initial sync (i.e if msf.instance is not set)
-        if 'standard_price' in vals and context.get('sync_update_execution', False) and not context.get('rw_sync', False):
+        if 'standard_price' in vals and context.get('sync_update_execution', False) and not context.get('rw_sync', False) and not context.get('keep_standard_price'):
             msf_instance = self.pool.get('res.users').browse(cr, uid, uid).company_id.instance_id
             if msf_instance:
                 del vals['standard_price']

=== modified file 'bin/addons/product_attributes/__openerp__.py'
--- bin/addons/product_attributes/__openerp__.py	2017-10-09 21:06:10 +0000
+++ bin/addons/product_attributes/__openerp__.py	2020-04-30 18:52:36 +0000
@@ -31,6 +31,7 @@
     'init_xml': [
         'security/ir.model.access.csv',
         'wizard/product_where_used_view.xml',
+        'wizard/product_merged_view.xml',
         'report/standard_price_track_changes_report.xml',
         'data/product_section_code.xml',
         'data/product_supply_source.xml',

=== modified file 'bin/addons/product_attributes/product_attributes.py'
--- bin/addons/product_attributes/product_attributes.py	2020-04-06 08:43:29 +0000
+++ bin/addons/product_attributes/product_attributes.py	2020-04-30 18:52:36 +0000
@@ -268,8 +268,10 @@
 class product_attributes_template(osv.osv):
     _inherit = "product.template"
 
+
     _columns = {
         'type': fields.selection([('product','Stockable Product'),('consu', 'Non-Stockable')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumables are stockable products with infinite stock, or for use when you have no inventory management in the system."),
+        'state': fields.many2one('product.status', 'Status', help="Tells the user if he can use the product or not."),
     }
 
     _defaults = {
@@ -290,19 +292,12 @@
 
 product_country_restriction()
 
-class product_template(osv.osv):
-    _inherit = 'product.template'
-
-    _columns = {
-        'state': fields.many2one('product.status', 'Status', help="Tells the user if he can use the product or not."),
-    }
-
-product_template()
-
 
 class product_attributes(osv.osv):
     _inherit = "product.product"
 
+    merged_fields_to_keep = ['procure_method', 'standard_price', 'list_price', 'soq_quantity', 'description_sale', 'description_purchase', 'procure_delay']
+
     def execute_migration(self, cr, moved_column, new_column):
         super(product_attributes, self).execute_migration(cr, moved_column, new_column)
 
@@ -655,16 +650,77 @@
                     dom += [ '&', ('batch_management', '=', False), ('perishable', '=', True)]
         return dom
 
+    def _search_show_ud(self, cr, uid, obj, name, args, context=None):
+        dom = []
+        for arg in args:
+            if arg[1] != '=':
+                raise osv.except_osv(_('Warning'), _('This filter is not implemented yet'))
+            if arg[2]:
+                dom = [('international_status', '=', 'UniData'), ('active', '=', True), ('standard_ok', 'in', ['non_standard', 'standard']), ('replace_product_id', '=', False)]
+            else:
+                dom = [('international_status', '=', 'UniData'), ('active', '=', False), ('standard_ok', '=', 'non_standard_local'), ('replace_product_id', '=', False)]
+
+        return dom
 
     def _get_local_from_hq(self, cr, uid, ids, field_name, args, context=None):
+        '''
+            used by sync to set active=False at coo / proj
+        '''
+
         res = {}
         for _id in ids:
             res[_id] = False
 
         if self.pool.get('res.company')._get_instance_level(cr, uid) == 'section':
-            for _id in self.search(cr, uid, [('id', 'in', ids), ('standard_ok', '=', 'non_standard_local')], context=context):
-                res[_id] = True
-
+            for _id in self.search(cr, uid, [('id', 'in', ids), ('standard_ok', '=', 'non_standard_local'), ('international_status', '=', 'UniData'), ('active', 'in', ['t', 'f'])], context=context):
+                res[_id] = True
+
+        return res
+
+    def _get_local_activation_from_merge(self, cr, uid, ids, field_name, args, context=None):
+        '''
+            used by sync to not sync down active=True from coo to proj, activation of UD prod from COO will be done by the sync merge update
+        '''
+        res = {}
+        for _id in ids:
+            res[_id] = False
+
+        if self.pool.get('res.company')._get_instance_level(cr, uid) == 'coordo':
+            for _id in self.search(cr, uid, [('id', 'in', ids), ('international_status', '=', 'UniData'), ('active', '=', True), ('replace_product_id', '!=', False)], context=context):
+                res[_id] = True
+
+        return res
+
+    def _get_product_instance_level(self, cr, uid, ids, field_name, args, context=None):
+        res = {}
+        level = self.pool.get('res.company')._get_instance_level(cr, uid)
+        for _id in ids:
+            res[_id] = level
+        return res
+
+    def _get_allow_merge(self, cr, uid, ids, field_name, args, context=None):
+        res = {}
+        for _id in ids:
+            res[_id] = False
+        if context is None:
+            context = {}
+        if context.get('sync_update_execution') or self.pool.get('res.company')._get_instance_level(cr, uid) == 'coordo':
+            dom = [('id', 'in', ids), ('international_status', '=', 'UniData'), ('replace_product_id', '=', False)]
+            if context.get('sync_update_execution'):
+                # UD prod deactivated in coordo + merge + sync : proj does not see the deactivation
+                dom += [('active', 'in', ['t', 'f'])]
+            else:
+                dom += ['|', '&', ('active', '=', False), ('standard_ok', '=', 'non_standard_local'), '&', ('active', '=', True), ('standard_ok', 'in', ['non_standard', 'standard'])]
+            for p_id in self.search(cr, uid, dom, context=context):
+                res[p_id] = True
+        return res
+
+    def _get_nsl_merged(self, cr, uid, ids, field_name, args, context=None):
+        res = {}
+        for _id in ids:
+            res[_id] = False
+        for _id in self.search(cr, uid, [('id', 'in', ids), ('replaced_by_product_id', '!=', False), ('active', 'in', ['t', 'f'])], context=context):
+            res[_id] = True
         return res
 
     _columns = {
@@ -958,13 +1014,20 @@
             string='Standardization Level',
             required=True,
         ),
-        'local_from_hq': fields.function(_get_local_from_hq, method=1, type='boolean', string='Non-Standard Local from HQ'),
+        'local_from_hq': fields.function(_get_local_from_hq, method=1, type='boolean', string='Non-Standard Local from HQ', help='Set to True when HQ generates a sync update on NSL product', internal=1),
+        'local_activation_from_merge': fields.function(_get_local_activation_from_merge, method=1, type='boolean', string='Non-Standard Local from COO', help='Activate on COO from merge', internal=1),
         'soq_weight': fields.float(digits=(16,5), string='SoQ Weight'),
         'soq_volume': fields.float(digits=(16,5), string='SoQ Volume'),
         'soq_quantity': fields.float(digits=(16,2), string='SoQ Quantity', related_uom='uom_id', help="Standard Ordering Quantity. Quantity according to which the product should be ordered. The SoQ is usually determined by the typical packaging of the product."),
         'vat_ok': fields.function(_get_vat_ok, method=True, type='boolean', string='VAT OK', store=False, readonly=True),
+        'nsl_merged': fields.function(_get_nsl_merged, method=True, type='boolean', string='UD / NSL merged'),
+        'replace_product_id': fields.many2one('product.product', string='Merged from', select=1),
+        'replaced_by_product_id': fields.many2one('product.product', string='Merged to'),
+        'allow_merge': fields.function(_get_allow_merge, type='boolean', method=True, string="UD Allow merge"),
         'uf_write_date': fields.datetime(_('Write date')),
         'uf_create_date': fields.datetime(_('Creation date')),
+        'instance_level': fields.function(_get_product_instance_level, method=True, string='Instance Level', internal=1, type='char'),
+        'show_ud': fields.function(_get_dummy, fnct_search=_search_show_ud, method=True, type='boolean', string='Search UD NSL or ST/NS', internal=1),
     }
 
     def _get_default_sensitive_item(self, cr, uid, context=None):
@@ -1043,6 +1106,12 @@
                 field.set('invisible', '0')
             res['arch'] = etree.tostring(root)
 
+        if view_type == 'tree' and context.get('display_old_code'):
+            root = etree.fromstring(res['arch'])
+            for field in root.xpath('//field[@name="old_code"]'):
+                field.set('invisible', '0')
+            res['arch'] = etree.tostring(root)
+
         if view_type == 'search' and context.get('available_for_restriction'):
             context.update({'search_default_not_restricted': 1})
             root = etree.fromstring(res['arch'])
@@ -1282,6 +1351,7 @@
         if context.get('sync_update_execution') and vals.get('local_from_hq'):
             vals['active'] = False
 
+
         def update_existing_translations(model, res_id, xmlid):
             # If we are in the creation of product by sync. engine, attach the already existing translations to this product
             if context.get('sync_update_execution'):
@@ -1352,6 +1422,7 @@
         vals['uf_create_date'] = vals.get('uf_create_date') or datetime.now()
 
         self.convert_price(cr, uid, vals, context)
+
         res = super(product_attributes, self).create(cr, uid, vals, context=context)
 
         if context.get('sync_update_execution'):
@@ -1414,7 +1485,6 @@
         if not ids:
             return True
         smrl_obj = self.pool.get('stock.mission.report.line')
-        prod_status_obj = self.pool.get('product.status')
         int_stat_obj = self.pool.get('product.international.status')
 
         if context is None:
@@ -1424,8 +1494,7 @@
             ids = [ids]
 
         self.clean_standard(cr, uid, vals, context)
-        if context.get('sync_update_execution') and vals.get('local_from_hq') and vals.get('active'):
-            del vals['active']
+
         if 'batch_management' in vals:
             vals['track_production'] = vals['batch_management']
             vals['track_incoming'] = vals['batch_management']
@@ -1466,21 +1535,35 @@
                         _("Product Code %s must include a 'Z' character") % (vals['default_code'],),
                     )
 
-        # update local stock mission report lines :
-        if 'state' in vals:
-            prod_state = ''
-            if vals['state']:
-                state_id = vals['state']
-                if isinstance(state_id, (int, long)):
-                    state_id = [state_id]
-                prod_state = prod_status_obj.read(cr, uid, state_id, ['code'], context=context)[0]['code']
-            local_smrl_ids = smrl_obj.search(cr, uid, [('product_state', '!=', prod_state), ('product_id', 'in', ids), ('full_view', '=', False), ('mission_report_id.local_report', '=', True)], context=context)
+        if context.get('sync_update_execution') and vals.get('local_from_hq'):
+            if vals.get('active'):
+                del(vals['active'])
+
+            # do not erase values from merged product
+            if self.search_exist(cr, uid, [('id', 'in', ids), ('replace_product_id', '!=', False)], context=context):
+                for field in self.merged_fields_to_keep + ['old_code']:
+                    if field in vals:
+                        del(vals[field])
+
+        if context.get('sync_update_execution') and vals.get('local_activation_from_merge') and vals.get('active'):
+            # active value on project will be set by the update to merge product
+            del(vals['active'])
+
+
+        if 'state_ud' in vals:
+            # just update SMRL that belongs to our instance:
+            local_smrl_ids = smrl_obj.search(cr, uid, [
+                ('product_id', 'in', ids),
+                ('full_view', '=', False),
+                ('mission_report_id.local_report', '=', True),
+                ('state_ud', '!=', vals['state_ud'] or ''),
+            ], context=context)
             if local_smrl_ids:
                 no_sync_context = context.copy()
                 no_sync_context['sync_update_execution'] = False
-                smrl_obj.write(cr, 1, local_smrl_ids, {'product_state': prod_state}, context=no_sync_context)
+                smrl_obj.write(cr, 1, local_smrl_ids, {'state_ud': vals['state_ud'] or ''}, context=no_sync_context)
 
-        if intstat_code:
+        if 'international_status' in vals:
             # just update SMRL that belongs to our instance:
             local_smrl_ids = smrl_obj.search(cr, uid, [
                 ('international_status_code', '!=', intstat_code),
@@ -1493,19 +1576,6 @@
                 no_sync_context['sync_update_execution'] = False
                 smrl_obj.write(cr, 1, local_smrl_ids, {'international_status_code': intstat_code or ''}, context=no_sync_context)
 
-        if 'state_ud' in vals:
-            # just update SMRL that belongs to our instance:
-            local_smrl_ids = smrl_obj.search(cr, uid, [
-                ('product_id', 'in', ids),
-                ('full_view', '=', False),
-                ('mission_report_id.local_report', '=', True),
-                ('state_ud', '!=', vals['state_ud'] or ''),
-            ], context=context)
-            if local_smrl_ids:
-                no_sync_context = context.copy()
-                no_sync_context['sync_update_execution'] = False
-                smrl_obj.write(cr, 1, local_smrl_ids, {'state_ud': vals['state_ud'] or ''}, context=no_sync_context)
-
         product_uom_categ = []
         if 'uom_id' in vals or 'uom_po_id' in vals:
             if isinstance(ids, (int, long)):
@@ -1528,13 +1598,20 @@
                     vals.update({
                         'active': True,
                     })
-            elif vals.get('active', None) is True:
-                vals.update({
-                    'active': True,
-                    #                    'state': phase_out_status,
-                })
-
-        if 'active' in vals:
+                elif vals.get('active', None) is True:
+                    vals.update({
+                        'active': True,
+                        #                    'state': phase_out_status,
+                    })
+
+        if 'state' in vals:
+            local_smrl_ids = smrl_obj.search(cr, uid, [('product_state', '!=', vals['state']), ('product_id', 'in', ids), ('full_view', '=', False), ('mission_report_id.local_report', '=', True)], context=context)
+            if local_smrl_ids:
+                no_sync_context = context.copy()
+                no_sync_context['sync_update_execution'] = False
+                smrl_obj.write(cr, 1, local_smrl_ids, {'product_state': vals['state']}, context=no_sync_context)
+
+        if ids and 'active' in vals:
             local_smrl_ids = smrl_obj.search(cr, uid, [
                 ('product_id', 'in', ids),
                 ('full_view', '=', False),
@@ -1566,6 +1643,7 @@
                     self.set_as_edonly(cr, uid, ids, context=context)
                 else:
                     self.set_as_nobn_noed(cr, uid, ids, context=context)
+
         res = super(product_attributes, self).write(cr, uid, ids, vals, context=context)
 
         if product_uom_categ:
@@ -1577,7 +1655,6 @@
 
         return res
 
-
     def reactivate_product(self, cr, uid, ids, context=None):
         '''
         Re-activate product.
@@ -1603,7 +1680,7 @@
 
         return True
 
-    def deactivate_product(self, cr, uid, ids, context=None):
+    def deactivate_product(self, cr, uid, ids, context=None, try_only=False):
         '''
         De-activate product.
         Check if the product is not used in any document in Unifield
@@ -1614,7 +1691,6 @@
         if isinstance(ids, (int, long)):
             ids = [ids]
 
-        # TODO JFB RR: constraint
         location_obj = self.pool.get('stock.location')
         po_line_obj = self.pool.get('purchase.order.line')
         tender_line_obj = self.pool.get('tender.line')
@@ -1859,6 +1935,10 @@
                                                         'doc_ref': invoice.invoice_id.number,
                                                         'doc_id': invoice.invoice_id.id}, context=context)
 
+
+                if try_only:
+                    return {'ok': False, 'error': wizard_id}
+
                 if context.get('sync_update_execution', False):
                     context['bypass_sync_update'] = True
                 self.write(cr, uid, product.id, {
@@ -1873,6 +1953,9 @@
                         'target': 'new',
                         'context': context}
 
+        if try_only:
+            return {'ok': True, 'error': False}
+
         if context.get('sync_update_execution', False):
             context['bypass_sync_update'] = True
 
@@ -1969,6 +2052,11 @@
         product2copy = self.read(cr, uid, [id], ['default_code', 'name'])[0]
         if default is None:
             default = {}
+
+        for to_reset in ['replace_product_id', 'replaced_by_product_id']:
+            if to_reset not in default:
+                default[to_reset] = False
+
         temp_status = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'product_attributes', 'int_5')[1]
 
         copy_pattern = _("%s (copy)")
@@ -2350,12 +2438,241 @@
         nb += self.switch_bn_to_no(cr, uid, ids, context)
         return nb
 
+    def check_same_value(self, cr, uid, new_prod_id, old_prod_id, blocker=True, context=None):
+
+        if blocker:
+            fields_to_check = [
+                'type', 'subtype', 'perishable', 'batch_management', 'uom_id'
+            ]
+        else:
+            fields_to_check = [
+                'nomen_manda_0', 'nomen_manda_1', 'nomen_manda_2', 'heat_sensitive_item', 'controlled_substance', 'dangerous_goods'
+            ]
+
+        old_values = self.read(cr, uid, old_prod_id, fields_to_check, context=context)
+        new_values = self.read(cr, uid, new_prod_id, fields_to_check, context=context)
+
+        failed = []
+        for f in fields_to_check:
+            if old_values[f] != new_values[f]:
+                failed.append(f)
+
+        if failed:
+            fields_data = self.fields_get(cr, uid, failed, context=context)
+            values = {'attr': ', '.join([fields_data[x].get('string') for x in failed])}
+            if blocker:
+                return _('There is an inconsistency between the selected products: %(attr)s need to be the same. Please update your local product %(attr)s and then proceed with the merge.') % values
+            return _('There is an inconsistency between the selected products’  %(attr)s . Do you still want to proceed with the merge?') % values
+
+        return ''
+
+    def open_merge_product_wizard(self, cr, uid, prod_id, context=None):
+        if self.pool.get('res.company')._get_instance_level(cr, uid) != 'coordo':
+            raise osv.except_osv(_('Warning'), _('Merge products can only be done at Coordo level.'))
+
+        wiz_id = self.pool.get('product.merged.wizard').create(cr, uid, {'old_product_id': prod_id[0]}, context=context)
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': 'product.merged.wizard',
+            'res_id': wiz_id,
+            'view_type': 'form',
+            'view_mode': 'form',
+            'target': 'new',
+            'context': context,
+            'height': '400px',
+            'width': '720px',
+        }
+
+
+    def _error_used_in_doc(self, cr, uid, prod_id, context=None):
+        error = []
+
+        doc_field_error_dom = [
+            ('stock.move', 'product_id', _('stock move(s)'), []),
+            ('stock.production.lot', 'product_id', _('batch(es)'), []),
+            ('purchase.order.line', 'product_id', _('PO line(s)'), [('rfq_ok', '=', False)]),
+            ('purchase.order.line', 'product_id', _('RfQ line(s)'), [('rfq_ok', '=', True)]),
+            ('sale.order.line', 'product_id', _('FO line(s)'), [('procurement_request', '=', False)]),
+            ('sale.order.line', 'product_id', _('IR line(s)'), [('procurement_request', '=', True)]),
+            ('tender.line', 'product_id', _('Tender line(s)'), []),
+            ('physical.inventory.counting', 'product_id', _('Inventory line(s)'), []),
+            ('initial.stock.inventory.line', 'product_id', _('Initial Stock Inventory line(s)'), []),
+            ('real.average.consumption.line', 'product_id', _('RAC line(s)'), []),
+            ('replenishment.segment.line', 'product_id', _('Replenishment Segment line(s)'), []),
+            ('product.list.line', 'name', _('Product list line(s)'), []),
+            ('composition.kit', 'composition_product_id', _('Composition Kit(s)'), []),
+            ('composition.item', 'item_product_id', _('Composition Kit line(s)'), []),
+        ]
+
+        for obj, field, msg, dom in doc_field_error_dom:
+            nb = self.pool.get(obj).search(cr, uid, [(field, '=', prod_id)]+dom, count=True, context=context)
+            if nb:
+                error.append('%d %s' % (nb, msg))
+
+        return ', '.join(error)
+
+
+    def _has_pipe(self, cr, uid, ids):
+        if not ids:
+            return False
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        cr.execute('''
+                    select
+                        l.product_id
+                    from
+                        stock_mission_report r, msf_instance i, stock_mission_report_line l
+                    where
+                        i.id = r.instance_id and
+                        i.state = 'active' and
+                        l.mission_report_id = r.id and
+                        l.product_id in %s and
+                        r.full_view = 'f' and
+                        ( l.internal_qty > 0 or l.in_pipe_qty > 0)
+                    group by l.product_id
+                ''' , (tuple(ids), ))
+        return [x[0] for x in cr.fetchall()]
+
+
+    def merge_product(self, cr, uid, nsl_prod_id, local_id, context=None):
+        if context is None:
+            context = {}
+
+        new_data = self.read(cr, uid, nsl_prod_id, ['default_code','old_code', 'allow_merge'], context=context)
+        if not new_data['allow_merge']:
+            raise osv.except_osv(_('Warning'), _('New product %s condition not met') % new_data['default_code'])
+
+        error_used = self._error_used_in_doc(cr, uid, nsl_prod_id, context=None)
+        if error_used:
+            raise osv.except_osv(_('Warning'), _('The selected UD product %s has already been used in the past. Merge cannot be done for this product') % (new_data['default_code'], ))
+
+        if self._has_pipe(cr, uid, nsl_prod_id):
+            raise osv.except_osv(_('Warning'), _('Warning there is stock / pipeline in at least one of the instances in this mission! Therefore the product cannot be merged') % (new_data['default_code'], ))
+
+        local_dom = [('id', '=', local_id), ('international_status', '=', 'Local'), ('replaced_by_product_id', '=', False)]
+        if not context.get('sync_update_execution'):
+            local_dom += [('active', '=', True)]
+        else:
+            local_dom += [('active', 'in', ['t', 'f'])]
+        if not self.search_exist(cr, uid, local_dom, context=context):
+            old_prod = self.read(cr, uid, local_id, ['default_code'], context=context)
+            raise osv.except_osv(_('Warning'), _('Old merged product %s: condition not met: active, local product') % old_prod['default_code'])
+
+
+        block_msg = self.check_same_value( cr, uid,  nsl_prod_id, local_id, blocker=True, context=context)
+        if block_msg:
+            prod_data = self.read(cr, uid, [nsl_prod_id, local_id], ['default_code'], context=context)
+            raise osv.except_osv(_('Warning'), '%s\nProducts: %s and %s' % (block_msg, prod_data[0]['default_code'], prod_data[1]['default_code']))
+
+        blacklist_table = {
+            'product_template': [
+                ('product_product', 'product_tmpl_id')
+            ],
+            'product_product': [
+                ('stock_mission_report_line', 'product_id'),
+                ('stock_mission_report_line_location', 'product_id'),
+                ('prod_mass_update_product_rel', 'prod_mass_update_id'),
+                ('product_mass_update_errors', 'product_id'),
+                ('product_product', 'replace_product_id'),
+                ('product_product', 'replaced_by_product_id'),
+            ]
+        }
+
+
+        default_code = new_data['default_code']
+        for table in ['product_product', 'product_template']:
+            for x in cr.get_referenced(table):
+                if (x[0], x[1]) in blacklist_table.get(table):
+                    continue
+
+                params = {'old_prod': local_id, 'nsl_prod_id': nsl_prod_id}
+                if cr.column_exists(x[0], 'default_code'):
+                    params['default_code'] = default_code
+                    add_query = ' , default_code=%(default_code)s '
+                else:
+                    add_query = ''
+
+                cr.execute('update '+x[0]+' set '+x[1]+'=%(nsl_prod_id)s '+add_query+' where '+x[1]+'=%(old_prod)s', params) # not_a_user_entry
+
+        new_write_data = {'active': True, 'replace_product_id': local_id}
+        old_prod_data = self.read(cr, uid, local_id, self.merged_fields_to_keep+['default_code'], context=context)
+        write_context = context.copy()
+        if not context.get('sync_update_execution'):
+            fields_to_keep = self.merged_fields_to_keep
+            new_write_data['old_code'] = '%s;%s' % (new_data['old_code'], old_prod_data['default_code']) if new_data['old_code'] else old_prod_data['default_code']
+        else:
+            fields_to_keep = ['list_price', 'standard_price']
+            write_context['keep_standard_price'] = True
+
+        for field in fields_to_keep:
+            new_write_data[field] = old_prod_data[field]
+
+        self.write(cr, uid, nsl_prod_id, new_write_data, context=write_context)
+
+        self.write(cr, uid, local_id, {'active': False, 'replaced_by_product_id': nsl_prod_id}, context=context)
+        if not context.get('sync_update_execution'):
+            self.pool.get('product.merged').create(cr, 1, {'new_product_id': nsl_prod_id, 'old_product_id': local_id}, context=context)
+
+        # reset mission stock on nsl + old to 0, will be computed on next mission stock update
+        mission_stock_fields_reset = [
+            'stock_qty', 'stock_val',
+            'in_pipe_coor_qty', 'in_pipe_coor_val', 'in_pipe_qty', 'in_pipe_val',
+            'secondary_qty', 'secondary_val',
+            'cu_qty', 'cu_val',
+            'central_qty', 'central_val',
+            'cross_qty', 'cross_val',
+            'wh_qty', 'internal_qty'
+        ]
+        cr.execute('''
+            update stock_mission_report_line set ''' + ', '.join(['%s=%%(zero)s' % field  for field in mission_stock_fields_reset]) + '''
+                where
+                mission_report_id in (select id from stock_mission_report where full_view='f' and instance_id=%(local_instance_id)s) and
+                product_id in %(product_ids)s
+        ''', {'zero': 0, 'local_instance_id': self.pool.get('res.company')._get_instance_id(cr, uid),  'product_ids': (nsl_prod_id, local_id)}) # not_a_user_entry
+        cr.execute("delete from mission_line_move_rel where move_id in (select id from stock_move where product_id = %s)", (nsl_prod_id,))
+        cr.execute("delete from mission_move_rel where move_id in (select id from stock_move where product_id = %s)", (nsl_prod_id,))
+
+        return True
+
+
     _constraints = [
         (_check_gmdn_code, 'Warning! GMDN code must be digits!', ['gmdn_code'])
     ]
 
 product_attributes()
 
+class product_merged(osv.osv):
+    """
+        Object mainly used to trigger sync update
+    """
+
+    _name = 'product.merged'
+    _description = 'NSL products merged'
+    _rec_name = 'new_product_id'
+
+    _columns = {
+        'new_product_id': fields.many2one('product.product', 'UD NSL Product', required=1, select=1),
+        'old_product_id': fields.many2one('product.product', 'Old local Product', required=1, select=1),
+    }
+
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+
+        new_id  = super(product_merged, self).create(cr, uid, vals, context=context)
+        if context.get('sync_update_execution'):
+            self.pool.get('product.product').merge_product(cr, uid, vals['new_product_id'], vals['old_product_id'], context=context)
+
+        return new_id
+
+    _sql_constraints = [
+        ('unique_new_product_id', 'unique(new_product_id)', 'UD already used to merge a local product'),
+        ('unique_old_product_id', 'unique(old_product_id)', 'Local product already merged'),
+    ]
+
+product_merged()
 
 class product_deactivation_error(osv.osv_memory):
     _name = 'product.deactivation.error'

=== modified file 'bin/addons/product_attributes/product_attributes_view.xml'
--- bin/addons/product_attributes/product_attributes_view.xml	2020-03-31 12:31:03 +0000
+++ bin/addons/product_attributes/product_attributes_view.xml	2020-04-30 18:52:36 +0000
@@ -14,6 +14,7 @@
                         <tree colors="red:virtual_available&lt;0;blue:virtual_available&gt;=0 and state in ('draft', 'end', 'obsolete');grey:active == False" string="Products">
                         <field name="default_code" string="Code"/>
                         <field name="name" string="Description"/>
+                        <field name="old_code" invisible="1" />
                         <field name="categ_id" invisible="1"/>
                         <field name="uom_id" string="UoM"/>
                         <field name="type"   invisible="1" />
@@ -64,8 +65,7 @@
                    <group colspan="4" col="6">
                         <group colspan="1" col="2">
                             <separator string="Codes" colspan="2"/>
-                            <field name="default_code" required="1" string="Code"  on_change="onchange_code(default_code)" 
-                            attrs="{'readonly':[('duplicate_ok','=',False)]}" />
+                            <field name="default_code" required="1" string="Code"  on_change="onchange_code(default_code)" attrs="{'readonly':[('duplicate_ok','=',False)]}" />
                             <field name="new_code"/>
                             <field name="duplicate_ok" invisible="1"/>
                         </group>
@@ -117,10 +117,15 @@
                                 <field name="state" colspan="3" widget="selection" />
                                 <field name="state_ud" colspan="3" />
                                 <field name="oc_subscription" colspan="3" readonly="1" attrs="{'invisible': [('int_status_code', '!=', 'unidata')]}"/>
-                                <field name="active" readonly="1"/>
+                                <group colspan="2" col="4">
+                                    <field name="active" readonly="1"/>
+                                    <field name="nsl_merged" attrs="{'invisible': [('int_status_code', '!=', 'local')]}" />
+                                </group>
+                                <field name="instance_level" invisible="1" />
                                 <group colspan="1" col="1">
                                    <button name="deactivate_product" icon="gtk-execute" string="De-activate product" type="object" attrs="{'invisible': [('active', '=', False)]}" />
-                                   <button name="reactivate_product" icon="gtk-execute" string="Re-activate product" type="object" attrs="{'invisible': [('active', '=', True)]}" />
+                                   <button name="reactivate_product" icon="gtk-execute" string="Re-activate product" type="object" attrs="{'invisible': ['|', ('active', '=', True), ('nsl_merged', '=', True)]}" />
+                                   <button name="open_merge_product_wizard" icon="gtk-convert" string="Merge product" type="object"  attrs="{'invisible': ['|', '|', '|', ('int_status_code', '!=', 'local'), ('nsl_merged', '=', True), ('active', '=', False), ('instance_level', '!=', 'coordo')]}"/>
                                 </group>
                             </group>
                             <group colspan="2" col="3" name="quality">
@@ -161,11 +166,6 @@
                             <group colspan="2" col="2">
                                 <separator string="Diffusion" colspan="2"/>
                                 <field name="justification_code_id" colspan="2" />
-                                <!-- uf-1544
-                                <field name="med_device_class" colspan="2" />
-                                <field name="gmdn_code" colspan="2" />
-                                <field name="gmdn_description" colspan="2" />
-                                 -->
                                 <field name="closed_article" colspan="2"/>
                                 <field name="manufacturer_ref" attrs="{'invisible': [('closed_article', '=', 'no')]}" />
                                 <field name="manufacturer_txt" attrs="{'invisible': [('closed_article', '=', 'no')]}" />
@@ -301,10 +301,6 @@
                             <!-- uf-1544 invisible-->
                             <group colspan="2" col="2" name="store">
                             </group>
-                            <!-- 
-                                <separator string="Storage Localisation" colspan="2"/>
-                                <field name="loc_indic" attrs="{'readonly':[('type','=','service')]}" />
-                             -->
 
                         </page>
                     </notebook>

=== modified file 'bin/addons/product_attributes/wizard/__init__.py'
--- bin/addons/product_attributes/wizard/__init__.py	2013-08-08 14:33:01 +0000
+++ bin/addons/product_attributes/wizard/__init__.py	2020-04-30 18:52:36 +0000
@@ -20,5 +20,5 @@
 ##############################################################################
 
 import product_where_used
-
+import product_merged
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'bin/addons/product_attributes/wizard/product_merged.py'
--- bin/addons/product_attributes/wizard/product_merged.py	1970-01-01 00:00:00 +0000
+++ bin/addons/product_attributes/wizard/product_merged.py	2020-04-30 18:52:36 +0000
@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+
+from osv import osv
+from osv import fields
+from tools.translate import _
+
+
+class product_merged_wizard(osv.osv_memory):
+    _name = 'product.merged.wizard'
+
+
+    _columns = {
+        'old_product_id': fields.many2one('product.product', 'Old local Product', readonly=1),
+        'new_product_id': fields.many2one('product.product', 'UD Product'),
+        'show_ud': fields.boolean('Use Standard / Non Standard UD product', help="Unticked: display UD NSL inactive products\nTicked: display UD ST + NS active products"),
+        'ud_old_code': fields.char('UD Old code', readonly=1, size=1024),
+        'warning_msg': fields.text('Warning Message'),
+        'warning_checked': fields.boolean('Warning Checked'),
+    }
+
+    def do_merge_product(self, cr, uid, ids, context=None):
+        prod_obj = self.pool.get('product.product')
+        wiz = self.browse(cr, uid, ids[0], context)
+
+        error_used = prod_obj._error_used_in_doc(cr, uid, wiz.new_product_id.id, context=context)
+        if error_used:
+            raise osv.except_osv(_('Warning'), _('The selected UD product has already been used in the past. Merge cannot be done for this product.'))
+
+        if prod_obj._has_pipe(cr, uid, wiz.new_product_id.id):
+            raise osv.except_osv(_('Warning'), _('Warning there is stock / pipeline in at least one of the instances in this mission! Therefore this product cannot be merged.'))
+
+        block_msg = prod_obj.check_same_value(cr, uid, wiz.new_product_id.id, wiz.old_product_id.id, blocker=True, context=context)
+        if block_msg:
+            raise osv.except_osv(_('Warning'), block_msg)
+
+        if not wiz.warning_checked:
+            warn_msg = prod_obj.check_same_value(cr, uid, wiz.new_product_id.id, wiz.old_product_id.id, blocker=False, context=context)
+            if warn_msg:
+                self.write(cr, uid, ids, {'warning_msg': warn_msg, 'warning_checked': True, 'ud_old_code': wiz.new_product_id.old_code}, context=context)
+                return {
+                    'type': 'ir.actions.act_window',
+                    'res_model': 'product.merged.wizard',
+                    'view_type': 'form',
+                    'view_mode': 'form',
+                    'target': 'new',
+                    'res_id': ids[0],
+                    'context': context,
+                    'height': '400px',
+                    'width': '720px',
+                }
+
+
+        prod_obj.merge_product(cr, uid, wiz.new_product_id.id, wiz.old_product_id.id, context=None)
+        res = self.pool.get('ir.actions.act_window').open_view_from_xmlid(cr, uid, 'product.product_normal_action', ['form', 'tree'], context=context)
+        res['res_id'] = wiz.new_product_id.id
+        return res
+
+    def change_warning(self, cr, uid, ids, new_prod, context=None):
+        old_code =False
+        if new_prod:
+            old_code = self.pool.get('product.product').browse(cr, uid, new_prod, fields_to_fetch=['old_code'], context=context).old_code
+        return {'value': {'warning_checked': False, 'warning_msg': False, 'ud_old_code': old_code}}
+
+product_merged_wizard()

=== added file 'bin/addons/product_attributes/wizard/product_merged_view.xml'
--- bin/addons/product_attributes/wizard/product_merged_view.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/product_attributes/wizard/product_merged_view.xml	2020-04-30 18:52:36 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="product_merged_wizard_form_view" model="ir.ui.view">
+            <field name="name">product.merged.wizard.form.view</field>
+            <field name="model">product.merged.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Merge Product">
+                    <field name="old_product_id" colspan="4" />
+                    <field name="show_ud" />
+                    <field name="new_product_id" colspan="4" required="1" on_change="change_warning(new_product_id)" domain="[('show_ud', '=', show_ud), ('active', 'in', ['t', 'f'])]" context="{'display_active_filter': 0, 'display_old_code': 1}"/>
+                    <field name="ud_old_code" />
+                    <field name="warning_checked" invisible="1" />
+                    <group colspan="4" attrs="{'invisible': [('warning_msg', '=', False)]}">
+                        <separator colspan="4" string="Warning" />
+                        <field name="warning_msg" colspan="4" nolabel="1" />
+                    </group>
+                    <button name="do_merge_product" string="Merge Product" type="object"  icon="gtk-ok" colspan="2" />
+                    <button special="cancel" string="Cancel" icon="gtk-cancel" colspan="2" />
+                </form>
+            </field>
+        </record>
+    </data>
+</openerp>

=== modified file 'bin/addons/register_accounting/account_bank_statement.py'
=== modified file 'bin/addons/register_accounting/account_invoice_view.xml'
=== modified file 'bin/addons/register_accounting/account_view.xml'
=== modified file 'bin/addons/sync_common/common.py'
--- bin/addons/sync_common/common.py	2020-01-30 10:35:55 +0000
+++ bin/addons/sync_common/common.py	2020-04-30 18:52:36 +0000
@@ -92,6 +92,7 @@
     'product.justification.code',
     'product.list',
     'product.list.line',
+    'product.merged',
     'product.nomenclature',
     'product.pricelist',
     'product.pricelist.type',

=== modified file 'bin/addons/sync_so/so_po_common.py'
--- bin/addons/sync_so/so_po_common.py	2018-11-09 16:10:16 +0000
+++ bin/addons/sync_so/so_po_common.py	2020-04-30 18:52:36 +0000
@@ -359,6 +359,12 @@
         header_result['currency_id'] = currency_id
         return header_result
 
+    def check_merge(self, cr, uid, prod_id):
+        merged = self.pool.get('product.product').search(cr, uid, [('replace_product_id', '=', prod_id), ('active', 'in', ['t', 'f'])])
+        if merged:
+            return merged[0]
+        return prod_id
+
     def get_product_id(self, cr, uid, data, default_code=False, context=None):
         # us-1586: use msfid to search product in intersection flow, else use sdref
         # US-3282: intermission / intersection: last try on default_code
@@ -376,11 +382,11 @@
             # msfid has no uniq constraint if only 1 active product: ok, elif more than 1 product found raise
             prod_ids = prod_obj.search(cr, uid, [('msfid', '=', msfid), ('active', 'in', ['t', 'f'])], limit=2, order='NO_ORDER', context=context)
             if len(prod_ids) == 1:
-                return prod_ids[0]
+                return self.check_merge(cr, uid, prod_ids[0])
             elif len(prod_ids) > 1:
                 prod_ids = prod_obj.search(cr, uid, [('msfid', '=', msfid), ('active', '=', 't')], limit=2, order='NO_ORDER', context=context)
                 if len(prod_ids) == 1:
-                    return prod_ids[0]
+                    return self.check_merge(cr, uid, prod_ids[0])
                 raise Exception("Duplicate product for msfid %s" % msfid)
 
         if hasattr(data, 'id') and data.id:
@@ -391,12 +397,12 @@
         if pid:
             prod_id = prod_obj.find_sd_ref(cr, uid, xmlid_to_sdref(pid), context=context)
             if prod_id:
-                return prod_id
+                return self.check_merge(cr, uid, prod_id)
 
         if default_code:
             prod_ids = prod_obj.search(cr, uid, [('default_code', '=', default_code), ('active', 'in', ['t', 'f'])], limit=1, order='NO_ORDER', context=context)
             if prod_ids:
-                return prod_ids[0]
+                return self.check_merge(cr, uid, prod_ids[0])
 
         return False
 

=== modified file 'bin/sql_db.py'
--- bin/sql_db.py	2018-02-22 14:23:17 +0000
+++ bin/sql_db.py	2020-04-30 18:52:36 +0000
@@ -173,7 +173,7 @@
                 if osv_pool:
                     for key in osv_pool._sql_error.keys():
                         if key in ie[0]:
-                            self.__logger.warn("Normal Constraint Error: %s : %s", self._obj.query or query, ie[0])
+                            self.__logger.warn("Normal Constraint Error: %s : %s", self._obj.query or query, tools.misc.ustr(ie[0]))
                             #US-88: if error occurred for account analytic then just clear the cache
                             if 'account_analytic_account_parent_id_fkey' in ie[0]:
                                 cache.clean_caches_for_db(self.dbname)
@@ -306,6 +306,20 @@
         return self.rowcount
 
     @check
+    def get_referenced(self, table, column='id'):
+        self.execute("""
+            SELECT tc.table_name, kcu.column_name, ref.delete_rule
+            FROM information_schema.table_constraints AS tc
+                JOIN information_schema.key_column_usage AS kcu ON tc.constraint_name = kcu.constraint_name
+                JOIN information_schema.constraint_column_usage AS ccu ON ccu.constraint_name = tc.constraint_name
+                JOIN information_schema.referential_constraints AS ref ON ref.constraint_name = tc.constraint_name
+            WHERE
+                tc.constraint_type = 'FOREIGN KEY' AND
+                ccu.table_name=%s AND
+                ccu.column_name=%s
+        """, (table, column))
+        return self.fetchall()
+    @check
     def drop_constraint_if_exists(self, table, constraint):
         self.execute("SELECT conname FROM pg_constraint WHERE conname = %s", (constraint, ))
         if self.fetchone():