From 03e7bf5dc8acec17ad603923c651a952db9c60a2 Mon Sep 17 00:00:00 2001 From: Andreu Orensanz Date: Fri, 15 Mar 2024 12:31:06 +0100 Subject: [PATCH] [MIG] product_harmonized_system_delivery: Migration to 17.0 --- product_harmonized_system_delivery/README.rst | 17 +++++++++-------- .../__manifest__.py | 4 ++-- product_harmonized_system_delivery/i18n/it.po | 6 ++++-- .../product_harmonized_system_delivery.pot | 2 +- .../models/product_template.py | 1 + .../readme/DESCRIPTION.md | 8 ++++---- .../static/description/index.html | 18 +++++++++--------- .../views/product_template.xml | 2 +- 8 files changed, 31 insertions(+), 27 deletions(-) diff --git a/product_harmonized_system_delivery/README.rst b/product_harmonized_system_delivery/README.rst index d46f79e..a348fc8 100644 --- a/product_harmonized_system_delivery/README.rst +++ b/product_harmonized_system_delivery/README.rst @@ -7,7 +7,7 @@ Product Harmonized System Codes - Delivery !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:f732fa747f85d891f007e5fb0af1290c25ceeeaca0c6e7cc6a3140c8c3ae9127 + !! source digest: sha256:b3a1334583e53e183ece0d674687456f1794c5afe45888a64e912a44564b504d !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png @@ -30,16 +30,17 @@ Product Harmonized System Codes - Delivery The OCA module *product_harmonized_system* adds a many2one field *hs_code_id* on product templates that points to an *H.S. Code* object. -But the *delivery* module from the official addons adds a char field -*hs_code* on product templates, which has the same purpose, but we can't -use it because we need structured data for H.S. codes. This module hides -the *hs_code* field added by the *delivery* module, to avoid confusion. +But the *stock_delivery* module from the official addons adds a char +field *hs_code* on product templates, which has the same purpose, but we +can't use it because we need structured data for H.S. codes. This module +hides the *hs_code* field added by the *stock_delivery* module, to avoid +confusion. -Since Odoo v16, the *delivery* module also adds a many2one field +Since Odoo v16, the *stock_delivery* module also adds a many2one field *country_of_origin*, which is similar to the many2one field *origin_country_id* of the OCA module *product_harmonized_system*. This -module also hides the *country_of_origin* field added by the *delivery* -module. +module also hides the *country_of_origin* field added by the +*stock_delivery* module. **Table of contents** diff --git a/product_harmonized_system_delivery/__manifest__.py b/product_harmonized_system_delivery/__manifest__.py index 1ad38b5..23841cc 100644 --- a/product_harmonized_system_delivery/__manifest__.py +++ b/product_harmonized_system_delivery/__manifest__.py @@ -4,14 +4,14 @@ { "name": "Product Harmonized System Codes - Delivery", - "version": "16.0.1.0.0", + "version": "17.0.1.0.0", "category": "Reporting", "license": "AGPL-3", "summary": "Hide native hs_code field provided by the delivery module", "author": "Akretion, Odoo Community Association (OCA)", "maintainers": ["alexis-via", "luc-demeyer"], "website": "https://github.com/OCA/intrastat-extrastat", - "depends": ["delivery", "product_harmonized_system"], + "depends": ["stock_delivery", "product_harmonized_system"], "data": ["views/product_template.xml"], "installable": True, "auto_install": True, diff --git a/product_harmonized_system_delivery/i18n/it.po b/product_harmonized_system_delivery/i18n/it.po index 5b3d1b8..90cda26 100644 --- a/product_harmonized_system_delivery/i18n/it.po +++ b/product_harmonized_system_delivery/i18n/it.po @@ -37,8 +37,10 @@ msgstr "Prodotto" #: model:ir.model.fields,help:product_harmonized_system_delivery.field_product_product__country_of_origin #: model:ir.model.fields,help:product_harmonized_system_delivery.field_product_template__country_of_origin msgid "" -"Rules of origin determine where goods originate, i.e. not where they have been shipped from, but where they have been produced or manufactured.\n" -"As such, the ‘origin’ is the 'economic nationality' of goods traded in commerce." +"Rules of origin determine where goods originate, i.e. not where they have " +"been shipped from, but where they have been produced or manufactured.\n" +"As such, the ‘origin’ is the 'economic nationality' of goods traded in " +"commerce." msgstr "" "Le regole dell'origine definiscono da dove si origina la merce, i.e. non da " "dove è stata spedita ma dove è stata prodotta o lavorata.\n" diff --git a/product_harmonized_system_delivery/i18n/product_harmonized_system_delivery.pot b/product_harmonized_system_delivery/i18n/product_harmonized_system_delivery.pot index 75f7adf..47780b3 100644 --- a/product_harmonized_system_delivery/i18n/product_harmonized_system_delivery.pot +++ b/product_harmonized_system_delivery/i18n/product_harmonized_system_delivery.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 16.0\n" +"Project-Id-Version: Odoo Server 17.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" diff --git a/product_harmonized_system_delivery/models/product_template.py b/product_harmonized_system_delivery/models/product_template.py index 54542fd..63a9320 100644 --- a/product_harmonized_system_delivery/models/product_template.py +++ b/product_harmonized_system_delivery/models/product_template.py @@ -7,5 +7,6 @@ from odoo import fields, models class ProductTemplate(models.Model): _inherit = "product.template" + # IMPORTANT: Overwrites two Odoo standard fields hs_code = fields.Char(related="hs_code_id.hs_code", store=True) country_of_origin = fields.Many2one(related="origin_country_id", store=True) diff --git a/product_harmonized_system_delivery/readme/DESCRIPTION.md b/product_harmonized_system_delivery/readme/DESCRIPTION.md index 56f170b..6f536d9 100644 --- a/product_harmonized_system_delivery/readme/DESCRIPTION.md +++ b/product_harmonized_system_delivery/readme/DESCRIPTION.md @@ -1,12 +1,12 @@ The OCA module *product_harmonized_system* adds a many2one field *hs_code_id* on product templates that points to an *H.S. Code* object. -But the *delivery* module from the official addons adds a char field +But the *stock_delivery* module from the official addons adds a char field *hs_code* on product templates, which has the same purpose, but we can't use it because we need structured data for H.S. codes. This module hides -the *hs_code* field added by the *delivery* module, to avoid confusion. +the *hs_code* field added by the *stock_delivery* module, to avoid confusion. -Since Odoo v16, the *delivery* module also adds a many2one field +Since Odoo v16, the *stock_delivery* module also adds a many2one field *country_of_origin*, which is similar to the many2one field *origin_country_id* of the OCA module *product_harmonized_system*. This -module also hides the *country_of_origin* field added by the *delivery* +module also hides the *country_of_origin* field added by the *stock_delivery* module. diff --git a/product_harmonized_system_delivery/static/description/index.html b/product_harmonized_system_delivery/static/description/index.html index f98e6c3..51b08b9 100644 --- a/product_harmonized_system_delivery/static/description/index.html +++ b/product_harmonized_system_delivery/static/description/index.html @@ -1,4 +1,3 @@ - @@ -367,20 +366,21 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:f732fa747f85d891f007e5fb0af1290c25ceeeaca0c6e7cc6a3140c8c3ae9127 +!! source digest: sha256:b3a1334583e53e183ece0d674687456f1794c5afe45888a64e912a44564b504d !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

Beta License: AGPL-3 OCA/intrastat-extrastat Translate me on Weblate Try me on Runboat

The OCA module product_harmonized_system adds a many2one field hs_code_id on product templates that points to an H.S. Code object. -But the delivery module from the official addons adds a char field -hs_code on product templates, which has the same purpose, but we can’t -use it because we need structured data for H.S. codes. This module hides -the hs_code field added by the delivery module, to avoid confusion.

-

Since Odoo v16, the delivery module also adds a many2one field +But the stock_delivery module from the official addons adds a char +field hs_code on product templates, which has the same purpose, but we +can’t use it because we need structured data for H.S. codes. This module +hides the hs_code field added by the stock_delivery module, to avoid +confusion.

+

Since Odoo v16, the stock_delivery module also adds a many2one field country_of_origin, which is similar to the many2one field origin_country_id of the OCA module product_harmonized_system. This -module also hides the country_of_origin field added by the delivery -module.

+module also hides the country_of_origin field added by the +stock_delivery module.

Table of contents