From 27de45081c0b565c5c09a17995d23d295ba4ad2a Mon Sep 17 00:00:00 2001 From: ilo Date: Mon, 20 Jan 2025 12:37:22 -0300 Subject: [PATCH] [18.0][MIG] base_delivery_carrier_label: Migration to 18.0 --- base_delivery_carrier_label/README.rst | 1 + .../models/stock_quant_package.py | 4 ++-- base_delivery_carrier_label/readme/CONTRIBUTORS.md | 1 + .../static/description/index.html | 1 + base_delivery_carrier_label/views/delivery.xml | 10 +++++----- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/base_delivery_carrier_label/README.rst b/base_delivery_carrier_label/README.rst index 6e57ad73b9..9ac16767fb 100644 --- a/base_delivery_carrier_label/README.rst +++ b/base_delivery_carrier_label/README.rst @@ -99,6 +99,7 @@ Contributors - Timothée Ringeard - Pimolnat Suntian - Maksym Yankin +- Italo Lopes - `Binhex `__: - David Luis Mora diff --git a/base_delivery_carrier_label/models/stock_quant_package.py b/base_delivery_carrier_label/models/stock_quant_package.py index 3e637e596d..534c6ce869 100644 --- a/base_delivery_carrier_label/models/stock_quant_package.py +++ b/base_delivery_carrier_label/models/stock_quant_package.py @@ -42,9 +42,9 @@ def _complete_name(self, name, args): res = super()._complete_name(name, args) for pack in self: if pack.parcel_tracking: - res[pack.id] += " [%s]" % pack.parcel_tracking + res[pack.id] += f" [{pack.parcel_tracking}]" if pack.weight: - res[pack.id] += " %s kg" % pack.weight + res[pack.id] += f" {str(pack.weight)} kg" return res def open_website_url(self): diff --git a/base_delivery_carrier_label/readme/CONTRIBUTORS.md b/base_delivery_carrier_label/readme/CONTRIBUTORS.md index abe0c05392..4a4fd64902 100644 --- a/base_delivery_carrier_label/readme/CONTRIBUTORS.md +++ b/base_delivery_carrier_label/readme/CONTRIBUTORS.md @@ -8,5 +8,6 @@ - Timothée Ringeard \<\> - Pimolnat Suntian \<\> - Maksym Yankin \<\> +- Italo Lopes \<\> - [Binhex](https://binhex.cloud//com): - David Luis Mora \<\> diff --git a/base_delivery_carrier_label/static/description/index.html b/base_delivery_carrier_label/static/description/index.html index 1766bf9daf..d17570c7df 100644 --- a/base_delivery_carrier_label/static/description/index.html +++ b/base_delivery_carrier_label/static/description/index.html @@ -440,6 +440,7 @@

Contributors

  • Timothée Ringeard <timothee.ringeard@camptocamp.com>
  • Pimolnat Suntian <pimolnats@ecosoft.co.th>
  • Maksym Yankin <maksym.yankin@camptocamp.com>
    • +
  • Italo Lopes <italo.lopes@camptocamp.com>
  • Binhex: diff --git a/base_delivery_carrier_label/views/delivery.xml b/base_delivery_carrier_label/views/delivery.xml index 77c5f58ec9..88761a3a7a 100644 --- a/base_delivery_carrier_label/views/delivery.xml +++ b/base_delivery_carrier_label/views/delivery.xml @@ -25,11 +25,11 @@ >delivery_base.delivery_carrier_template_option.view_tree delivery.carrier.template.option - + - + @@ -57,14 +57,14 @@ delivery_base.delivery_carrier_option.view_tree delivery.carrier.option - tree + list - + - +