From bbb21f3e2c1172f057a31fd89894b12671372b2d 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 | 15 ++++++++-------
.../__manifest__.py | 4 ++--
.../readme/DESCRIPTION.md | 8 ++++----
.../static/description/index.html | 16 ++++++++--------
.../views/product_template.xml | 2 +-
5 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/product_harmonized_system_delivery/README.rst b/product_harmonized_system_delivery/README.rst
index d46f79e46..af4b5e645 100644
--- a/product_harmonized_system_delivery/README.rst
+++ b/product_harmonized_system_delivery/README.rst
@@ -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 1ad38b5ba..23841ccfc 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/readme/DESCRIPTION.md b/product_harmonized_system_delivery/readme/DESCRIPTION.md
index 56f170bc8..6f536d970 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 f98e6c35e..f77eed2c2 100644
--- a/product_harmonized_system_delivery/static/description/index.html
+++ b/product_harmonized_system_delivery/static/description/index.html
@@ -1,4 +1,3 @@
-
@@ -372,15 +371,16 @@ 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.
-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
diff --git a/product_harmonized_system_delivery/views/product_template.xml b/product_harmonized_system_delivery/views/product_template.xml
index 75cba2a02..f06849bca 100644
--- a/product_harmonized_system_delivery/views/product_template.xml
+++ b/product_harmonized_system_delivery/views/product_template.xml
@@ -9,7 +9,7 @@
hide_native_hs_code_field.product.template.form
product.template
-
+
1