diff --git a/README.md b/README.md index 5aabc10..4a438a3 100644 --- a/README.md +++ b/README.md @@ -20,10 +20,10 @@ Available addons addon | version | maintainers | summary --- | --- | --- | --- [intrastat_base](intrastat_base/) | 14.0.2.1.0 | | Base module for Intrastat reporting -[intrastat_product](intrastat_product/) | 14.0.1.5.1 | | Base module for Intrastat Product +[intrastat_product](intrastat_product/) | 14.0.1.5.2 | | Base module for Intrastat Product [intrastat_product_generic](intrastat_product_generic/) | 14.0.1.0.0 | | Generic Intrastat Product Declaration -[product_harmonized_system](product_harmonized_system/) | 14.0.2.0.0 | [![alexis-via](https://github.com/alexis-via.png?size=30px)](https://github.com/alexis-via) [![luc-demeyer](https://github.com/luc-demeyer.png?size=30px)](https://github.com/luc-demeyer) | Base module for Product Import/Export reports -[product_harmonized_system_delivery](product_harmonized_system_delivery/) | 14.0.1.1.0 | [![alexis-via](https://github.com/alexis-via.png?size=30px)](https://github.com/alexis-via) [![luc-demeyer](https://github.com/luc-demeyer.png?size=30px)](https://github.com/luc-demeyer) | Hide native hs_code field provided by the delivery module +[product_harmonized_system](product_harmonized_system/) | 14.0.2.1.0 | [![alexis-via](https://github.com/alexis-via.png?size=30px)](https://github.com/alexis-via) [![luc-demeyer](https://github.com/luc-demeyer.png?size=30px)](https://github.com/luc-demeyer) | Base module for Product Import/Export reports +[product_harmonized_system_delivery](product_harmonized_system_delivery/) | 14.0.1.2.0 | [![alexis-via](https://github.com/alexis-via.png?size=30px)](https://github.com/alexis-via) [![luc-demeyer](https://github.com/luc-demeyer.png?size=30px)](https://github.com/luc-demeyer) | Hide native hs_code field provided by the delivery module [product_harmonized_system_stock](product_harmonized_system_stock/) | 14.0.1.0.0 | [![alexis-via](https://github.com/alexis-via.png?size=30px)](https://github.com/alexis-via) [![luc-demeyer](https://github.com/luc-demeyer.png?size=30px)](https://github.com/luc-demeyer) | Adds a menu entry for H.S. codes [//]: # (end addons) diff --git a/intrastat_product/__manifest__.py b/intrastat_product/__manifest__.py index 70ff04f..6a3e931 100644 --- a/intrastat_product/__manifest__.py +++ b/intrastat_product/__manifest__.py @@ -7,7 +7,7 @@ { "name": "Intrastat Product", - "version": "14.0.1.5.1", + "version": "14.0.1.5.2", "category": "Intrastat", "license": "AGPL-3", "summary": "Base module for Intrastat Product", diff --git a/intrastat_product/models/intrastat_product_declaration.py b/intrastat_product/models/intrastat_product_declaration.py index d490f5d..772f7e9 100644 --- a/intrastat_product/models/intrastat_product_declaration.py +++ b/intrastat_product/models/intrastat_product_declaration.py @@ -984,6 +984,7 @@ class IntrastatProductDeclaration(models.Model): """ return [ "hs_code", + "product_origin_country", "src_dest_country", "amount_company_currency", "transaction", diff --git a/product_harmonized_system/__manifest__.py b/product_harmonized_system/__manifest__.py index 4664922..5730795 100644 --- a/product_harmonized_system/__manifest__.py +++ b/product_harmonized_system/__manifest__.py @@ -9,7 +9,7 @@ { "name": "Product Harmonized System Codes", - "version": "14.0.2.0.0", + "version": "14.0.2.1.0", "category": "Reporting", "license": "AGPL-3", "summary": "Base module for Product Import/Export reports", diff --git a/product_harmonized_system/i18n/es.po b/product_harmonized_system/i18n/es.po index 009cd36..14f926c 100644 --- a/product_harmonized_system/i18n/es.po +++ b/product_harmonized_system/i18n/es.po @@ -99,6 +99,7 @@ msgstr "Nombre mostrado" #: model:ir.model.fields,field_description:product_harmonized_system.field_product_product__hs_code_id #: model:ir.model.fields,field_description:product_harmonized_system.field_product_template__hs_code_id #: model_terms:ir.ui.view,arch_db:product_harmonized_system.hs_code_view_form +#: model_terms:ir.ui.view,arch_db:product_harmonized_system.product_template_search_view msgid "H.S. Code" msgstr "Código HS" diff --git a/product_harmonized_system/i18n/fr.po b/product_harmonized_system/i18n/fr.po index 0c359f4..8802d3d 100644 --- a/product_harmonized_system/i18n/fr.po +++ b/product_harmonized_system/i18n/fr.po @@ -100,6 +100,7 @@ msgstr "Nom affiché" #: model:ir.model.fields,field_description:product_harmonized_system.field_product_product__hs_code_id #: model:ir.model.fields,field_description:product_harmonized_system.field_product_template__hs_code_id #: model_terms:ir.ui.view,arch_db:product_harmonized_system.hs_code_view_form +#: model_terms:ir.ui.view,arch_db:product_harmonized_system.product_template_search_view msgid "H.S. Code" msgstr "Code S.H." diff --git a/product_harmonized_system/i18n/product_harmonized_system.pot b/product_harmonized_system/i18n/product_harmonized_system.pot index 1ff4fa3..700b400 100644 --- a/product_harmonized_system/i18n/product_harmonized_system.pot +++ b/product_harmonized_system/i18n/product_harmonized_system.pot @@ -93,6 +93,7 @@ msgstr "" #: model:ir.model.fields,field_description:product_harmonized_system.field_product_product__hs_code_id #: model:ir.model.fields,field_description:product_harmonized_system.field_product_template__hs_code_id #: model_terms:ir.ui.view,arch_db:product_harmonized_system.hs_code_view_form +#: model_terms:ir.ui.view,arch_db:product_harmonized_system.product_template_search_view msgid "H.S. Code" msgstr "" diff --git a/product_harmonized_system/models/hs_code.py b/product_harmonized_system/models/hs_code.py index 245cb3d..da8cf11 100644 --- a/product_harmonized_system/models/hs_code.py +++ b/product_harmonized_system/models/hs_code.py @@ -53,7 +53,7 @@ class HSCode(models.Model): @api.model def _default_company_id(self): - return self.env.company + return False @api.depends("local_code") def _compute_hs_code(self): diff --git a/product_harmonized_system/views/product_template.xml b/product_harmonized_system/views/product_template.xml index 8cdfd2e..59fa83e 100644 --- a/product_harmonized_system/views/product_template.xml +++ b/product_harmonized_system/views/product_template.xml @@ -23,4 +23,17 @@ + + product.template + + + + + + + diff --git a/product_harmonized_system_delivery/__manifest__.py b/product_harmonized_system_delivery/__manifest__.py index 5415e85..3e76304 100644 --- a/product_harmonized_system_delivery/__manifest__.py +++ b/product_harmonized_system_delivery/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Product Harmonized System Codes - Delivery", - "version": "14.0.1.1.0", + "version": "14.0.1.2.0", "category": "Reporting", "license": "AGPL-3", "summary": "Hide native hs_code field provided by the delivery module", diff --git a/product_harmonized_system_delivery/models/product.py b/product_harmonized_system_delivery/models/product.py index 5b65cf2..eab6887 100644 --- a/product_harmonized_system_delivery/models/product.py +++ b/product_harmonized_system_delivery/models/product.py @@ -7,5 +7,4 @@ from odoo import fields, models class ProductTemplate(models.Model): _inherit = "product.template" - # this field cannot be stored because hs_code_id is company dependent - hs_code = fields.Char(related="hs_code_id.hs_code", readonly=True, store=False) + hs_code = fields.Char(related="hs_code_id.hs_code", store=True)