audrius/intrastat-extrastat
1
0
Fork 1
mirror of https://github.com/OCA/intrastat-extrastat.git synced 2025-02-16 17:13:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '14.0' of github.com:OCA/intrastat-extrastat into 14.0

Browse Source
This commit is contained in:
Luc De Meyer
2022-01-02 10:37:07 +01:00
parent 02bf0ef363 1d82d58963
commit 704666472b
11 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -20,10 +20,10 @@ Available addons
addon | version | maintainers | summary addon | version | maintainers | summary
--- | --- | --- | --- --- | --- | --- | ---
[intrastat_base](intrastat_base/) | 14.0.2.1.0 | | Base module for Intrastat reporting [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 [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](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.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_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 [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) [//]: # (end addons)

2
intrastat_product/__manifest__.py
View File

@@ -7,7 +7,7 @@
{ {
"name": "Intrastat Product", "name": "Intrastat Product",
"version": "14.0.1.5.1", "version": "14.0.1.5.2",
"category": "Intrastat", "category": "Intrastat",
"license": "AGPL-3", "license": "AGPL-3",
"summary": "Base module for Intrastat Product", "summary": "Base module for Intrastat Product",

1
intrastat_product/models/intrastat_product_declaration.py
View File

@@ -984,6 +984,7 @@ class IntrastatProductDeclaration(models.Model):
""" """
return [ return [
"hs_code", "hs_code",
"product_origin_country",
"src_dest_country", "src_dest_country",
"amount_company_currency", "amount_company_currency",
"transaction", "transaction",

2
product_harmonized_system/__manifest__.py
View File

@@ -9,7 +9,7 @@
{ {
"name": "Product Harmonized System Codes", "name": "Product Harmonized System Codes",
"version": "14.0.2.0.0", "version": "14.0.2.1.0",
"category": "Reporting", "category": "Reporting",
"license": "AGPL-3", "license": "AGPL-3",
"summary": "Base module for Product Import/Export reports", "summary": "Base module for Product Import/Export reports",

1
product_harmonized_system/i18n/es.po
View File

@@ -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_product__hs_code_id
#: model:ir.model.fields,field_description:product_harmonized_system.field_product_template__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.hs_code_view_form
#: model_terms:ir.ui.view,arch_db:product_harmonized_system.product_template_search_view
msgid "H.S. Code" msgid "H.S. Code"
msgstr "Código HS" msgstr "Código HS"

1
product_harmonized_system/i18n/fr.po
View File

@@ -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_product__hs_code_id
#: model:ir.model.fields,field_description:product_harmonized_system.field_product_template__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.hs_code_view_form
#: model_terms:ir.ui.view,arch_db:product_harmonized_system.product_template_search_view
msgid "H.S. Code" msgid "H.S. Code"
msgstr "Code S.H." msgstr "Code S.H."

1
product_harmonized_system/i18n/product_harmonized_system.pot
View File

@@ -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_product__hs_code_id
#: model:ir.model.fields,field_description:product_harmonized_system.field_product_template__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.hs_code_view_form
#: model_terms:ir.ui.view,arch_db:product_harmonized_system.product_template_search_view
msgid "H.S. Code" msgid "H.S. Code"
msgstr "" msgstr ""

2
product_harmonized_system/models/hs_code.py
View File

@@ -53,7 +53,7 @@ class HSCode(models.Model):
@api.model @api.model
def _default_company_id(self): def _default_company_id(self):
return self.env.company return False
@api.depends("local_code") @api.depends("local_code")
def _compute_hs_code(self): def _compute_hs_code(self):

13
product_harmonized_system/views/product_template.xml
View File

@@ -23,4 +23,17 @@
</field> </field>
</field> </field>
</record> </record>
<record id="product_template_search_view" model="ir.ui.view">
<field name="model">product.template</field>
<field name="inherit_id" ref="product.product_template_search_view" />
<field name="arch" type="xml">
<filter name="categ_id" position="after">
<filter
string="H.S. Code"
name="hs_code_groupby"
context="{'group_by': 'hs_code_id'}"
/>
</filter>
</field>
</record>
</odoo> </odoo>

2
product_harmonized_system_delivery/__manifest__.py
View File

@@ -4,7 +4,7 @@
{ {
"name": "Product Harmonized System Codes - Delivery", "name": "Product Harmonized System Codes - Delivery",
"version": "14.0.1.1.0", "version": "14.0.1.2.0",
"category": "Reporting", "category": "Reporting",
"license": "AGPL-3", "license": "AGPL-3",
"summary": "Hide native hs_code field provided by the delivery module", "summary": "Hide native hs_code field provided by the delivery module",

3
product_harmonized_system_delivery/models/product.py
View File

@@ -7,5 +7,4 @@ from odoo import fields, models
class ProductTemplate(models.Model): class ProductTemplate(models.Model):
_inherit = "product.template" _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", store=True)
hs_code = fields.Char(related="hs_code_id.hs_code", readonly=True, store=False)