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

[jftempo]

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

6272. By jftempo on 2024-05-10

[FIX] nomenclature label / don't touch product accounts / dangerous_good added / single_use 'Not Applicable' to no_know / thermosensitive: empty to No

6273. By jftempo on 2024-05-10

[MERGE] trunk

6274. By jftempo on 2024-05-10

UD Pull: deactivate cron

6275. By jftempo on 2024-05-10

Remove fit_value, form_value, function_value from pull

6276. By jftempo on 2024-05-10

dangeours_goods: typo

6277. By jftempo on 2024-05-13

Single use: Not applicable mapped to No

6278. By jftempo on 2024-05-13

add publishonweb=False

=== modified file 'bin/addons/msf_audittrail/data/audittrail_data_products.yml'
--- bin/addons/msf_audittrail/data/audittrail_data_products.yml	2024-04-12 14:41:30 +0000
+++ bin/addons/msf_audittrail/data/audittrail_data_products.yml	2024-05-13 13:47:13 +0000
@@ -6,7 +6,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', 'replace_product_id', 'replaced_by_product_id', 'oc_subscription', 'state_ud', 'un_code', 'msfid', 'oc_validation', 'oc_validation_date', 'oc_devalidation_date', 'oc_devalidation_reason', 'oc_comments', 'oc_project_restrictions', 'oc_country_restrictions']
+        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', 'oc_subscription', 'state_ud', 'un_code', 'hs_code', 'msfid', 'oc_validation', 'oc_validation_date', 'oc_devalidation_date', 'oc_devalidation_reason', 'oc_comments', 'oc_project_restrictions', 'oc_country_restrictions', 'closed_article', 'cold_chain', 'manufacturer_ref', 'manufacturer_txt', 'xmlid_code', 'product_catalog_path', 'short_shelf_life', 'single_use', 'sterilized']
         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_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2024-05-06 12:42:13 +0000
+++ bin/addons/msf_profile/data/patches.xml	2024-05-13 13:47:13 +0000
@@ -1044,6 +1044,7 @@
             <field name="method">us_12294_force_email_popup</field>
         </record>
 
+
         <!-- UF33.0 -->
         <record id="us_12074_gdpr_remove_personal_data_from_track_changess" model="patch.scripts">
             <field name="method">us_12074_gdpr_remove_personal_data_from_track_changes</field>
@@ -1053,10 +1054,17 @@
             <field name="method">us_11135_set_pol_confirmation_date</field>
         </record>
 
+<<<<<<< TREE
         <record id="us_12350_is_default_update" model="patch.scripts">
             <field name="method">us_12350_is_default_update</field>
         </record>
 
+=======
+        <record id="us_12826_unidata_pull_info" model="patch.scripts">
+            <field name="method">us_12826_unidata_pull_info</field>
+        </record>
+
+>>>>>>> MERGE-SOURCE
 
     </data>
 </openerp>

=== added file 'bin/addons/msf_profile/data/ud_default_oc_value.csv'
--- bin/addons/msf_profile/data/ud_default_oc_value.csv	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_profile/data/ud_default_oc_value.csv	2024-05-13 13:47:13 +0000
@@ -0,0 +1,177 @@
+Identifier,MSF Entity,Attribute,OC Rules,Default Value
+96,OCA,perishable,[OCA] D - Drugs | ,Yes
+98,OCA,perishable,[OCA] K - Kits | MED - Medical kits,Yes
+99,OCA,perishable,[OCA] N - Nutrition | FOO - Food commodities,Yes
+100,OCA,perishable,[OCA] N - Nutrition | FOS - Specialized food,Yes
+101,OCA,perishable,"[OCA] S - Renewable medical supplies | CTD - Catheters, tubes and drains",Yes
+102,OCA,perishable,[OCA] S - Renewable medical supplies | INS - Injection supplies,Yes
+103,OCA,perishable,[OCA] S - Renewable medical supplies | LAS - Laboratory reagents,Yes
+104,OCA,perishable,[OCA] S - Renewable medical supplies | SDT - Stand-alone diagnostic tests,Yes
+105,OCA,perishable,[OCA] S - Renewable medical supplies | SUT - Sutures,Yes
+106,OCA,batch_management,[OCA] D - Drugs | ,Yes
+107,OCA,batch_management,[OCA] K - Kits | MED - Medical kits,Yes
+108,OCA,batch_management,[OCA] N - Nutrition | FOO - Food commodities,Yes
+109,OCA,batch_management,[OCA] N - Nutrition | FOS - Specialized food,Yes
+110,OCA,batch_management,"[OCA] S - Renewable medical supplies | CTD - Catheters, tubes and drains",Yes
+111,OCA,batch_management,[OCA] S - Renewable medical supplies | INS - Injection supplies,Yes
+112,OCA,batch_management,[OCA] S - Renewable medical supplies | LAS - Laboratory reagents,Yes
+113,OCA,batch_management,[OCA] S - Renewable medical supplies | SDT - Stand-alone diagnostic tests,Yes
+114,OCA,batch_management,[OCA] S - Renewable medical supplies | SUT - Sutures,Yes
+115,OCA,type,[OCA] X - Services | ,Service with Reception
+116,OCA,subtype,[OCA] K - Kits | ,Kit/Module
+117,OCA,procure_method,[OCA] X - Services | ,Make to Order
+196,OCA,procure_method,[OCA] L - Library | ,Make to Order
+197,OCA,perishable,[OCA] S - Renewable medical supplies | AST - Antibiotic Susceptibility Testing Items,Yes
+198,OCA,perishable,[OCA] S - Renewable medical supplies | BCM - Bacteriological culture media,Yes
+199,OCA,perishable,[OCA] S - Renewable medical supplies | BID - Bacterial identification system,Yes
+200,OCA,perishable,[OCA] S - Renewable medical supplies | BQC - Bacterial strains Quality Control,Yes
+201,OCA,perishable,[OCA] S - Renewable medical supplies | DIS - Disinfectants,Yes
+202,OCA,batch_management,[OCA] S - Renewable medical supplies | AST - Antibiotic Susceptibility Testing Items,Yes
+203,OCA,batch_management,[OCA] S - Renewable medical supplies | BCM - Bacteriological culture media,Yes
+204,OCA,batch_management,[OCA] S - Renewable medical supplies | BID - Bacterial identification system,Yes
+205,OCA,batch_management,[OCA] S - Renewable medical supplies | BQC - Bacterial strains Quality Control,Yes
+206,OCA,batch_management,[OCA] S - Renewable medical supplies | DIS - Disinfectants,Yes
+6,OCB,perishable,[OCB] D - Drugs | ,Yes
+7,OCB,batch_management,[OCB] D - Drugs | ,Yes
+25,OCB,subtype,[OCB] K - Kits | ,Kit/Module
+26,OCB,perishable,[OCB] N - Nutrition | ,Yes
+27,OCB,batch_management,[OCB] N - Nutrition | ,Yes
+31,OCB,perishable,"[OCB] S - Renewable medical supplies | CTD - Catheters, tubes and drains",Yes
+32,OCB,batch_management,"[OCB] S - Renewable medical supplies | CTD - Catheters, tubes and drains",Yes
+51,OCB,perishable,[OCB] S - Renewable medical supplies | INS - Injection supplies,Yes
+52,OCB,batch_management,[OCB] S - Renewable medical supplies | INS - Injection supplies,Yes
+56,OCB,perishable,[OCB] S - Renewable medical supplies | LAS - Laboratory reagents,Yes
+57,OCB,batch_management,[OCB] S - Renewable medical supplies | LAS - Laboratory reagents,Yes
+66,OCB,perishable,[OCB] S - Renewable medical supplies | MSU - Small medical supplies,Yes
+67,OCB,batch_management,[OCB] S - Renewable medical supplies | MSU - Small medical supplies,Yes
+71,OCB,perishable,[OCB] S - Renewable medical supplies | SUT - Sutures,Yes
+72,OCB,batch_management,[OCB] S - Renewable medical supplies | SUT - Sutures,Yes
+93,OCB,procure_method,[OCB] X - Services | ,Make to Order
+94,OCB,type,[OCB] X - Services | ,Service with Reception
+95,OCB,subtype,[OCB] X - Services | ,
+136,OCB,batch_management,[OCB] K - Kits | MED - Medical kits,Yes
+137,OCB,batch_management,[OCB] K - Kits | SUD - Dental surgical instruments sets,Yes
+138,OCB,batch_management,[OCB] K - Kits | SUI - Internal fixation instruments set,Yes
+139,OCB,batch_management,[OCB] K - Kits | SUO - Ophthalmic instruments boxes,Yes
+140,OCB,batch_management,[OCB] K - Kits | SUR - Surgical instruments sets,Yes
+141,OCB,perishable,[OCB] K - Kits | MED - Medical kits,Yes
+142,OCB,perishable,[OCB] K - Kits | SUD - Dental surgical instruments sets,Yes
+143,OCB,perishable,[OCB] K - Kits | SUI - Internal fixation instruments set,Yes
+144,OCB,perishable,[OCB] K - Kits | SUO - Ophthalmic instruments boxes,Yes
+145,OCB,perishable,[OCB] K - Kits | SUR - Surgical instruments sets,Yes
+146,OCB,perishable,[OCB] S - Renewable medical supplies | AST - Antibiotic Susceptibility Testing Items,Yes
+147,OCB,perishable,[OCB] S - Renewable medical supplies | BCM - Bacteriological culture media,Yes
+148,OCB,perishable,[OCB] S - Renewable medical supplies | BID - Bacterial identification system,Yes
+149,OCB,perishable,[OCB] S - Renewable medical supplies | BQC - Bacterial strains Quality Control,Yes
+154,OCB,perishable,[OCB] S - Renewable medical supplies | SCO - Surgical consumables,Yes
+155,OCB,perishable,[OCB] S - Renewable medical supplies | SDT - Stand-alone diagnostic tests,Yes
+156,OCB,perishable,[OCB] S - Renewable medical supplies | SUR - Surgical instruments for single use,Yes
+158,OCB,perishable,"[OCB] S - Renewable medical supplies | TSS - Transport, storage and sampling systems of biological specim",Yes
+159,OCB,perishable,[OCB] S - Renewable medical supplies | DIS - Disinfectants,Yes
+160,OCB,batch_management,[OCB] S - Renewable medical supplies | AST - Antibiotic Susceptibility Testing Items,Yes
+161,OCB,batch_management,[OCB] S - Renewable medical supplies | BCM - Bacteriological culture media,Yes
+162,OCB,batch_management,[OCB] S - Renewable medical supplies | BID - Bacterial identification system,Yes
+163,OCB,batch_management,[OCB] S - Renewable medical supplies | BQC - Bacterial strains Quality Control,Yes
+165,OCB,batch_management,[OCB] S - Renewable medical supplies | SCO - Surgical consumables,Yes
+166,OCB,batch_management,[OCB] S - Renewable medical supplies | SDT - Stand-alone diagnostic tests,Yes
+167,OCB,batch_management,[OCB] S - Renewable medical supplies | SUR - Surgical instruments for single use,Yes
+168,OCB,batch_management,"[OCB] S - Renewable medical supplies | TSS - Transport, storage and sampling systems of biological specim",Yes
+169,OCB,batch_management,[OCB] S - Renewable medical supplies | DIS - Disinfectants,Yes
+263,OCB,procure_method,[OCB] L - Library | ,Make to Order
+118,OCG,batch_management,[OCG] D - Drugs | ,Yes
+119,OCG,batch_management,[OCG] K - Kits | MED - Medical kits,Yes
+120,OCG,batch_management,[OCG] N - Nutrition | FOO - Food commodities,Yes
+121,OCG,batch_management,[OCG] N - Nutrition | ,Yes
+122,OCG,batch_management,"[OCG] S - Renewable medical supplies | CTD - Catheters, tubes and drains",Yes
+123,OCG,batch_management,[OCG] S - Renewable medical supplies | INS - Injection supplies,Yes
+124,OCG,batch_management,[OCG] S - Renewable medical supplies | LAS - Laboratory reagents,Yes
+125,OCG,batch_management,[OCG] S - Renewable medical supplies | MSU - Small medical supplies,Yes
+126,OCG,batch_management,[OCG] S - Renewable medical supplies | SUT - Sutures,Yes
+127,OCG,perishable,[OCG] D - Drugs | ,Yes
+128,OCG,perishable,[OCG] K - Kits | MED - Medical kits,Yes
+129,OCG,perishable,[OCG] N - Nutrition | ,Yes
+131,OCG,perishable,"[OCG] S - Renewable medical supplies | CTD - Catheters, tubes and drains",Yes
+132,OCG,perishable,[OCG] S - Renewable medical supplies | INS - Injection supplies,Yes
+133,OCG,perishable,[OCG] S - Renewable medical supplies | LAS - Laboratory reagents,Yes
+134,OCG,perishable,[OCG] S - Renewable medical supplies | MSU - Small medical supplies,Yes
+135,OCG,perishable,[OCG] S - Renewable medical supplies | SUT - Sutures,Yes
+170,OCG,batch_management,[OCG] S - Renewable medical supplies | DRE - Dressings,Yes
+171,OCG,batch_management,[OCG] S - Renewable medical supplies | SDT - Stand-alone diagnostic tests,Yes
+172,OCG,perishable,[OCG] S - Renewable medical supplies | DRE - Dressings,Yes
+173,OCG,perishable,[OCG] S - Renewable medical supplies | SDT - Stand-alone diagnostic tests,Yes
+174,OCG,procure_method,[OCG] L - Library | ,Make to Order
+175,OCG,procure_method,[OCG] X - Services | ,Make to Order
+176,OCG,subtype,[OCG] K - Kits | ,Kit/Module
+177,OCG,type,[OCG] X - Services | ,Service with Reception
+178,OCG,batch_management,[OCG] S - Renewable medical supplies | AST - Antibiotic Susceptibility Testing Items,Yes
+179,OCG,batch_management,[OCG] S - Renewable medical supplies | BCM - Bacteriological culture media,Yes
+180,OCG,batch_management,[OCG] S - Renewable medical supplies | BID - Bacterial identification system,Yes
+181,OCG,batch_management,[OCG] S - Renewable medical supplies | BQC - Bacterial strains Quality Control,Yes
+183,OCG,batch_management,[OCG] S - Renewable medical supplies | SCO - Surgical consumables,Yes
+184,OCG,batch_management,[OCG] S - Renewable medical supplies | SUR - Surgical instruments for single use,Yes
+185,OCG,batch_management,"[OCG] S - Renewable medical supplies | TSS - Transport, storage and sampling systems of biological specim",Yes
+186,OCG,batch_management,[OCG] S - Renewable medical supplies | DIS - Disinfectants,Yes
+187,OCG,perishable,[OCG] S - Renewable medical supplies | AST - Antibiotic Susceptibility Testing Items,Yes
+188,OCG,perishable,[OCG] S - Renewable medical supplies | BCM - Bacteriological culture media,Yes
+189,OCG,perishable,[OCG] S - Renewable medical supplies | BID - Bacterial identification system,Yes
+190,OCG,perishable,[OCG] S - Renewable medical supplies | BQC - Bacterial strains Quality Control,Yes
+191,OCG,perishable,[OCG] S - Renewable medical supplies | SCO - Surgical consumables,Yes
+192,OCG,perishable,[OCG] S - Renewable medical supplies | SUR - Surgical instruments for single use,Yes
+193,OCG,perishable,"[OCG] S - Renewable medical supplies | TSS - Transport, storage and sampling systems of biological specim",Yes
+194,OCG,perishable,[OCG] S - Renewable medical supplies | DIS - Disinfectants,Yes
+207,OCP,type,[OCP] X - Services | ,Service with Reception
+208,OCP,subtype,[OCP] X - Services | ,
+209,OCP,subtype,[OCP] K - Kits | ,Kit/Module
+210,OCP,procure_method,[OCP] X - Services | ,Make to Order
+211,OCP,perishable,[OCP] D - Drugs | ,Yes
+212,OCP,perishable,[OCP] E - Medical equipment | ANE - Anaesthesia equipment,Yes
+213,OCP,perishable,[OCP] E - Medical equipment | DIM - Diagnostic Imaging equipment,Yes
+214,OCP,perishable,[OCP] E - Medical equipment | LAB - Laboratory equipment,Yes
+215,OCP,perishable,[OCP] E - Medical equipment | LAE - Electrical laboratory equipment,Yes
+216,OCP,perishable,[OCP] E - Medical equipment | SUR - Surgical instruments,Yes
+217,OCP,perishable,[OCP] K - Kits | MED - Medical kits,Yes
+218,OCP,perishable,[OCP] N - Nutrition | FOO - Food commodities,Yes
+219,OCP,perishable,[OCP] N - Nutrition | FOS - Specialized food,Yes
+220,OCP,perishable,[OCP] S - Renewable medical supplies | AST - Antibiotic Susceptibility Testing Items,Yes
+221,OCP,perishable,[OCP] S - Renewable medical supplies | BCM - Bacteriological culture media,Yes
+222,OCP,perishable,[OCP] S - Renewable medical supplies | BID - Bacterial identification system,Yes
+223,OCP,perishable,[OCP] S - Renewable medical supplies | BQC - Bacterial strains Quality Control,Yes
+224,OCP,perishable,"[OCP] S - Renewable medical supplies | CTD - Catheters, tubes and drains",Yes
+225,OCP,perishable,[OCP] S - Renewable medical supplies | DIM - Diagnostic imaging supplies,Yes
+226,OCP,perishable,[OCP] S - Renewable medical supplies | DIS - Disinfectants,Yes
+227,OCP,perishable,[OCP] S - Renewable medical supplies | DRE - Dressings,Yes
+228,OCP,perishable,[OCP] S - Renewable medical supplies | INS - Injection supplies,Yes
+229,OCP,perishable,[OCP] S - Renewable medical supplies | LAS - Laboratory reagents,Yes
+230,OCP,perishable,[OCP] S - Renewable medical supplies | MSU - Small medical supplies,Yes
+231,OCP,perishable,[OCP] S - Renewable medical supplies | PPE - Personal protective equipment for medical activities,Yes
+232,OCP,perishable,[OCP] S - Renewable medical supplies | SCO - Surgical consumables,Yes
+233,OCP,perishable,[OCP] S - Renewable medical supplies | SDT - Stand-alone diagnostic tests,Yes
+234,OCP,perishable,[OCP] S - Renewable medical supplies | SUR - Surgical instruments for single use,Yes
+235,OCP,perishable,[OCP] S - Renewable medical supplies | SUT - Sutures,Yes
+236,OCP,perishable,"[OCP] S - Renewable medical supplies | TSS - Transport, storage and sampling systems of biological specim",Yes
+237,OCP,batch_management,[OCP] D - Drugs | ,Yes
+238,OCP,batch_management,[OCP] E - Medical equipment | ANE - Anaesthesia equipment,Yes
+239,OCP,batch_management,[OCP] E - Medical equipment | DIM - Diagnostic Imaging equipment,Yes
+240,OCP,batch_management,[OCP] E - Medical equipment | LAB - Laboratory equipment,Yes
+241,OCP,batch_management,[OCP] E - Medical equipment | LAE - Electrical laboratory equipment,Yes
+242,OCP,batch_management,[OCP] E - Medical equipment | SUR - Surgical instruments,Yes
+243,OCP,batch_management,[OCP] K - Kits | MED - Medical kits,Yes
+244,OCP,batch_management,[OCP] N - Nutrition | FOO - Food commodities,Yes
+245,OCP,batch_management,[OCP] N - Nutrition | FOS - Specialized food,Yes
+246,OCP,batch_management,[OCP] S - Renewable medical supplies | AST - Antibiotic Susceptibility Testing Items,Yes
+247,OCP,batch_management,[OCP] S - Renewable medical supplies | BCM - Bacteriological culture media,Yes
+248,OCP,batch_management,[OCP] S - Renewable medical supplies | BID - Bacterial identification system,Yes
+249,OCP,batch_management,[OCP] S - Renewable medical supplies | BQC - Bacterial strains Quality Control,Yes
+250,OCP,batch_management,"[OCP] S - Renewable medical supplies | CTD - Catheters, tubes and drains",Yes
+251,OCP,batch_management,[OCP] S - Renewable medical supplies | DIM - Diagnostic imaging supplies,Yes
+252,OCP,batch_management,[OCP] S - Renewable medical supplies | DIS - Disinfectants,Yes
+253,OCP,batch_management,[OCP] S - Renewable medical supplies | DRE - Dressings,Yes
+254,OCP,batch_management,[OCP] S - Renewable medical supplies | INS - Injection supplies,Yes
+255,OCP,batch_management,[OCP] S - Renewable medical supplies | LAS - Laboratory reagents,Yes
+256,OCP,batch_management,[OCP] S - Renewable medical supplies | MSU - Small medical supplies,Yes
+257,OCP,batch_management,[OCP] S - Renewable medical supplies | PPE - Personal protective equipment for medical activities,Yes
+258,OCP,batch_management,[OCP] S - Renewable medical supplies | SCO - Surgical consumables,Yes
+259,OCP,batch_management,[OCP] S - Renewable medical supplies | SDT - Stand-alone diagnostic tests,Yes
+260,OCP,batch_management,[OCP] S - Renewable medical supplies | SUR - Surgical instruments for single use,Yes
+261,OCP,batch_management,[OCP] S - Renewable medical supplies | SUT - Sutures,Yes
+262,OCP,batch_management,"[OCP] S - Renewable medical supplies | TSS - Transport, storage and sampling systems of biological specim",Yes

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2024-05-06 12:42:13 +0000
+++ bin/addons/msf_profile/msf_profile.py	2024-05-13 13:47:13 +0000
@@ -58,6 +58,80 @@
     }
 
     # UF33.0
+    def us_12826_unidata_pull_info(self, cr, uid, *a, **b):
+        entity_obj = self.pool.get('sync.client.entity')
+        instance = self.pool.get('res.users').browse(cr, uid, uid).company_id.instance_id
+        if entity_obj and instance and instance.level == 'section':
+            if instance.instance in ('OCP_HQ', 'OCBHQ', 'HQ_OCA', 'OCG_HQ'):
+                ent = entity_obj.get_entity(cr, uid)
+                oc = ent.oc.upper()
+                values_mapping = {
+                    'Yes': 't',
+                    'Kit/Module': 'kit',
+                    'Make to Order': 'make_to_order',
+                    'Service with Reception': 'service_recep',
+                    '': '',
+                }
+                csv_file_name = os.path.join(os.path.abspath(tools.config['root_path']), 'addons/msf_profile/data/ud_default_oc_value.csv')
+                line_number = 0
+                with open(csv_file_name, 'r', newline='') as f:
+                    c = csv.reader(f, quotechar='"', delimiter=',')
+                    for line in c:
+                        line_number += 1
+                        if not line or line[1] != oc:
+                            continue
+                        nomen = line[3][5:].strip()
+                        all_nom = nomen.split('|')
+                        level = 1
+                        parent_id = False
+
+                        if line[4] not in values_mapping:
+                            self._logger.warn('Line number %s, value %s not found' % (line_number, line[4]))
+                            return False
+                        for nom in all_nom:
+                            nom = nom.strip()[0:63]
+                            if nom:
+                                cond = ''
+                                params = [nom.strip(), level]
+                                if parent_id:
+                                    cond = ' and n.parent_id in %s'
+                                    params.append(tuple(parent_id))
+                                    params[0] = '%%%s' % nom
+
+                                cr.execute("""
+                                    select
+                                        n.id
+                                    from
+                                        product_nomenclature n
+                                    left join ir_translation t on t.lang='en_MF' and t.name='product.nomenclature,name' and t.res_id = n.id
+                                    where
+                                        coalesce(t.value, n.name) like %s and
+                                        n.level=%s
+                                    """+cond, tuple(params)) # not_a_user_entry
+                                if not cr.rowcount:
+                                    self._logger.warn('Line number %s, nomen %s not found' % (line_number, nom))
+                                    return False
+                                parent_id = [x[0] for x in cr.fetchall()]
+                                level += 1
+                        for n_id in parent_id:
+                            query = "insert into unidata_default_product_value (field, value, nomenclature, create_date) values (%s, %s, %s, NOW());"
+                            values = (line[2], values_mapping[line[4]], n_id)
+                            cr.execute(query, values)
+
+            cr.execute("update product_cold_chain set ud_code=code")
+            cr.execute("update product_cold_chain set ud_code='CT3+' where id in (select res_id from ir_model_data where name='product_attributes_cold_20')")
+
+            cr.execute("update unidata_sync set is_active='f'")
+            cr.execute("update ir_cron set active='f' where model='unidata.sync'")
+            # set next UD sync as full sync
+            param_obj = self.pool.get('ir.config_parameter')
+            param_obj.set_param(cr, 1, 'LAST_UD_DATE_SYNC', '')
+            param_obj.set_param(cr, 1, 'LAST_MSFID_SYNC','')
+
+
+
+        return True
+
     def us_12074_gdpr_remove_personal_data_from_track_changes(self, cr, uid, *a, **b):
         '''
         GDPR - Remove from staff track changes the fields removed from US-7791

=== 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	2023-11-17 14:06:38 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2024-05-13 13:47:13 +0000
@@ -132,7 +132,7 @@
 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', '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', 'donation_expense_account/id', 'oc_validation', 'oc_validation_date', 'oc_devalidation_date', 'oc_devalidation_reason', 'oc_comments', 'oc_project_restrictions/id', 'oc_country_restrictions/id']",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', 'hs_code', 'uom_id/id', 'uom_po_id/id','use_time', 'valuation', 'weight', 'weight_net', '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', 'donation_expense_account/id', 'oc_validation', 'oc_validation_date', 'oc_devalidation_date', 'oc_devalidation_reason', 'oc_comments', 'oc_project_restrictions/id', 'oc_country_restrictions/id']",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', '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.oc_product_creator_itc_esc_hq_active,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"['|','|','|',('international_status','=','UniData'),('international_status','=','ITC'),('international_status','=','ESC'),('international_status','=','HQ'), ('active', 'in', ['t','f']), ('active_change_date', '!=', False)]","['active', 'local_from_hq', 'local_activation_from_merge']",OC,product.product,,"OC Product Active (Creator = ITC, ESC, UniData or HQ)",Valid,,602
 msf_sync_data_server.mission_product_creator_local_active,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('international_status','=','Local'), ('active', 'in', ['t','f']), ('active_change_date', '!=', False)]","['active']",MISSION,product.product,,Mission Product Active (Creator = local),Valid,,603

=== modified file 'bin/addons/product_attributes/product_attributes.py'
--- bin/addons/product_attributes/product_attributes.py	2024-05-02 09:35:15 +0000
+++ bin/addons/product_attributes/product_attributes.py	2024-05-13 13:47:13 +0000
@@ -186,6 +186,7 @@
     _name = "product.cold_chain"
     _columns = {
         'code': fields.char('Code', size=256),
+        'ud_code': fields.char(string='Code', size=256),
         'name': fields.char('Name', size=256, required=True, translate=1),
         'cold_chain': fields.boolean('Cold Chain'),
         'mapped_to': fields.many2one('product.cold_chain', string='Mapped to', readonly=1),
@@ -668,6 +669,39 @@
                     dom += [ '&', ('batch_management', '=', False), ('perishable', '=', True)]
         return dom
 
+    def _search_incompatible_oc_default_values(self, cr, uid, obj, name, args, context=None):
+        dom = []
+        oc_def = self.pool.get('unidata.default_product_value')
+        for arg in args:
+            if arg[1] == '=':
+                if not arg[2]:
+                    raise osv.except_osv(_('Warning'), _('This filter is not implemented'))
+
+                oc_def_ids = oc_def.search(cr, uid, [], context=context)
+            elif arg[1] == 'in':
+                if not isinstance(arg[2], list):
+                    raise osv.except_osv(_('Warning'), _('This filter is not implemented'))
+                oc_def_ids = arg[2]
+            else:
+                raise osv.except_osv(_('Warning'), _('This filter is not implemented'))
+
+            temp_dom = []
+            for oc_val in oc_def.browse(cr, uid, oc_def_ids, context=context):
+                value = oc_val.value
+                if value == 'f':
+                    value = False
+                temp_dom.append(['&', ('nomen_manda_%d' % oc_val.nomenclature.level, '=', oc_val.nomenclature.id), (oc_val.field, '!=', value)])
+
+            ud_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'product_attributes', 'int_6')[1]
+            if temp_dom:
+                dom += temp_dom[0]
+                for d in temp_dom[1:]:
+                    dom.insert(0, '|')
+                    dom += d
+                dom = ['&', ('international_status', '=', ud_id)] + dom
+
+        return dom
+
     def _search_show_ud(self, cr, uid, obj, name, args, context=None):
         dom = []
         for arg in args:
@@ -1082,7 +1116,8 @@
         ),
         'oc_subscription': fields.boolean(string='OC Subscription'),
         # TODO: validation on 'un_code' field
-        'un_code': fields.char('UN Code', size=7),
+        'un_code': fields.char('UN Code', size=32),
+        'hs_code': fields.char('HS Code', size=12, readonly=1),
         'gmdn_code' : fields.char('GMDN Code', size=5),
         'gmdn_description' : fields.char('GMDN Description', size=64),
         'life_time': fields.integer('Product Life Time',
@@ -1217,6 +1252,8 @@
         'in_mml_instance': fields.function(tools.misc.get_fake, method=True, type='many2one', relation='msf.instance', string='MML Valid for instance', domain=[('state', '=', 'active'), ('level', '!=', 'section')]),
         'mml_restricted_instance': fields.function(tools.misc.get_fake, method=True, type='many2one', relation='msf.instance', string='MML Restricted to instance', domain=[('state', '=', 'active'), ('level', '!=', 'section')]),
         'in_msl_instance': fields.function(_get_valid_msl_instance, method=True, type='many2many', relation='unifield.instance', domain=[('uf_active', '=', True)], string='MSL Valid for instance'),
+
+        'incompatible_oc_default_values': fields.function(tools.misc.get_fake, method=True, type='boolean', string='Incompatible OC default', fnct_search=_search_incompatible_oc_default_values),
     }
 
 
@@ -3468,22 +3505,21 @@
         return True
 
     def pull_ud(self, cr, uid, ids, context=None):
-        ud = unidata_sync.ud_sync(cr, uid, self.pool, logger=logging.getLogger('single-ud-sync'), max_retries=1, context=context)
-
-        code_updated = []
-        update = False
-        for x in self.read(cr, uid, ids, ['msfid', 'default_code'], context=context):
-            if x['msfid']:
-                try:
-                    ud.update_products(q_filter='msfIdentifier=%d'%x['msfid'], record_date=False)
-                    code_updated.append(x['default_code'])
-                    if not update:
-                        update = x['id']
-                except requests.exceptions.HTTPError as e:
-                    raise osv.except_osv(_('Error'), _('Unidata error: %s, did you configure the UniData sync ?') % e.response)
-        if code_updated:
-            self.log(cr, uid, update, _('%s updated from UniData') % ', '.join(code_updated))
-        return True
+        for x in self.read(cr, uid, ids, ['msfid'] , context=context):
+            wiz_id = self.pool.get('product.pull_single_ud').create(cr, uid, {'msfid': x['msfid'] or False}, context=context)
+            return {
+                'type': 'ir.actions.act_window',
+                'res_model': 'product.pull_single_ud',
+                'res_id': wiz_id,
+                'view_type': 'form',
+                'view_mode': 'form',
+                'target': 'new',
+                'context': context,
+                'height': '190px',
+                'width': '420px',
+            }
+
+
 
     def open_mml_nonconform_report(self, cr, uid, ids, context=None):
         instance_level = self.pool.get('res.company')._get_instance_level(cr, uid)
@@ -3839,5 +3875,44 @@
 
 product_ask_activate_wizard()
 
+class product_pull_single_ud(osv.osv_memory):
+    _name = 'product.pull_single_ud'
+    rec_name = 'msfid'
+    _columns = {
+        'msfid': fields.integer_null('MSFID'),
+    }
+
+    def pull_product(self, cr, uid, ids, context=None):
+        session_obj = self.pool.get('unidata.sync.log')
+        act_obj = self.pool.get('ir.actions.act_window')
+        for x in self.read(cr, uid, ids, ['msfid'], context=context):
+            if x['msfid']:
+                session_id = session_obj.create(cr, uid, {'manual_single': True, 'server': 'ud', 'start_date': fields.datetime.now(), 'state': 'running', 'sync_type': 'single', 'msfid_min': x['msfid']}, context=context)
+                ud = unidata_sync.ud_sync(cr, uid, self.pool, logger=logging.getLogger('single-ud-sync'), max_retries=1, context=context)
+                try:
+                    trash1, nb_prod, updated, total_nb_created, total_nb_errors = ud.update_products(q_filter='msfIdentifier=%d'%x['msfid'], record_date=False, session_id=session_id)
+                except requests.exceptions.HTTPError as e:
+                    raise osv.except_osv(_('Error'), _('Unidata error: %s, did you configure the UniData sync ?') % e.response)
+                except Exception:
+                    raise
+            else:
+                raise osv.except_osv(_('Error'), _('Error: msfid is required'))
+
+        session_obj.write(cr, uid, session_id, {'end_date': fields.datetime.now(), 'state': 'done', 'number_products_pulled': nb_prod, 'number_products_updated': updated, 'number_products_created': total_nb_created, 'number_products_errors': total_nb_errors}, context=context)
+
+        p_ids = self.pool.get('product.product').search(cr, uid, [('msfid', '=', x['msfid'])], context=context)
+        if p_ids:
+            if len(p_ids) == 1:
+                view = act_obj.open_view_from_xmlid(cr, uid, 'product.product_normal_action', ['form', 'tree'], context=context)
+                view['res_id'] = p_ids[0]
+            else:
+                view = act_obj.open_view_from_xmlid(cr, uid, 'product.product_normal_action', context=context)
+                view['domain'] = [('id','in', p_ids)]
+        else:
+            view = act_obj.open_view_from_xmlid(cr, uid, 'product_attributes.unidata_sync_log_action', ['form', 'tree'], new_tab=True, context=context)
+            view['res_id'] = session_id
+        return view
+
+product_pull_single_ud()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/product_attributes/product_attributes_data.xml'
--- bin/addons/product_attributes/product_attributes_data.xml	2023-08-29 09:17:44 +0000
+++ bin/addons/product_attributes/product_attributes_data.xml	2024-05-13 13:47:13 +0000
@@ -133,36 +133,43 @@
         <!-- new code -->
         <record model="product.cold_chain" id="cold_14">
             <field name="code">0208</field>
+            <field name="ud_code">0208</field>
             <field name="name">0208 - Cold Chain / Refrigerated 2-8°C</field>
             <field name="cold_chain" eval="True" />
         </record>
         <record model="product.cold_chain" id="cold_15">
             <field name="code">1525</field>
+            <field name="ud_code">1525</field>
             <field name="name">1525 - Controlled Room Temperature 15-25°C</field>
             <field name="cold_chain" eval="False" />
         </record>
         <record model="product.cold_chain" id="cold_16">
             <field name="code">CT25</field>
+            <field name="ud_code">CT25</field>
             <field name="name">CT25 - Controlled Temperature 2-25°C</field>
             <field name="cold_chain" eval="False" />
         </record>
         <record model="product.cold_chain" id="cold_17">
             <field name="code">CT30</field>
+            <field name="ud_code">CT30</field>
             <field name="name">CT30 - Controlled Temperature 2-30°C</field>
             <field name="cold_chain" eval="False" />
         </record>
         <record model="product.cold_chain" id="cold_18">
             <field name="code">F-20</field>
+            <field name="ud_code">F-20</field>
             <field name="name">F-20 - Frozen &lt;-20°C</field>
             <field name="cold_chain" eval="False" />
         </record>
         <record model="product.cold_chain" id="cold_19">
             <field name="code">FSRT</field>
+            <field name="ud_code">FSRT</field>
             <field name="name">FSRT - Frozen for Storage, Refrigerated for Transport</field>
             <field name="cold_chain" eval="False" />
         </record>
         <record model="product.cold_chain" id="cold_20">
             <field name="code">CT30</field>
+            <field name="ud_code">CT30</field>
             <field name="name">CT30 - Controlled Temperature 2-30°C</field>
             <field name="cold_chain" eval="False" />
         </record>
@@ -170,78 +177,91 @@
         <!-- old code -->
         <record model="product.cold_chain" id="cold_1">
             <field name="code">*</field>
+            <field name="ud_code">*</field>
             <field name="name">* - Keep Cool: used for a kit or article containing cold chain module or item(s)</field>
             <field name="cold_chain" eval="True" />
             <field name="mapped_to" ref="cold_14" />
         </record>
         <record model="product.cold_chain" id="cold_2">
             <field name="code">*0</field>
+            <field name="ud_code">*0</field>
             <field name="name">*0 - Problem if any window blue</field>
             <field name="cold_chain" eval="True" />
             <field name="mapped_to" ref="cold_14" />
         </record>
         <record model="product.cold_chain" id="cold_3">
             <field name="code">*0F</field>
+            <field name="ud_code">*0F</field>
             <field name="name">*0F - Problem if any window blue or Freeze-tag = ALARM</field>
             <field name="cold_chain" eval="True" />
             <field name="mapped_to" ref="cold_14" />
         </record>
         <record model="product.cold_chain" id="cold_4">
             <field name="code">*A</field>
+            <field name="ud_code">*A</field>
             <field name="name">*A - Problem if A, B, C and/or D blue = ALARM</field>
             <field name="cold_chain" eval="True" />
             <field name="mapped_to" ref="cold_14" />
         </record>
         <record model="product.cold_chain" id="cold_5">
             <field name="code">*AF</field>
+            <field name="ud_code">*AF</field>
             <field name="name">*AF - Problem if A, B, C and/or D blue or Freeze-tag = ALARM</field>
             <field name="cold_chain" eval="True" />
             <field name="mapped_to" ref="cold_14" />
         </record>
         <record model="product.cold_chain" id="cold_6">
             <field name="code">*B</field>
+            <field name="ud_code">*B</field>
             <field name="name">*B - Problem if B, C and/or D blue = ALARM</field>
             <field name="cold_chain" eval="True" />
             <field name="mapped_to" ref="cold_14" />
         </record>
         <record model="product.cold_chain" id="cold_7">
             <field name="code">*BF</field>
+            <field name="ud_code">*BF</field>
             <field name="name">*BF - Problem if B, C and/or D blue or Freeze-tag = ALARM</field>
             <field name="cold_chain" eval="True" />
             <field name="mapped_to" ref="cold_14" />
         </record>
         <record model="product.cold_chain" id="cold_8">
             <field name="code">*C</field>
+            <field name="ud_code">*C</field>
             <field name="name">*C - Problem if C and D blue</field>
             <field name="cold_chain" eval="True" />
             <field name="mapped_to" ref="cold_14" />
         </record>
         <record model="product.cold_chain" id="cold_9">
             <field name="code">*CF</field>
+            <field name="ud_code">*CF</field>
             <field name="name">*CF - Problem if C and/or D blue or Freeze-tag = ALARM</field>
             <field name="cold_chain" eval="True" />
             <field name="mapped_to" ref="cold_14" />
         </record>
         <record model="product.cold_chain" id="cold_10">
             <field name="code">*D</field>
+            <field name="ud_code">*D</field>
             <field name="name">*D - Store and transport at -25°C (store in deepfreezer, transport with dry-ice)</field>
             <field name="cold_chain" eval="False" />
             <field name="mapped_to" ref="cold_18" />
         </record>
         <record model="product.cold_chain" id="cold_11">
             <field name="code">*F</field>
+            <field name="ud_code">*F</field>
             <field name="name">*F - Cannot be frozen: check FreezeWatch</field>
             <field name="cold_chain" eval="False" />
             <field name="mapped_to" ref="cold_17" />
         </record>
         <record model="product.cold_chain" id="cold_12">
             <field name="code">*25</field>
+            <field name="ud_code">*25</field>
             <field name="name">*25 - Must be kept below 25°C (but not necesseraly in cold chain)</field>
             <field name="cold_chain" eval="False" />
             <field name="mapped_to" ref="cold_16" />
         </record>
         <record model="product.cold_chain" id="cold_13">
             <field name="code">*25F</field>
+            <field name="ud_code">*25F</field>
             <field name="name">*25F - Must be kept below 25°C and cannot be frozen: check FreezeWatch</field>
             <field name="cold_chain" eval="False" />
             <field name="mapped_to" ref="cold_15" />

=== modified file 'bin/addons/product_attributes/product_attributes_view.xml'
--- bin/addons/product_attributes/product_attributes_view.xml	2024-04-16 08:38:51 +0000
+++ bin/addons/product_attributes/product_attributes_view.xml	2024-05-13 13:47:13 +0000
@@ -136,7 +136,7 @@
                                    <button name="reactivate_product" icon="gtk-execute" string="Re-activate product" type="object" attrs="{'invisible': ['|', '|', ('active', '=', True), ('nsl_merged', '=', True), ('unidata_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')]}"/>
                                    <button name="open_merge_hq_product_wizard" icon="gtk-convert" string="HQ Merge product" type="object"  attrs="{'invisible': [('can_be_hq_merged', '!=', 'True')]}"/>
-                                   <button name="pull_ud" icon="unidata.png" string="Pull UD OC Validation" type="object"  attrs="{'invisible': ['|', ('int_status_code', '!=', 'unidata'), ('instance_level', '!=', 'section')]}" />
+                                   <button name="pull_ud" icon="unidata.png" string="Pull UD Product" type="object"  attrs="{'invisible': ['|', ('int_status_code', '!=', 'unidata'), ('instance_level', '!=', 'section')]}" />
                                    <button name="debug_ud" icon="debug.png" string="Display MML API result" type="object"  attrs="{'invisible': ['|', ('int_status_code', '!=', 'unidata'), ('instance_level', '!=', 'section')]}" invisible="1"/>
                                 </group>
                             </group>
@@ -201,6 +201,7 @@
                                 <separator string="Transport" colspan="2"/>
                                 <field name="dangerous_goods" colspan="2"/>
                                 <field name="un_code" colspan="2"/>
+                                <field name="hs_code" colspan="2" attrs="{'invisible': [('int_status_code', '!=', 'unidata')]}"/>
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Diffusion" colspan="2"/>
@@ -1119,5 +1120,20 @@
             </field>
         </record>
 
+        <record id="product_pull_single_ud_view" model="ir.ui.view">
+            <field name="name">product.pull_single_ud.view</field>
+            <field name="model">product.pull_single_ud</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Pull msfid">
+                    <field name="msfid" colspan="2" required="1"/>
+                    <group colspan="4">
+                        <button name="cancel" type="object" string="Cancel" icon="gtk-cancel" />
+                        <button name="pull_product" type="object" string="Pull Product" icon="gtk-go-forward" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
     </data>
 </openerp>

=== modified file 'bin/addons/product_attributes/unidata_sync.py'
--- bin/addons/product_attributes/unidata_sync.py	2023-11-28 13:36:32 +0000
+++ bin/addons/product_attributes/unidata_sync.py	2024-05-13 13:47:13 +0000
@@ -1,10 +1,13 @@
 # encoding: utf-8
 from osv import fields, osv
+from osv.orm import browse_record, browse_null
 from tools.translate import _
 import tools
 from datetime import datetime
 from dateutil import tz
 import time
+import pprint
+from tools.safe_eval import safe_eval
 
 import logging
 import logging.handlers
@@ -16,6 +19,9 @@
 
 import requests
 
+class UDException(Exception):
+    pass
+
 class unidata_country(osv.osv):
     _name = 'unidata.country'
     _description = 'UniData Country'
@@ -271,10 +277,13 @@
         'end_date': fields.datetime('End Date', readonly=1),
         'number_products_pulled': fields.integer('# products pulled', readonly=1),
         'number_products_updated': fields.integer('# products updated', readonly=1),
+        'number_products_created': fields.integer('# products created', readonly=1),
+        'number_products_errors': fields.integer('# products errors', readonly=1),
+        'sync_error': fields.one2many('unidata.pull_product.log', 'session_id', 'Sync Error', readonly=1),
         'error': fields.text('Error', readonly=1),
         'page_size': fields.integer('page size', readonly=1),
         'state': fields.selection([('running', 'Running'), ('error', 'Error'), ('done', 'Done')], 'State', readonly=1),
-        'sync_type': fields.selection([('full', 'Full'), ('cont', 'Continuation'), ('diff', 'Based on last modification date')], 'Sync Type', readonly=1),
+        'sync_type': fields.selection([('full', 'Full'), ('cont', 'Continuation'), ('diff', 'Based on last modification date'),('single', 'Single MSFID')], 'Sync Type', readonly=1),
         'msfid_min': fields.integer('Min Msfid', readonly=1),
         'last_date': fields.char('Last Date', size=64, readonly=1),
         'log_file': fields.char('Path to log file', size=128, readonly=1),
@@ -284,6 +293,9 @@
         'number_lists_pulled': fields.integer('# projects pulled', readonly=1),
     }
 
+    _defaults = {
+    }
+
 unidata_sync_log()
 
 
@@ -300,6 +312,7 @@
 
         sync_id = self.pool.get('ir.model.data').get_object_reference(self.cr, self.uid, 'product_attributes', 'unidata_sync_config')[1]
         config = self.pool.get('unidata.sync').read(self.cr, self.uid, sync_id, context=self.context)
+        self.unidata_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'product_attributes', 'int_6')[1]
 
         self.page_size = config['page_size'] or 500
         self.ud_params = {
@@ -316,10 +329,243 @@
         self.project_cache = {}
         self.msf_intance_cache = {}
         self.uf_instance_cache = {}
+        self.uf_product_cache = {}
+        self.categ_account_cache = {}
+
+        self.default_oc_values = {}
+        default_ids = self.pool.get('unidata.default_product_value').search(self.cr, self.uid, [])
+        for default in self.pool.get('unidata.default_product_value').browse(self.cr, self.uid, default_ids):
+            if default.field in ('perishable', 'batch_management'):
+                if default.value == 't':
+                    default.value = True
+                else:
+                    default.value = False
+
+            self.default_oc_values.setdefault(default.nomenclature.id, {}).update({default.field: default.value})
 
         if self.pool.get('res.company')._get_instance_level(self.cr, self.uid) != 'section':
             raise osv.except_osv(_('Error'), _('UD/MSL sync can only be started at HQ level.'))
 
+        self.uf_config = {
+            'nomen_manda_0': {
+                'ud': 'type',
+                'relation': 'product.nomenclature',
+                'key_field': 'msfid',
+                'domain': [('level', '=', 0)],
+            },
+            'nomen_manda_1': {
+                'ud': 'group/code',
+                'relation': 'product.nomenclature',
+                'key_field': 'msfid',
+                'nomen_level': 1,
+            },
+            'nomen_manda_2': {
+                'ud': 'family/code',
+                'relation': 'product.nomenclature',
+                'key_field': 'msfid',
+                'nomen_level': 2,
+            },
+            'nomen_manda_3': {
+                'ud': 'root/code',
+                'relation': 'product.nomenclature',
+                'key_field': 'msfid',
+                'nomen_level': 3,
+            },
+            'name': {
+                'lang': {
+                    'en_MF': {'ud': 'labels/english'},
+                    'fr_MF': {'ud': 'labels/french'},
+                    'es_MF': {'ud': 'labels/spanish'},
+                },
+                'function': lambda a: a.strip(),
+            },
+            'closed_article': {
+                'ud': 'closedInfo/closed',
+                'mapping': {
+                    'Open': 'no',
+                    'Closed': 'yes',
+                    'Restricted to': 'recommanded',
+                    False: 'no',
+                }
+            },
+            'justification_code_id': {
+                'ud': 'supply/justification/code',
+                'relation': 'product.justification.code',
+                'key_field': 'code',
+                'ignored_values': ['SPM', 'PMFE'], # tbc with Raff
+            },
+            'controlled_substance': {
+                'ud': 'medical/controlledSubstanceGroup/controlledSubstanceInfo/code',
+                'mapping': {
+                    '!': '!',
+                    'N1': 'N1',
+                    'N2': 'N2',
+                    'P1': 'P1',
+                    'P2': 'P2',
+                    'P3': 'P3',
+                    'P4': 'P4',
+                    'DP': 'DP',
+                    'Y': 'Y',
+                    'True': 'True',
+                    False: False
+                }
+            },
+            'default_code': {
+                'ud': 'code'
+            },
+            #'fit_value': {
+            #    'lang': {
+            #        'en_MF': {'ud': 'description/fitEnglishtext'},
+            #        'fr_MF': {'ud': 'description/fitFrenchtext'},
+            #    }
+            #},
+            #'form_value': {
+            #    'lang': {
+            #        'en_MF': {'ud': 'description/formEnglishtext'},
+            #        'fr_MF': {'ud': 'description/formFrenchtext'},
+            #    }
+            #},
+            #'function_value': {
+            #    'lang': {
+            #        'en_MF': {'ud': 'description/functionEnglishtext'},
+            #        'fr_MF': {'ud': 'description/functionFrenchtext'},
+            #    }
+            #},
+            'cold_chain': {
+                'ud': 'supply/thermosensitiveGroup/thermosensitiveInfo/code',
+                'relation': 'product.cold_chain',
+                'key_field': 'ud_code',
+            },
+            'heat_sensitive_item': {
+                'ud': 'supply/thermosensitiveGroup/thermosensitive',
+                'relation': 'product.heat_sensitive',
+                'key_field': 'code',
+                'mapping': {
+                    "Don't know": 'no_know',
+                    False: 'no',
+                    'No': 'no',
+                    'Yes': 'yes',
+                },
+            },
+            'manufacturer_ref': {
+                'ud': 'closedInfo/manufacturerRef',
+            },
+            'manufacturer_txt': {
+                'ud': 'closedInfo/manufacturer',
+            },
+            'msfid': {
+                'ud': 'id',
+            },
+            'international_status': {
+                'value': self.unidata_id,
+            },
+            #'name_template': tbc
+            'xmlid_code': {
+                'ud': 'id',
+                'on_update': False,
+                'function': lambda a: a and '%s'%a or False,
+            },
+            'old_code': {
+                'ud': 'formerCodes',
+                'function': lambda a: ';'.join(a),
+            },
+            'product_catalog_path': {
+                'ud': 'unicatURL',
+            },
+            'short_shelf_life': {
+                'ud': 'medical/shortShelfLifeGroup/shortShelfLife',
+                'mapping': {
+                    'Yes': 'True',
+                    'No': 'False',
+                    "Don't know": 'no_know',
+                    False: 'no_know',
+                },
+            },
+            'single_use': {
+                'ud': 'medical/singleUse',
+                'mapping': {
+                    'Single use': 'yes',
+                    'Single patient multiple use': 'yes',
+                    'Reusable': 'no',
+                    'Implantable Device': 'no_know',
+                    "Don't know": 'no_know',
+                    'Not Applicable': 'no',
+                    False: 'no',
+                }
+            },
+            'standard_ok': {
+                'ud': 'standardizationLevel',
+                'mapping': {
+                    'NST': 'non_standard',
+                    'STD': 'standard',
+                    'NSL': 'non_standard_local',
+                }
+            },
+            'standard_price': {
+                'value': 1.0,
+                'on_update': False,
+            },
+            'state_ud': {
+                'ud': 'lifeCycleStatus',
+                'mapping': {
+                    '01. Preparation': 'valid',
+                    '02. Valid': 'valid',
+                    '03. Outdated': 'outdated',
+                    '04. Discontinued': 'discontinued',
+                    '05. Forbidden': 'forbidden',
+                    '06. Rejected': 'stopped',
+                    '08. Archived': 'archived',
+                    '01. Temporary Golden:': 'stopped',
+                    '01. Temporary Merge': 'stopped',
+                    '07. Parked': 'archived',
+                },
+            },
+            'sterilized': {
+                'ud': 'medical/sterile',
+                'mapping': {
+                    'Yes': 'yes',
+                    'No': 'no',
+                    "Don't know": 'no_know',
+                    False: 'no_know',
+                }
+            },
+            'dangerous_goods': {
+                'ud': 'supply/dangerousGroup/dangerous',
+                'mapping': {
+                    "Don't know": 'no_know',
+                    'Yes': 'True',
+                    'No': 'False',
+                    False: 'False',
+                }
+            },
+            'un_code': {
+                'ud': 'supply/dangerousGroup/dangerousInfo/number',
+            },
+            'hs_code': {
+                'ud': 'supply/hsCode',
+            },
+            'oc_subscription': {
+                'ud': 'ocSubscriptions/%s' % self.oc,
+            },
+            'oc_validation': {
+                'ud': 'ocValidations/%s/valid' % self.oc,
+            },
+            'oc_validation_date': {
+                'ud': 'ocValidations/%s/lastValidationDate' % self.oc,
+                'type': 'date',
+            },
+            'oc_devalidation_date': {
+                'ud': 'ocValidations/%s/lastDevalidationDate' % self.oc,
+                'type': 'date',
+            },
+            'oc_devalidation_reason': {
+                'ud': 'ocValidations/%s/devalidationReason' % self.oc,
+            },
+            'oc_comments': {
+                'ud': 'ocValidations/%s/comments' % self.oc,
+            }
+        }
+
     def create_msl_list(self):
         oc_number = {
             'oca': 5,
@@ -524,15 +770,165 @@
                 llevel = logging.INFO
             self.logger.log(llevel, msg)
 
-    def update_products(self, q_filter, record_date):
+    def map_ud_fields(self, ud_data, new_prod):
+        uf_values = {'en_MF': {}}
+        for uf_key in self.uf_config:
+            for lang in self.uf_config[uf_key].get('lang', ['default']):
+                if lang == 'default':
+                    lang_values = uf_values['en_MF']
+                    field_desc = self.uf_config[uf_key]
+                else:
+                    lang_values = uf_values.get(lang, {})
+                    field_desc = self.uf_config[uf_key]['lang'][lang]
+
+                if field_desc.get('value'):
+                    if new_prod or field_desc.get('on_update', True):
+                        lang_values[uf_key] = field_desc['value']
+                    continue
+
+                uf_value = ud_data
+                for key in field_desc['ud'].split('/'):
+                    uf_value = uf_value.get(key, {})
+                if not uf_value:
+                    uf_value = False
+
+                if field_desc.get('mapping'):
+                    if uf_value not in field_desc['mapping']:
+                        raise UDException('Mapping error, uf_key: %s, uf_value: %s' % (uf_key, uf_value))
+                    else:
+                        uf_value =  field_desc['mapping'][uf_value]
+
+                if 'ignored_values' in field_desc and uf_value in field_desc.get('ignored_values'):
+                    uf_value = False
+
+                if uf_key in ['nomen_manda_1', 'nomen_manda_2', 'nomen_manda_3']:
+                    previous_nom = {
+                        'nomen_manda_1': 'nomen_manda_0',
+                        'nomen_manda_2': 'nomen_manda_1',
+                        'nomen_manda_3': 'nomen_manda_2',
+                    }[uf_key]
+                    self.uf_product_cache.setdefault(uf_key, {})
+
+                    if uf_key == 'nomen_manda_1':
+                        msfid = '%s-%s' % (ud_data['type'], ud_data['group']['code'])
+                        ud_key = 'group'
+                    elif uf_key == 'nomen_manda_2':
+                        msfid = '%s-%s-%s%s' % (ud_data['type'], ud_data['group']['code'], ud_data['group']['code'], ud_data['family']['code'])
+                        ud_key = 'family'
+                    else:
+                        msfid = '%s-%s-%s%s-%s' % (ud_data['type'], ud_data['group']['code'], ud_data['group']['code'], ud_data['family']['code'], ud_data['root']['code'])
+                        ud_key = 'root'
+
+                    #if previous_nom not in lang_values:
+                    #    continue
+                    cache_key = (uf_key, lang_values[previous_nom], msfid)
+
+                    if cache_key not in self.uf_product_cache[uf_key]:
+                        domain = [('level', '=', self.uf_config[uf_key]['nomen_level']), ('parent_id', '=', uf_values['en_MF'][previous_nom]), ('msfid', '=', msfid)]
+                        nomen_id = self.pool.get('product.nomenclature').search(self.cr, self.uid, domain, context=self.context)
+                        created_nomen = False
+                        if not nomen_id:
+                            created_nomen = True
+                            self.log('==== create nomenclature %s'%msfid)
+                            nomen_data = {
+                                'name': ud_data[ud_key]['labels']['english'],
+                                'msfid': msfid,
+                                'parent_id':  uf_values['en_MF'][previous_nom],
+                                'level': self.uf_config[uf_key]['nomen_level'],
+                            }
+                            nomen_id = [self.pool.get('product.nomenclature').create(self.cr, self.uid, nomen_data, context={'lang': 'en_MF'})]
+                            if ud_data.get(ud_key, {}).get('labels', {}).get('french'):
+                                self.pool.get('product.nomenclature').write(self.cr, self.uid, nomen_id, {'name': ud_data[ud_key]['labels']['french']}, context={'lang': 'fr_MF'})
+                            if uf_key == 'nomen_manda_2':
+                                self.log('===== create category %s'%msfid)
+                                account_ids = self.pool.get('account.account').search(self.cr, self.uid, [('type', '!=', 'view'), ('code', '=', ud_data.get('accountCode', {}).get('code'))])
+                                if not account_ids:
+                                    raise UDException('Account code %s not found' % (ud_data.get('accountCode', {}).get('code')))
+                                account_id = account_ids[0]
+                                categ_id = self.pool.get('product.category').create(self.cr, self.uid, {
+                                    'name': ud_data['family']['labels']['english'],
+                                    'msfid': msfid,
+                                    'family_id': nomen_id[0],
+                                    'property_account_income_categ': account_id,
+                                    'property_account_expense_categ': account_id,
+                                }, context={'lang': 'en_MF'})
+                                if ud_data.get('family', {}).get('labels', {}).get('french'):
+                                    self.pool.get('product.category').write(self.cr, self.uid, categ_id, {'name': ud_data['family']['labels']['french']}, context={'lang': 'fr_MF'})
+                        else:
+                            self.uf_product_cache[uf_key][cache_key] = nomen_id
+                    else:
+                        nomen_id = self.uf_product_cache[uf_key][cache_key]
+                    if not nomen_id or len(nomen_id) != 1:
+                        raise UDException('%s error %s not found %s' % (uf_key, cache_key, nomen_id))
+                    if False and uf_key == 'nomen_manda_2':
+                        if msfid not in self.categ_account_cache:
+                            if not created_nomen:
+                                self.categ_account_cache[msfid] = self.pool.get('product.nomenclature').browse(self.cr, self.uid, nomen_id[0]).category_id.property_account_income_categ.code
+                                categ_account_code = self.categ_account_cache[msfid]
+                            else:
+                                categ_account_code = ud_data.get('accountCode', {}).get('code')
+
+                        else:
+                            categ_account_code = self.categ_account_cache[msfid]
+
+                        if ud_data.get('accountCode', {}).get('code') != categ_account_code:
+                            account_ids = self.pool.get('account.account').search(self.cr, self.uid, [('type', '!=', 'view'), ('code', '=', ud_data.get('accountCode', {}).get('code'))])
+                            if not account_ids:
+                                raise UDException('Account code %s not found' % (ud_data.get('accountCode', {}).get('code')))
+                            account_id = account_ids[0]
+                        else:
+                            account_id = False
+                        lang_values['property_account_income'] = account_id
+                        lang_values['property_account_expense'] = account_id
+
+                    lang_values[uf_key] = nomen_id[0]
+
+                elif field_desc.get('relation'):
+                    self.uf_product_cache.setdefault(uf_key, {})
+                    if not uf_value:
+                        self.uf_product_cache[uf_key][uf_value] = [False]
+                    if uf_value not in self.uf_product_cache[uf_key]:
+                        domain = [(field_desc['key_field'], '=', uf_value)]
+                        if field_desc.get('domain'):
+                            domain += field_desc['domain']
+                        self.uf_product_cache[uf_key][uf_value] = self.pool.get(field_desc['relation']).search(self.cr, self.uid, domain, context=self.context)
+                    if not self.uf_product_cache[uf_key][uf_value] or len(self.uf_product_cache[uf_key][uf_value]) > 1:
+                        raise UDException('Field error %s: uf_value: %s, records found in UF: %d, %s' % (uf_key, uf_value, len(self.uf_product_cache[uf_key][uf_value]), self.uf_product_cache[uf_key][uf_value]))
+                    else:
+                        if new_prod or field_desc.get('on_update', True):
+                            lang_values[uf_key] = self.uf_product_cache[uf_key][uf_value][0]
+                elif field_desc.get('function'):
+                    if new_prod or field_desc.get('on_update', True):
+                        lang_values[uf_key] = field_desc['function'](uf_value)
+                else:
+                    if uf_value and field_desc.get('type') == 'date':
+                        uf_value = self.ud_date(uf_value)
+
+                    if new_prod or field_desc.get('on_update', True):
+                        lang_values[uf_key] = uf_value
+        if new_prod:
+            for nomen in ['nomen_manda_0', 'nomen_manda_1', 'nomen_manda_2', 'nomen_manda_3']:
+                if uf_values['en_MF'].get(nomen) and uf_values['en_MF'][nomen] in self.default_oc_values:
+                    uf_values['en_MF'].update(self.default_oc_values[uf_values['en_MF'][nomen]])
+
+        if uf_values['en_MF'].get('batch_management'):
+            uf_values['en_MF']['perishable'] = True
+
+        return uf_values
+
+    def update_products(self, q_filter, record_date, session_id=False):
         country_obj = self.pool.get('unidata.country')
         project_obj = self.pool.get('unidata.project')
         prod_obj = self.pool.get('product.product')
+        pull_log = self.pool.get('unidata.pull_product.log')
+
 
         page = 1
         date_to_record = False
         prod_updated = 0
         rows_seen = 0
+        nb_errors = 0
+        nb_created = 0
         while True:
             js = self.query(q_filter, page=page)
 
@@ -546,65 +942,171 @@
             for x in js.get('rows'):
                 self.log('UD: %s' % x)
                 rows_seen += 1
-                prod_id = prod_obj.search(self.cr, self.uid, [('msfid', '=', x['id']), ('active', 'in', ['t', 'f'])], order='active desc, id', context=self.context)
-                if not prod_id:
-                    self.log('Product not found in UF, msfid: %s, code: %s' % (x['id'], x['code'], ), 'warn')
-                    continue
-
-                oc_data = x.get('ocValidations', {}).get(self.oc, {})
-                data = {
-                    'oc_validation': oc_data.get('valid'),
-                    'oc_validation_date': False,
-                    'oc_devalidation_date': False,
-                    'oc_devalidation_reason': oc_data.get('devalidationReason'),
-                    'oc_comments': oc_data.get('comments'),
-
-                }
-
-                if oc_data.get('lastValidationDate'):
-                    data['oc_validation_date'] = self.ud_date(oc_data['lastValidationDate'])
-                if oc_data.get('lastDevalidationDate'):
-                    data['oc_devalidation_date'] = self.ud_date(oc_data['lastDevalidationDate'])
-
-                c_restriction = []
-                p_restriction = []
-                for mr in oc_data.get('missionRestrictions', []):
-                    if mr.get('country', {}).get('labels', {}).get('english'):
-                        if mr['country']['labels']['english'] not in self.country_cache:
-                            c_id = country_obj.search(self.cr, self.uid, [('name', '=', mr['country']['labels']['english'])], context=self.context)
-                            if not c_id:
-                                c_id = country_obj.create(self.cr, self.uid, {'name': mr['country']['labels']['english']}, context=self.context)
-
-                                self.log('Create country %s' % (mr['country']['labels']['english'],))
-                                self.country_cache[mr['country']['labels']['english']] = c_id
-                            else:
-                                self.country_cache[mr['country']['labels']['english']] = c_id[0]
-                        c_restriction.append(self.country_cache[mr['country']['labels']['english']])
-
-                    for pr in mr.get('projectRestrictions', []):
-                        # TODO create UF instance
-                        if pr.get('code'):
-                            if pr.get('code') not in self.project_cache:
-                                p_id = project_obj.search(self.cr, self.uid, [('code', '=', pr['code'])], context=self.context)
-                                if not p_id:
-                                    self.log('Create project %s' % (pr['code'], ))
-                                    self.project_cache[pr['code']] = project_obj.create(self.cr, self.uid, {'code': pr['code'], 'name': pr.get('name')}, context=self.context)
+                try:
+                    self.cr.execute("SAVEPOINT nom_ud_update")
+                    #prod_id = prod_obj.search(self.cr, self.uid, [('msfid', '=', x['id']), ('active', 'in', ['t', 'f'])], order='active desc, id', context=self.context)
+                    #if x.get('state') == 'Golden':
+                    #    continue
+                    prod_ids = []
+                    if not x.get('id'):
+                        raise UDException('No msfid in API')
+
+                    if not x.get('formerCodes'):
+                        raise UDException('No formerCodes code')
+                    if not x.get('type') or not x.get('group', {}).get('code') or not x.get('family', {}).get('code') or not x.get('root', {}).get('code'):
+                        raise UDException('Nomenclature not set in UD')
+
+                    prod_ids = prod_obj.search(self.cr, self.uid, [('msfid', '=', x.get('id')), ('active', 'in', ['t', 'f']), ('international_status', '=', self.unidata_id)], context=self.context)
+                    if len(prod_ids) > 1:
+                        raise UDException('%s products found for msfid %s: %s' % (len(prod_ids), x.get('id'), prod_obj.read(self.cr, self.uid, prod_ids, ['default_code'])))
+
+                    if len(prod_ids) == 0:
+                        if not x.get('ocSubscriptions').get(self.oc):
+                            self.log('%s product ignored: ocSubscriptions False' % x['formerCodes'])
+                            continue
+                        self.log('%s product to create' % (x['formerCodes'], ))
+                    else:
+                        if not x.get('ocSubscriptions').get(self.oc):
+                            if not prod_obj.search(self.cr, self.uid, [('id', 'in', prod_ids), ('oc_subscription', '=', True), ('active', 'in', ['t', 'f'])], context=self.context):
+                                self.log('%s product ignored: ocSubscriptions False in UD and UF' % x['code'])
+                                continue
+
+                        self.log('%s product found %s' % (x['formerCodes'], prod_ids[0]))
+
+                    product_values = self.map_ud_fields(x, new_prod=not bool(prod_ids))
+
+                    c_restriction = []
+                    p_restriction = []
+                    oc_data = x.get('ocValidations', {}).get(self.oc, {})
+                    for mr in oc_data.get('missionRestrictions', []):
+                        if mr.get('country', {}).get('labels', {}).get('english'):
+                            if mr['country']['labels']['english'] not in self.country_cache:
+                                c_id = country_obj.search(self.cr, self.uid, [('name', '=', mr['country']['labels']['english'])], context=self.context)
+                                if not c_id:
+                                    c_id = country_obj.create(self.cr, self.uid, {'name': mr['country']['labels']['english']}, context=self.context)
+
+                                    self.log('Create country %s' % (mr['country']['labels']['english'],))
+                                    self.country_cache[mr['country']['labels']['english']] = c_id
                                 else:
-                                    self.project_cache[pr['code']] = p_id[0]
-                            p_restriction.append(self.project_cache[pr['code']])
-
-                data.update({
-                    'oc_country_restrictions': [(6, 0, list(set(c_restriction)))],
-                    'oc_project_restrictions':  [(6, 0, list(set(p_restriction)))],
-                })
-                self.log('Write product id: %d, code: %s, msfid: %s, data: %s' % (prod_id[0], x['code'], x['id'], data))
-                prod_obj.write(self.cr, self.uid, prod_id[0], data, context=self.context)
-                prod_updated += 1
+                                    self.country_cache[mr['country']['labels']['english']] = c_id[0]
+                            c_restriction.append(self.country_cache[mr['country']['labels']['english']])
+
+                        for pr in mr.get('projectRestrictions', []):
+                            # TODO create UF instance
+                            if pr.get('code'):
+                                if pr.get('code') not in self.project_cache:
+                                    p_id = project_obj.search(self.cr, self.uid, [('code', '=', pr['code'])], context=self.context)
+                                    if not p_id:
+                                        self.log('Create project %s' % (pr['code'], ))
+                                        self.project_cache[pr['code']] = project_obj.create(self.cr, self.uid, {'code': pr['code'], 'name': pr.get('name')}, context=self.context)
+                                    else:
+                                        self.project_cache[pr['code']] = p_id[0]
+                                p_restriction.append(self.project_cache[pr['code']])
+
+                    product_values['en_MF'].update({
+                        'oc_country_restrictions': [(6, 0, list(set(c_restriction)))],
+                        'oc_project_restrictions':  [(6, 0, list(set(p_restriction)))],
+                    })
+
+
+                    if prod_ids:
+                        diff = []
+                        for lang in ['en_MF', 'fr_MF', 'sp_MF']:
+                            if not product_values.get(lang):
+                                continue
+                            current_value = prod_obj.browse(self.cr, self.uid, prod_ids[0], fields_to_fetch=product_values[lang].keys(), context={'lang': lang})
+                            for key, value in product_values[lang].items():
+                                tmp_diff = False
+                                if key in ('oc_country_restrictions', 'oc_project_restrictions'):
+                                    if set(value[0][2]) != set([x.id for x in current_value[key]]):
+                                        self.log('Field diff %s, uf: *%s*, ud: *%s*'% (key, [x.id for x in current_value[key]], value[0][2]))
+                                        tmp_diff = True
+                                elif isinstance(current_value[key], browse_record):
+                                    if current_value[key]['id'] != value:
+                                        self.log('Field diff m2o empty %s, uf: *%s*, ud: *%s*'% (key, current_value[key]['id'], value))
+                                        tmp_diff = True
+                                elif isinstance(current_value[key], browse_null):
+                                    if value:
+                                        self.log('Field diff m2o %s, uf: *%s*, ud: *%s*'% (key, current_value[key]['id'], value))
+                                        tmp_diff = True
+                                elif current_value[key] != value and ( value is False and current_value[key] or value is not False):
+                                    self.log('Field diff %s, uf: *%s*, ud: *%s*'% (key, current_value[key], value))
+                                    tmp_diff = True
+                                if tmp_diff:
+                                    diff.append(key)
+                            if diff:
+                                # not not check fr/sp
+                                break
+
+                        if not diff:
+                            self.log('==== same values %s %s' % (product_values.get('en_MF', {}).get('default_code'), prod_ids[0]))
+                            continue
+                        else:
+                            self.log('==== diff values %s %s, key: %s' % (product_values.get('en_MF', {}).get('default_code'), prod_ids[0], diff))
+
+                    try:
+                        self.cr.execute("SAVEPOINT prod_ud_update")
+                        if prod_ids:
+                            self.log('==== write product id: %d, code: %s, msfid: %s, data: %s' % (prod_ids[0], x['code'], x['id'], product_values['en_MF']))
+                            prod_obj.write(self.cr, self.uid, prod_ids[0], product_values['en_MF'], context={'lang': 'en_MF'})
+                            prod_updated += 1
+                        else:
+                            prod_ids = [prod_obj.create(self.cr, self.uid, product_values['en_MF'], context={'lang': 'en_MF'})]
+                            self.log('==== create product id: %d, code: %s, msfid: %s, data: %s' % (prod_ids[0], x['code'], x['id'], product_values['en_MF']))
+                            nb_created += 1
+
+                        for lang in ['fr_MF', 'sp_MF']:
+                            if product_values.get(lang):
+                                prod_obj.write(self.cr, self.uid, prod_ids[0], product_values['lang'], context={'lang': 'lang'})
+                    except Exception as e:
+                        self.cr.execute("ROLLBACK TO SAVEPOINT prod_ud_update")
+                        raise UDException(tools.misc.get_traceback(e))
+                    else:
+                        self.cr.execute("RELEASE SAVEPOINT prod_ud_update")
+
+                except UDException as e:
+                    self.cr.execute("ROLLBACK TO SAVEPOINT nom_ud_update")
+                    self.log('ERROR %s'% e.args[0])
+                    if session_id:
+                        data_log = {
+                            'msfid': x.get('id', ''),
+                            'code': x.get('code', ''),
+                            'former_codes': x.get('formerCodes', ''),
+                            'log': e.args[0],
+                            'json_data': x,
+                            'session_id': session_id,
+                        }
+                        to_write = []
+                        if x.get('id', ''):
+                            to_write =  pull_log.search(self.cr, self.uid,[('msfid', '=', x.get('id', '')), ('session_id', '=', session_id)])
+
+                        if to_write:
+                            pull_log.write(self.cr, self.uid, to_write, data_log)
+                        else:
+                            pull_log.create(self.cr, self.uid, data_log)
+                            nb_errors += 1
+                    else:
+                        nb_errors += 1
+                    if x.get('id', ''):
+                        self.cr.execute('''insert into unidata_products_error (msfid, code, former_codes, date, log, uf_product_id, json_data)
+                            values (%(msfid)s, %(code)s, %(former_codes)s, NOW(), %(log)s, %(uf_product_id)s, %(json_data)s)
+                            on conflict (msfid)  do update SET code = %(code)s, former_codes=%(former_codes)s, date=NOW(), log=%(log)s, uf_product_id=%(uf_product_id)s, json_data=%(json_data)s, fixed_date=NULL
+                        ''', {
+                            'msfid': x.get('id'),
+                            'code': x.get('code', ''),
+                            'former_codes': '%s' % x.get('formerCodes', ''),
+                            'log': e.args[0],
+                            'uf_product_id': ','.join([str(x) for x in prod_ids]),
+                            'json_data': '%s'%x,
+                        })
+                else:
+                    self.cr.execute("RELEASE SAVEPOINT nom_ud_update")
+
             page += 1
             if len(js.get('rows')) < self.page_size:
                 break
 
-        return date_to_record, rows_seen, prod_updated
+        return date_to_record, rows_seen, prod_updated, nb_created, nb_errors
 
 
 
@@ -622,7 +1124,7 @@
     def _get_log(self, cr, uid, ids, field_name, args, context=None):
         res = {}
 
-        cr.execute("select start_date, end_date, state, sync_type from unidata_sync_log where server='ud' order by id desc limit 1")
+        cr.execute("select start_date, end_date, state, sync_type from unidata_sync_log where server='ud' and coalesce(sync_type, '')!='single' order by id desc limit 1")
         one = cr.fetchone()
         if one:
             last_execution_start_date = one[0]
@@ -640,7 +1142,6 @@
             last_msl_execution_status = one[2]
             last_msl_execution_sync_type = one[3]
         else:
-            last_execution_start_date = last_execution_end_date = last_execution_status = last_execution_sync_type = False
             last_msl_execution_start_date = last_msl_execution_end_date = last_msl_execution_status = last_msl_execution_sync_type = False
 
         param_obj = self.pool.get('ir.config_parameter')
@@ -661,7 +1162,6 @@
                 'last_msl_execution_sync_type': last_msl_execution_sync_type,
                 'eligible_msl_full_sync': eligible_msl_full_sync,
             }
-
         return res
 
     def _get_next_planned_date(self, cr, uid, ids, field_name, args, context=None):
@@ -849,7 +1349,7 @@
         new_thread.start()
         new_thread.join(3.0)
         if not new_thread.is_alive() and self._error:
-            raise self._error
+            raise Exception(self._error)
         return True
 
     def start_ud_sync(self, cr, uid, context=None):
@@ -878,6 +1378,8 @@
 
         nb_prod = 0
         updated = 0
+        total_nb_errors = 0
+        total_nb_created = 0
 
         if full:
             param_obj.set_param(cr, 1, 'LAST_UD_DATE_SYNC', '')
@@ -889,7 +1391,8 @@
             sync_type = 'diff'
 
 
-        logger = logging.getLogger('unidata-sync')
+        oc = self.pool.get('sync.client.entity').get_entity(cr, uid, context).oc
+        logger = logging.getLogger('unidata-sync-%s'% oc)
         sync_obj = ud_sync(cr, uid, self.pool, logger=logger, context=context)
         page_size = sync_obj.page_size
 
@@ -926,15 +1429,32 @@
         logger.info('Sync start, page size: %s, last msfid: %s, last date: %s' % (page_size, min_msfid, last_ud_date_sync))
 
         try:
-            while True:
+            last_loop = False
+            max_id = 0
+            # first tries previous errors
+            cr.execute('select distinct(msfid) from unidata_products_error where fixed_date is null')
+            query = []
+            all_msfids = [x[0] for x in cr.fetchall()]
+            for x in all_msfids:
+                query.append("msfIdentifier=%s" % x)
+            if query:
+                cr.execute('update unidata_products_error set fixed_date=NOW() where msfid in %s', (tuple(all_msfids),))
+                trash1, nb_prod, updated, total_nb_created, total_nb_errors = sync_obj.update_products(" or ".join(query), False, session_id)
+            while not last_loop:
                 cr.execute('SAVEPOINT unidata_sync_log')
                 cr.execute("select min(msfid), max(msfid) from product_product p where id in (select id from product_product where coalesce(msfid,0)!=0 and msfid>%s order by msfid limit %s)", (min_msfid, page_size))
                 min_id, max_id = cr.fetchone()
                 min_msfid = max_id
                 if not min_id:
-                    break
+                    last_loop = True
+                    cr.execute("select max(msfid) from product_product p")
+                    min_msfid = cr.fetchone()[0] or 0
+                    q_filter = "(msfIdentifier>=%s)" % min_msfid
+                else:
+                    if first_query:
+                        min_id = 0
+                    q_filter = "(msfIdentifier>=%s and msfIdentifier<=%s)"%(min_id, max_id)
 
-                q_filter = "(msfIdentifier>=%s and msfIdentifier<=%s)"%(min_id, max_id)
                 if last_ud_date_sync:
                     lastsync = (datetime.strptime(last_ud_date_sync.split('T')[0], '%Y-%m-%d') + relativedelta(hours=-24)).strftime('%Y-%m-%dT00:00:00')
                     createdOn = (datetime.strptime(last_ud_date_sync.split('T')[0], '%Y-%m-%d') + relativedelta(days=-3)).strftime('%Y-%m-%dT00:00:00')
@@ -944,7 +1464,7 @@
                         'createdOn': createdOn,
                     }
 
-                s_date_to_record, rows_seen, prod_updated = sync_obj.update_products(q_filter, first_query)
+                s_date_to_record, rows_seen, prod_updated, nb_created, nb_errors = sync_obj.update_products(q_filter, first_query, session_id)
                 if first_query and s_date_to_record:
                     logger.info('Set last date: %s', s_date_to_record)
                     param_obj.set_param(cr, 1, 'LAST_UD_DATE_SYNC', s_date_to_record)
@@ -953,8 +1473,10 @@
 
                 updated += prod_updated
                 nb_prod += rows_seen
+                total_nb_errors += nb_errors
+                total_nb_created += nb_created
 
-                session_obj.write(cr, uid, session_id, {'number_products_pulled': nb_prod, 'number_products_updated': updated}, context=context)
+                session_obj.write(cr, uid, session_id, {'number_products_pulled': nb_prod, 'number_products_updated': updated, 'number_products_created': total_nb_created, 'number_products_errors': total_nb_errors}, context=context)
                 cr.commit()
 
                 # end of sql loop
@@ -965,13 +1487,13 @@
             logger.error('End of Script with error: %s' % error)
             handler.close()
             logger.removeHandler(handler)
-            session_obj.write(cr, uid, session_id, {'end_date': fields.datetime.now(), 'state': 'error', 'number_products_pulled': nb_prod, 'error': error, 'number_products_updated': updated}, context=context)
+            session_obj.write(cr, uid, session_id, {'end_date': fields.datetime.now(), 'state': 'error', 'number_products_pulled': nb_prod, 'error': error, 'number_products_updated': updated, 'number_products_created': total_nb_created, 'number_products_errors': total_nb_errors}, context=context)
             return False
 
         logger.info('End of Script')
         handler.close()
         logger.removeHandler(handler)
-        session_obj.write(cr, uid, session_id, {'end_date': fields.datetime.now(), 'state': 'done', 'number_products_pulled': nb_prod, 'number_products_updated': updated}, context=context)
+        session_obj.write(cr, uid, session_id, {'end_date': fields.datetime.now(), 'state': 'done', 'number_products_pulled': nb_prod, 'number_products_updated': updated, 'number_products_created': total_nb_created, 'number_products_errors': total_nb_errors}, context=context)
         param_obj.set_param(cr, 1, 'LAST_MSFID_SYNC', '')
         return True
 
@@ -988,4 +1510,127 @@
 
 unidata_sync()
 
-
+class unidata_default_product_value(osv.osv):
+    _name = 'unidata.default_product_value'
+    _description = 'OC Default values'
+
+    def _get_number_incompatible_products(self, cr, uid, ids, field_name, args, context=None):
+        res = {}
+        ud_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'product_attributes', 'int_6')[1]
+        prod_obj = self.pool.get('product.product')
+        for oc_val in self.browse(cr, uid, ids, fields_to_fetch=['nomenclature', 'value', 'field'], context=context):
+            value = oc_val.value
+            if value == 'f':
+                value = False
+            res[oc_val.id] = prod_obj.search(cr, uid, [('international_status', '=', ud_id), ('nomen_manda_%d' % oc_val.nomenclature.level, '=', oc_val.nomenclature.id), (oc_val.field, '!=', value)], count=True, context=context)
+
+        return res
+
+    _columns = {
+        'field': fields.selection([('perishable', 'Expiry Date Mandatory'), ('batch_management', 'Batch Number Mandatory'), ('procure_method','Procurement Method'), ('type', 'Product Type'), ('subtype', 'Product SubType')], 'Field Name', required=1, select=1),
+        'value': fields.char('Value', size=256, required=1, select=1),
+        'nomenclature': fields.many2one('product.nomenclature', required=1, string="Nomenclature"),
+        'number_incompatible_products': fields.function(_get_number_incompatible_products, method=True, type='integer', string='Nb inconsistent prod'),
+    }
+
+    _sql_constraints = [
+        ('unique_nomenclature_field', 'unique(field, nomenclature)', 'Field / nomenclature already exists')
+    ]
+
+    def _check_value(self, cr, uid, ids, context=None):
+        if not ids:
+            return True
+        for oc in self.browse(cr, uid, ids, context=context):
+            if oc.field in ['perishable', 'batch_management'] and oc.value not in ['t', 'f']:
+                raise osv.except_osv(_('Error'), _('Expiry Date Mandatory and Batch Number Mandatory: only t or f are allowed'))
+            if oc.field == 'procure_method' and oc.value not in ['make_to_stock', 'make_to_order']:
+                raise osv.except_osv(_('Error'), _('Procurement Method: only make_to_stock or make_to_order are allowed'))
+            if oc.field == 'type' and oc.value not in ['product', 'consu', 'service_recep']:
+                raise osv.except_osv(_('Error'), _('Product Type only product, consu or service_recep are allowed'))
+            if oc.field == 'subtype' and oc.value not in ['single', 'kit', 'asset', '']:
+                raise osv.except_osv(_('Error'), _("Product SubType only single, kit, asset or '' are allowed"))
+
+        return True
+
+
+    _constraints = [
+        (_check_value, 'Value not allowed', [])
+    ]
+
+    def open_products(self, cr, uid, ids, context=None):
+        txt = []
+        for d in self.browse(cr, uid, ids, context=context):
+            txt.append('%s %s not %s' % (d.nomenclature.name, d.field, d.value))
+
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': 'product.product',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'domain': [('incompatible_oc_default_values', 'in', ids)],
+            'name': ' or '.join(txt)
+        }
+
+unidata_default_product_value()
+
+class unidata_pull_product_log(osv.osv):
+    _name = 'unidata.pull_product.log'
+    _order = 'id desc'
+    def _get_json_data_formated(self, cr, uid, ids, field_name, args, context=None):
+        res = {}
+
+        for j in self.browse(cr, uid, ids, fields_to_fetch=['json_data'], context=context):
+            try:
+                res[j.id] = pprint.pformat(safe_eval(j.json_data), width=160)
+            except:
+                res[j.id] = False
+        return res
+
+    _columns = {
+        'msfid': fields.integer('MSF ID', required=1),
+        'code': fields.char('UD Code', size=64, select=1),
+        'former_codes': fields.char('Former Code', size=1024, select=1),
+        'date': fields.datetime('Date', required=1, select=1),
+        'log': fields.text('Log'),
+        'json_data': fields.text('UD Json'),
+        'json_data_formated': fields.function(_get_json_data_formated, method=1, type='text',string='UD Json'),
+        'session_id': fields.many2one('unidata.sync.log', 'Session', select=1),
+    }
+
+    _defaults = {
+        'date': lambda *a, **b: fields.datetime.now(),
+    }
+unidata_pull_product_log()
+
+class unidata_products_error(osv.osv):
+    _name = 'unidata.products_error'
+    _order = 'date desc, msfid'
+    def _get_json_data_formated(self, cr, uid, ids, field_name, args, context=None):
+        res = {}
+
+        for j in self.browse(cr, uid, ids, fields_to_fetch=['json_data'], context=context):
+            try:
+                res[j.id] = pprint.pformat(safe_eval(j.json_data), width=160)
+            except:
+                res[j.id] = False
+        return res
+
+    _columns = {
+        'msfid': fields.integer('MSF ID', required=1, select=1),
+        'code': fields.char('UD Code', size=64, select=1),
+        'former_codes': fields.char('Former Code', size=1024),
+        'date': fields.datetime('Date of last error', required=1, select=1),
+        'fixed_date': fields.datetime('Fixed at',  select=1),
+        'log': fields.text('Log'),
+        'uf_product_id': fields.text('UF product db id'),
+        'json_data': fields.text('UD Json'),
+        'json_data_formated': fields.function(_get_json_data_formated, method=1, type='text',string='UD Json'),
+    }
+
+    _sql_constraints = [
+        ('unique_msfid', 'unique(msfid)', 'msfid already exists.'),
+    ]
+    _defaults = {
+        'date': lambda *a, **b: fields.datetime.now(),
+    }
+unidata_products_error()

=== modified file 'bin/addons/product_attributes/unidata_sync.xml'
--- bin/addons/product_attributes/unidata_sync.xml	2023-11-28 13:36:32 +0000
+++ bin/addons/product_attributes/unidata_sync.xml	2024-05-13 13:47:13 +0000
@@ -120,11 +120,29 @@
                     <newline />
                     <field name="number_products_pulled" />
                     <field name="number_products_updated" />
+                    <field name="number_products_created" />
+                    <field name="number_products_errors" />
                     <field name="msfid_min" />
                     <field name="last_date" />
                     <field name="sync_type" />
                     <field name="state" />
                     <field name="error" colspan="4" />
+                    <field name="sync_error" colspan="4" nolabel="1">
+                    <tree string="Product Errors">
+                        <field name="msfid" />
+                            <field name="code" />
+                            <field name="former_codes" />
+                            <field name="log" />
+                            <field name="date" />
+                    </tree>
+                    <form string="Product Errors">
+                        <field name="msfid" />
+                        <field name="code" />
+                        <field name="former_codes" />
+                        <field name="log" />
+                        <field name="json_data_formated" colspan="4" widget="full_text" nolabel="1"/>
+                    </form>
+                    </field>
                 </form>
             </field>
         </record>
@@ -139,7 +157,9 @@
                     <field name="end_date"  />
                     <field name="page_size" />
                     <field name="number_products_pulled" />
-                    <field name="number_products_updated" />
+		    <field name="number_products_updated" />
+		    <field name="number_products_created" />
+	            <field name="number_products_errors" />
                     <field name="sync_type" />
                     <field name="state" />
                     <field name="log_exists" invisible="1" />
@@ -708,5 +728,143 @@
             key2="client_action_multi"
             search_view_id="product_msl_rel_search"
             context="{'search_default_product_id': active_id}"/>
+
+        <record id="unidata_sync_log_msl_action" model="ir.actions.act_window">
+            <field name="name">MSL Sync report</field>
+            <field name="res_model">unidata.sync.log</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="unidata_sync_log_msl_search" />
+            <field name="view_id" ref="unidata_sync_log_msl_tree" />
+            <field name="domain">[('server', '=', 'msl')]</field>
+        </record>
+
+        <record id="unidata_products_error_action" model="ir.actions.act_window">
+            <field name="name">UniData linkage errors</field>
+            <field name="res_model">unidata.products_error</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[]</field>
+            <field name="context">{'search_default_hidde_fixed': True}</field>
+        </record>
+
+        <record model="ir.ui.view" id="unidata_products_error_form">
+            <field name="name">unidata.products_error.form</field>
+            <field name="model">unidata.products_error</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+             <form string="UniData linkage error" hide_new_button="1" hide_delete_button="1" hide_duplicate_button="1">
+                    <field name="date" />
+                    <field name="fixed_date" />
+                    <field name="msfid" />
+                    <field name="uf_product_id" />
+                    <field name="code"  />
+                    <field name="former_codes" />
+                    <field name="log" colspan="4" nolabel="1" />
+                    <field name="json_data_formated" widget="full_text" nolabel="1" colspan="4" />
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="unidata_products_error_tree">
+            <field name="name">unidata.products_error.tree</field>
+            <field name="model">unidata.products_error</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="20" />
+            <field name="arch" type="xml">
+                <tree string="UniData linkage errors" hide_new_button="1" hide_delete_button="1" noteditable="1" colors="red:not fixed_date">
+                    <field name="date" />
+                    <field name="fixed_date"  />
+                    <field name="msfid" />
+                    <field name="uf_product_id" />
+                    <field name="code" />
+                    <field name="former_codes" />
+                    <field name="log" />
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="unidata_products_error_search">
+            <field name="name">unidata.products_error.search</field>
+            <field name="model">unidata.products_error</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="UniData linkage errors">
+                    <filter name="hidde_fixed" string="Hide Fixed" domain="[('fixed_date', '=', False)]" icon="terp-check" />
+                    <field name="date" />
+                    <field name="fixed_date"  />
+                    <field name="msfid" />
+                    <newline />
+                            <field name="uf_product_id" />
+                            <field name="code" />
+                    <field name="former_codes" />
+                    <field name="log" />
+                </search>
+            </field>
+        </record>
+        <menuitem name="UniData linkage errors" action="unidata_products_error_action" id="unidata_products_error_menu" parent="unidata_main_menu" sequence="26"/>
+
+        <record id="unidata_products_not_oc_value_action" model="ir.actions.act_window">
+            <field name="name">UD Products incompatible with OC values</field>
+            <field name="res_model">product.product</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('incompatible_oc_default_values', '=', True)]</field>
+            <field name="context">{}</field>
+        </record>
+
+        <menuitem name="UD Products incompatible with OC values" action="unidata_products_not_oc_value_action" id="unidata_products_not_oc_value_menu" parent="unidata_main_menu" sequence="27"/>
+
+        <record id="unidata_default_product_value_action" model="ir.actions.act_window">
+            <field name="name">OC Default values</field>
+            <field name="res_model">unidata.default_product_value</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[]</field>
+            <field name="context">{}</field>
+        </record>
+
+        <record model="ir.ui.view" id="unidata_default_product_value_form">
+            <field name="name">unidata.default_product_value.form</field>
+            <field name="model">unidata.default_product_value</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+             <form string="OC Default Values" hide_duplicate_button="1">
+                    <field name="nomenclature" />
+                    <field name="field" />
+                    <field name="value" />
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="unidata_default_product_value_tree">
+            <field name="name">unidata.default_product_value.tree</field>
+            <field name="model">unidata.default_product_value</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="20" />
+            <field name="arch" type="xml">
+                <tree string="OC Default Values">
+                    <field name="nomenclature" />
+                    <field name="field"  />
+                    <field name="value" />
+                    <field name="number_incompatible_products" />
+                    <button name="open_products" string="View products" icon="gtk-go-forward" type="object" attrs="{'invisible': [('number_incompatible_products', '=', 0)]}" />
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="unidata_default_product_value_search">
+            <field name="name">unidata.default_product_value.search</field>
+            <field name="model">unidata.default_product_value</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="OC Default Values">
+                    <field name="nomenclature" />
+                    <field name="field"  />
+                    <field name="value" />
+                </search>
+            </field>
+        </record>
+        <menuitem name="OC Default Values" action="unidata_default_product_value_action" id="unidata_default_product_value_menu" parent="unidata_main_menu" sequence="27"/>
     </data>
 </openerp>

=== added directory 'tools/UD'
=== added file 'tools/UD/create_sql.py'
--- tools/UD/create_sql.py	1970-01-01 00:00:00 +0000
+++ tools/UD/create_sql.py	2024-05-13 13:47:13 +0000
@@ -0,0 +1,99 @@
+#!/usr/bin/env python
+
+import psycopg2
+import sys
+import csv
+
+if len(sys.argv) < 3:
+    print('%s dbname oc' % sys.argv[0])
+    sys.exit(1)
+
+dbname = sys.argv[1]
+oc = sys.argv[2]
+
+if oc not in ('OCP', 'OCA', 'OCG', 'OCB'):
+    print('OC unknown')
+    sys.exit(1)
+
+db_host = '127.0.0.1'
+
+conn = psycopg2.connect(database=dbname)
+cr = conn.cursor()
+
+line_number = 1
+
+values_mapping = {
+    'Yes': 't',
+    'Kit/Module': 'kit',
+    'Make to Order': 'make_to_order',
+    'Service with Reception': 'service_recep',
+    '': '',
+}
+with open('ud_default_value.csv', 'r', newline='') as f:
+    c = csv.reader(f, quotechar='"', delimiter=',')
+    for line in c:
+        line_number += 1
+        if not line or line[1] != oc:
+            continue
+        nomen = line[3][5:].strip()
+        all_nom = nomen.split('|')
+        level = 1
+        parent_id = False
+        error = False
+
+        if line[4] not in values_mapping:
+            print('Line number %s, value %s not found' % (line_number, line[4]))
+            break
+        for nom in all_nom:
+            nom = nom.strip()[0:63]
+            if nom:
+                cond = ''
+                params = [nom.strip(), level]
+                if parent_id:
+                    cond = ' and n.parent_id in %s'
+                    params.append(tuple(parent_id))
+                    params[0] = '%%%s' % nom
+
+                cr.execute("""
+                    select
+                        n.id
+                    from
+                        product_nomenclature n
+                    left join ir_translation t on t.lang='en_MF' and t.name='product.nomenclature,name' and t.res_id = n.id
+                    where
+                        coalesce(t.value, n.name) like %s and
+                        n.level=%s
+                    """+cond, tuple(params)) # not_a_user_entry
+                if not cr.rowcount:
+                    print(all_nom)
+                    print(str(cr.mogrify("""
+                        select
+                            n.id
+                        from
+                            product_nomenclature n
+                        left join ir_translation t on t.lang='en_MF' and t.name='product.nomenclature,name' and t.res_id = n.id
+                        where
+                            coalesce(t.value, n.name) like %s and
+                            n.level=%s 
+                        """+cond, tuple(params)), 'utf8'))
+                    print('Line number %s, nomen %s not found' % (line_number, nom))
+                    error = True
+                    break
+                parent_id = [x[0] for x in cr.fetchall()]
+                level += 1
+        if error:
+            continue
+        for n_id in parent_id:
+            query = "insert into unidata_default_product_value (field, value, nomenclature) values (%s, %s, %s);"
+            values = (line[2], values_mapping[line[4]], n_id)
+            print('-- %s' %line)
+            print(str(cr.mogrify(query, values), 'utf8'))
+            cr.execute(query, values)
+
+query = "update product_cold_chain set ud_code=code;"
+print(query)
+cr.execute(query)
+query = "update product_cold_chain set ud_code='CT3+' where id in (select res_id from ir_model_data where name='product_attributes_cold_20');"
+print(query)
+cr.execute(query)
+conn.commit()