From 92bbb40b48a0d29123ff6d39446540fc4067da04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Duy=20=28=C4=90=E1=BB=97=20Anh=29?= Date: Tue, 8 Oct 2024 16:31:03 +0700 Subject: [PATCH] [MIG] l10n_ch_adr_report: Migration to 18.0 --- l10n_ch_adr_report/README.rst | 3 + l10n_ch_adr_report/__manifest__.py | 8 +- l10n_ch_adr_report/i18n/de.po | 2 +- l10n_ch_adr_report/i18n/fr.pot | 2 +- .../i18n/l10n_ch_adr_report.pot | 2 +- l10n_ch_adr_report/models/product_product.py | 25 +++-- l10n_ch_adr_report/readme/CONTRIBUTORS.md | 5 +- l10n_ch_adr_report/readme/CREDITS.md | 2 + .../report/DG_ch_delivery_report.xml | 92 +++++++++---------- .../report/dangerous_delivery_report.py | 18 +--- .../static/description/index.html | 5 +- .../static/src/scss/adr_report.scss | 11 +-- l10n_ch_adr_report/views/assets.xml | 16 ---- 13 files changed, 85 insertions(+), 106 deletions(-) delete mode 100644 l10n_ch_adr_report/views/assets.xml diff --git a/l10n_ch_adr_report/README.rst b/l10n_ch_adr_report/README.rst index c7eb6559d..ede54bbec 100644 --- a/l10n_ch_adr_report/README.rst +++ b/l10n_ch_adr_report/README.rst @@ -70,11 +70,14 @@ Contributors - `Trobz `__: - Son Ho + - Do Anh Duy Other credits ------------- The development of this module was financially supported by Camptocamp +The migration of this module from 14.0 to 18.0 was financially supported +by Camptocamp Maintainers ----------- diff --git a/l10n_ch_adr_report/__manifest__.py b/l10n_ch_adr_report/__manifest__.py index d7190741c..921a247ed 100644 --- a/l10n_ch_adr_report/__manifest__.py +++ b/l10n_ch_adr_report/__manifest__.py @@ -3,7 +3,7 @@ { "name": "ADR Products Swiss Report", "summary": "Print Delivery report to ADR swiss configuration", - "version": "14.0.1.0.0", + "version": "18.0.1.0.0", "category": "Product", "website": "https://github.com/OCA/l10n-switzerland", "author": "Camptocamp, Odoo Community Association (OCA)", @@ -13,6 +13,10 @@ "depends": ["l10n_eu_product_adr_dangerous_goods", "stock", "delivery"], "data": [ "report/DG_ch_delivery_report.xml", - "views/assets.xml", ], + "assets": { + "web.report_assets_common": [ + "/l10n_ch_adr_report/static/src/scss/adr_report.scss", + ], + }, } diff --git a/l10n_ch_adr_report/i18n/de.po b/l10n_ch_adr_report/i18n/de.po index 1bd6d0eb3..cde103344 100644 --- a/l10n_ch_adr_report/i18n/de.po +++ b/l10n_ch_adr_report/i18n/de.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 14.0+e\n" +"Project-Id-Version: Odoo Server 18.0+e\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-08-06 10:55+0000\n" "PO-Revision-Date: 2020-08-06 10:55+0000\n" diff --git a/l10n_ch_adr_report/i18n/fr.pot b/l10n_ch_adr_report/i18n/fr.pot index 5a18f8af5..a81f5c6b2 100644 --- a/l10n_ch_adr_report/i18n/fr.pot +++ b/l10n_ch_adr_report/i18n/fr.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 14.0+e\n" +"Project-Id-Version: Odoo Server 18.0+e\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-23 11:10+0000\n" "PO-Revision-Date: 2021-03-23 11:10+0000\n" diff --git a/l10n_ch_adr_report/i18n/l10n_ch_adr_report.pot b/l10n_ch_adr_report/i18n/l10n_ch_adr_report.pot index b3086c690..92332a3e8 100644 --- a/l10n_ch_adr_report/i18n/l10n_ch_adr_report.pot +++ b/l10n_ch_adr_report/i18n/l10n_ch_adr_report.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 14.0\n" +"Project-Id-Version: Odoo Server 18.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" diff --git a/l10n_ch_adr_report/models/product_product.py b/l10n_ch_adr_report/models/product_product.py index 8db5d73e6..42c9aacbe 100644 --- a/l10n_ch_adr_report/models/product_product.py +++ b/l10n_ch_adr_report/models/product_product.py @@ -15,32 +15,31 @@ class ProductProduct(models.Model): def _compute_adr_report_class_display_name(self): for record in self: adr_good = record.adr_goods_id - res = _("UN") - res += f" {adr_good.un_number}, {adr_good.name}" + res = _(f"UN {adr_good.un_number}, {adr_good.name}") if record.nag: - res += _(" {}").format(record.nag) + res += _(f" {record.nag}") if record.label_first: - res += ", {}".format(record._get_name_from_selection("label_first")) + res += f", {record._get_name_from_selection('label_first')}" if record.label_second and record.label_third: - res += ", ({}, {})".format( - record._get_name_from_selection("label_second"), - record._get_name_from_selection("label_third"), - ) + string_label_second = record._get_name_from_selection("label_second") + string_label_third = record._get_name_from_selection("label_third") + res += f", ({string_label_second}, {string_label_third})" elif record.label_second: - res += ", ({})".format(record._get_name_from_selection("label_second")) + res += f", ({record._get_name_from_selection('label_second')})" if record.packaging_group: - res += ", {}".format(record._get_name_from_selection("packaging_group")) + res += f", {record._get_name_from_selection('packaging_group')}" if adr_good.tunnel_restriction_code: - res += ", ({})".format( - record._get_name_from_selection("adr_tunnel_restriction_code") + string_tunnel_restriction_code = record._get_name_from_selection( + "adr_tunnel_restriction_code" ) + res += f", ({string_tunnel_restriction_code})" if record.envir_hazardous == "yes": - res += ", {}".format(_("Environmentally hazardous")) + res += _("Environmentally hazardous") record.adr_report_class_display_name = res diff --git a/l10n_ch_adr_report/readme/CONTRIBUTORS.md b/l10n_ch_adr_report/readme/CONTRIBUTORS.md index b8ef1c54d..146fa6ad1 100644 --- a/l10n_ch_adr_report/readme/CONTRIBUTORS.md +++ b/l10n_ch_adr_report/readme/CONTRIBUTORS.md @@ -1,4 +1,4 @@ -- [Camptocamp](https://www.camptocamp.com): +- [Camptocamp](https://www.camptocamp.com): - Iryna Vyshnevska \<\> - Carlos Serra-Toro \<\> - Iryna Vyshnevska \<\> @@ -6,5 +6,6 @@ - Sébastien Alix \<\> - Thierry Ducrest \<\> -- [Trobz](https://trobz.com): +- [Trobz](https://trobz.com): - Son Ho \<\> + - Do Anh Duy \<\> diff --git a/l10n_ch_adr_report/readme/CREDITS.md b/l10n_ch_adr_report/readme/CREDITS.md index 876f0f6ff..b3b2c61ac 100644 --- a/l10n_ch_adr_report/readme/CREDITS.md +++ b/l10n_ch_adr_report/readme/CREDITS.md @@ -1 +1,3 @@ The development of this module was financially supported by Camptocamp +The migration of this module from 14.0 to 18.0 was financially supported +by Camptocamp diff --git a/l10n_ch_adr_report/report/DG_ch_delivery_report.xml b/l10n_ch_adr_report/report/DG_ch_delivery_report.xml index db0f5501b..cf1158b91 100644 --- a/l10n_ch_adr_report/report/DG_ch_delivery_report.xml +++ b/l10n_ch_adr_report/report/DG_ch_delivery_report.xml @@ -12,7 +12,10 @@ - + @@ -20,19 +23,19 @@ - + + @@ -89,8 +92,8 @@ - - + + @@ -100,40 +103,40 @@ - + @@ -148,45 +151,45 @@ /> - - - - - + + + + + - - - - - - + + + + + + - + - - - - - + + + + + - + @@ -195,26 +198,23 @@
Transportation paperTransportation paper
Date -

+

- -

+ +

Delivery note no.

Sender addressSender address - Recipient addressRecipient address
Transport category (BK)
Transport category (BK) 0 1 2
- + - + - + - + - +
Total of transported units
FactorFactor
Points per transportation category
Total Points - + - +