Merge lp:~dorian-kemps/unifield-server/US-7181 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2020-02-17 13:16:46 +0000
+++ bin/addons/msf_profile/data/patches.xml	2020-02-19 10:26:15 +0000
@@ -508,5 +508,9 @@
         <record id="us_7024_update_standard" model="patch.scripts">
             <field name="method">us_7024_update_standard</field>
         </record>
+
+        <record id="us_7181_add_oc_subscrpition_to_unidata_products" model="patch.scripts">
+            <field name="method">us_7181_add_oc_subscrpition_to_unidata_products</field>
+        </record>
     </data>
 </openerp>

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2020-02-11 09:20:13 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2020-02-19 10:26:15 +0000
@@ -108793,4 +108793,7 @@
 msgid "Warning, to complete Segment %s, field \"Next order to be received by (modified)\" must have date filled"
 msgstr "Attention, pour le Segment %s  le champ \"Prochaine commande à recevoir (modifié)\" doit être renseigné."
 
-
+#. module: product_attributes
+#: field:product.product,oc_subscription:0
+msgid "OC Subscription"
+msgstr "Abonnement OC"

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2020-02-17 13:16:46 +0000
+++ bin/addons/msf_profile/msf_profile.py	2020-02-19 10:26:15 +0000
@@ -53,6 +53,20 @@
     }
 
     # UF16.0
+    def us_7181_add_oc_subscrpition_to_unidata_products(self, cr, uid, *a, **b):
+        """
+        Set the new 'oc_subscription' boolean to True for each product with 'Unidata' as Product Creator
+        """
+        cr.execute("""
+            UPDATE product_product SET oc_subscription = 't' WHERE id IN (
+                SELECT p.id FROM product_product p LEFT JOIN product_international_status i ON p.international_status = i.id
+                WHERE i.code = 'unidata'
+            )
+        """)
+        self._logger.warn('%s Unidata product(s) have been updated.' % (cr.rowcount,))
+
+        return True
+
     def us_6692_new_od_journals(self, cr, uid, *a, **b):
         """
         1. Change the type of the existing correction journals (except OD) to "Correction Manual" so they remain usable

=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv'
--- bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2020-01-30 10:35:55 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2020-02-19 10:26:15 +0000
@@ -123,7 +123,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', 'active', 'state', 'state_ud', 'old_code', 'new_code', 'function_value', 'form_value', 'fit_value', 'standard_ok','transport_ok','volume', 'soq_quantity', 'soq_weight', 'soq_volume', 'msfid']",OC,product.product,,"OC Product (Creator = ITC, ESC, UniData or HQ)",Valid,,600
+msf_sync_data_server.oc_product_creator_itc_esc_hq,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"['|','|','|',('international_status','=','UniData'),('international_status','=','ITC'),('international_status','=','ESC'),('international_status','=','HQ'), ('active', 'in', ['t','f'])]","['alert_time', 'batch_management', 'categ_id/id', 'closed_article', 'manufacturer_txt', 'manufacturer_ref', 'code', 'cold_chain/id', 'composed_kit', 'xmlid_code', 'cost_method', 'country_restriction/id', 'dangerous_goods', 'default_code', 'description', 'description2', 'description_purchase', 'description_sale', 'gmdn_code', 'gmdn_description', 'heat_sensitive_item/id', 'international_status/id', 'justification_code_id/id', 'library', 'life_time', 'list_ids/id','med_device_class', 'name', 'name_template', 'controlled_substance', 'nomen_manda_0/id', 'nomen_manda_1/id', 'nomen_manda_2/id', 'nomen_manda_3/id', 'options_ids/id', 'perishable', 'procure_delay', 'procure_method', 'produce_delay', 'product_catalog_page', 'product_catalog_path', 'property_account_expense/id', 'property_account_income/id', 'property_stock_account_input/id', 'property_stock_account_output/id', 'restricted_country', 'short_shelf_life', 'single_use', 'sterilized', 'standard_price', 'sublist', 'subtype', 'asset_type_id', 'supply_method', 'type', 'un_code', 'uom_id/id', 'uom_po_id/id','use_time', 'valuation', 'weight', 'weight_net', 'active', 'state', 'state_ud', 'old_code', 'new_code', 'function_value', 'form_value', 'fit_value', 'standard_ok','transport_ok','volume', 'soq_quantity', 'soq_weight', 'soq_volume', 'msfid', 'oc_subscription']",OC,product.product,,"OC Product (Creator = ITC, ESC, UniData or HQ)",Valid,,600
 msf_sync_data_server.mission_product_creator_local,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('international_status','=','Local'), ('active', 'in', ['t','f'])]","['alert_time', 'batch_management', 'categ_id/id', 'closed_article', 'manufacturer_txt', 'manufacturer_ref', 'code', 'xmlid_code','cold_chain/id', 'composed_kit', 'cost_method', 'country_restriction/id', 'dangerous_goods', 'default_code', 'description', 'description2', 'description_purchase', 'description_sale', 'gmdn_code', 'gmdn_description', 'heat_sensitive_item/id', 'international_status/id', 'justification_code_id/id', 'library', 'life_time', 'list_ids/id','med_device_class', 'name', 'name_template', 'controlled_substance', 'nomen_manda_0/id', 'nomen_manda_1/id', 'nomen_manda_2/id', 'nomen_manda_3/id', 'options_ids/id', 'perishable', 'procure_delay', 'procure_method', 'produce_delay', 'product_catalog_page', 'product_catalog_path', 'property_account_expense/id', 'property_account_income/id', 'property_stock_account_input/id', 'property_stock_account_output/id', 'restricted_country', 'short_shelf_life', 'single_use', 'sterilized', 'standard_price', 'sublist', 'subtype', 'asset_type_id',  'supply_method', 'type', 'un_code', 'uom_id/id', 'uom_po_id/id','use_time', 'valuation', 'weight', 'weight_net', 'active', 'state', 'old_code', 'new_code', 'function_value', 'form_value', 'fit_value', 'standard_ok','transport_ok','volume', 'soq_quantity', 'soq_weight','soq_volume']",MISSION,product.product,,Mission Product (Creator = local),Valid,,601
 msf_sync_data_server.standard_product_list,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('standard_list_ok','=','True')]","['creation_date', 'creator', 'description', 'last_update_date', 'name', 'order_list_print_ok', 'ref', 'standard_list_ok', 'type']",OC,product.list,,Standard Product List,Valid,,605
 msf_sync_data_server.standard_product_list_line,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('list_id' , 'in', ('product.list', 'id', [('standard_list_ok','=','True')]))]","['comment','list_id/id','ref','name/id']",OC,product.list.line,,Standard Product List Line,Valid,,606

=== modified file 'bin/addons/product_attributes/product_attributes.py'
--- bin/addons/product_attributes/product_attributes.py	2020-02-10 17:16:32 +0000
+++ bin/addons/product_attributes/product_attributes.py	2020-02-19 10:26:15 +0000
@@ -394,6 +394,16 @@
 
         return [('id', 'in', ids)]
 
+    def _get_int_status_code(self, cr, uid, ids, field_name, args, context=None):
+        if context is None:
+            context = {}
+        res = {}
+
+        for product in self.browse(cr, uid, ids, fields_to_fetch=['international_status'], context=context):
+            res[product.id] = product.international_status.code
+
+        return res
+
     def _get_restriction(self, cr, uid, ids, field_name, args, context=None):
         res = {}
 
@@ -654,8 +664,9 @@
             string='Old code',
             size=1024,
         ),
-        'new_code' : fields.char('New code', size=64),
+        'new_code': fields.char('New code', size=64),
         'international_status': fields.many2one('product.international.status', 'Product Creator', required=False),
+        'int_status_code': fields.function(_get_int_status_code, method=True, readonly=True, type="char", size=64, string="Code of Product Creator", store=False),
         'perishable': fields.boolean('Expiry Date Mandatory'),
         'batch_management': fields.boolean('Batch Number Mandatory'),
         'batch_attributes': fields.function(_get_batch_attributes, type='selection', selection=[('no', 'X'), ('bn', 'BN+ED'), ('ed', 'ED only')], method=True, fnct_search=_search_batch_attributes, string="Batch Attr."),
@@ -843,6 +854,7 @@
             readonly=True,
             help="Automatically filled with UniData information.",
         ),
+        'oc_subscription': fields.boolean(string='OC Subscription'),
         # TODO: validation on 'un_code' field
         'un_code': fields.char('UN Code', size=7),
         'gmdn_code' : fields.char('GMDN Code', size=5),
@@ -977,6 +989,7 @@
         'currency_id': lambda obj, cr, uid, c: obj.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id,
         'field_currency_id': lambda obj, cr, uid, c: obj.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id,
         'vat_ok': lambda obj, cr, uid, c: obj.pool.get('unifield.setup.configuration').get_config(cr, uid).vat_ok,
+        'oc_subscription': False,
     }
 
     def _check_uom_category(self, cr, uid, ids, context=None):
@@ -1305,6 +1318,11 @@
                 vals['heat_sensitive_item'] = heat2_id
             vals.update(self.onchange_heat(cr, uid, False, vals['heat_sensitive_item'], context=context).get('value', {}))
 
+        if vals.get('international_status') and 'oc_subscription' not in vals:
+            intstat_code = self.pool.get('product.international.status').browse(cr, uid, vals['international_status'],
+                                                                                fields_to_fetch=['code'], context=context).code
+            vals['oc_subscription'] = intstat_code == 'unidata'
+
         for f in ['sterilized', 'closed_article', 'single_use']:
             if f in vals and not vals.get(f):
                 vals[f] = 'no'

=== modified file 'bin/addons/product_attributes/product_attributes_view.xml'
--- bin/addons/product_attributes/product_attributes_view.xml	2019-10-31 15:54:47 +0000
+++ bin/addons/product_attributes/product_attributes_view.xml	2020-02-19 10:26:15 +0000
@@ -111,10 +111,12 @@
                             <group colspan="2" col="3" name="status">
                                 <separator string="Status" colspan="3"/>
                                 <field name="categ_id" readonly="1" colspan="3"/>
-                                <field name="international_status" required="1" widget="selection" colspan="3" />
+                                <field name="international_status" required="1" widget="selection" colspan="3"/>
+                                <field name="int_status_code" invisible="1" />
                                 <field name="standard_ok" colspan="3" />
                                 <field name="state" colspan="3" widget="selection" />
                                 <field name="state_ud" colspan="3" />
+                                <field name="oc_subscription" colspan="3" readonly="1" attrs="{'invisible': [('int_status_code', '!=', 'unidata')]}"/>
                                 <field name="active" readonly="1"/>
                                 <group colspan="1" col="1">
                                    <button name="deactivate_product" icon="gtk-execute" string="De-activate product" type="object" attrs="{'invisible': [('active', '=', False)]}" />