Merge PR #3225 into 15.0

Signed-off-by pedrobaeza
OCA · Sep 19, 2023 · ed0d12d · ed0d12d
2 parents ab9cf3c + 83bd9c4
commit ed0d12d
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 46 deletions.
diff --git a/delivery_gls_asm/i18n/ca.po b/delivery_gls_asm/i18n/ca.po
@@ -525,9 +525,9 @@ msgstr ""
 #: code:addons/delivery_gls_asm/models/gls_asm_request.py:0
 #, python-format
 msgid ""
-"GLS returned an error trying to record the shipping for %(ref).\n"
+"GLS returned an error trying to record the shipping for %(ref)s.\n"
 "Error:\n"
-"%(error)"
+"%(error)s"
 msgstr ""
 
 #. module: delivery_gls_asm
@@ -550,18 +550,18 @@ msgstr ""
 #: code:addons/delivery_gls_asm/models/gls_asm_request.py:0
 #, python-format
 msgid ""
-"GLS: No response from server getting state from ref %(ref).\n"
+"GLS: No response from server getting state from ref %(ref)s.\n"
 "Traceback:\n"
-"%(error)"
+"%(error)s"
 msgstr ""
 
 #. module: delivery_gls_asm
 #: code:addons/delivery_gls_asm/models/gls_asm_request.py:0
 #, python-format
 msgid ""
-"GLS: No response from server printing label with ref %(ref).\n"
+"GLS: No response from server printing label with ref %(ref)s.\n"
 "Traceback:\n"
-"%(error)"
+"%(error)s"
 msgstr ""
 
 #. module: delivery_gls_asm
@@ -683,9 +683,9 @@ msgstr ""
 #: code:addons/delivery_gls_asm/models/gls_asm_request.py:0
 #, python-format
 msgid ""
-"No response from server recording GLS delivery %(ref).\n"
+"No response from server recording GLS delivery %(ref)s.\n"
 "Traceback:\n"
-"%(error)"
+"%(error)s"
 msgstr ""
 
 #. module: delivery_gls_asm

diff --git a/delivery_gls_asm/i18n/delivery_gls_asm.pot b/delivery_gls_asm/i18n/delivery_gls_asm.pot
@@ -522,9 +522,9 @@ msgstr ""
 #: code:addons/delivery_gls_asm/models/gls_asm_request.py:0
 #, python-format
 msgid ""
-"GLS returned an error trying to record the shipping for %(ref).\n"
+"GLS returned an error trying to record the shipping for %(ref)s.\n"
 "Error:\n"
-"%(error)"
+"%(error)s"
 msgstr ""
 
 #. module: delivery_gls_asm
@@ -547,18 +547,18 @@ msgstr ""
 #: code:addons/delivery_gls_asm/models/gls_asm_request.py:0
 #, python-format
 msgid ""
-"GLS: No response from server getting state from ref %(ref).\n"
+"GLS: No response from server getting state from ref %(ref)s.\n"
 "Traceback:\n"
-"%(error)"
+"%(error)s"
 msgstr ""
 
 #. module: delivery_gls_asm
 #: code:addons/delivery_gls_asm/models/gls_asm_request.py:0
 #, python-format
 msgid ""
-"GLS: No response from server printing label with ref %(ref).\n"
+"GLS: No response from server printing label with ref %(ref)s.\n"
 "Traceback:\n"
-"%(error)"
+"%(error)s"
 msgstr ""
 
 #. module: delivery_gls_asm
@@ -682,9 +682,9 @@ msgstr ""
 #: code:addons/delivery_gls_asm/models/gls_asm_request.py:0
 #, python-format
 msgid ""
-"No response from server recording GLS delivery %(ref).\n"
+"No response from server recording GLS delivery %(ref)s.\n"
 "Traceback:\n"
-"%(error)"
+"%(error)s"
 msgstr ""
 
 #. module: delivery_gls_asm

diff --git a/delivery_gls_asm/i18n/es.po b/delivery_gls_asm/i18n/es.po
@@ -539,13 +539,13 @@ msgstr "Etiqueta GLS para% s"
 #: code:addons/delivery_gls_asm/models/gls_asm_request.py:0
 #, python-format
 msgid ""
-"GLS returned an error trying to record the shipping for %(ref).\n"
+"GLS returned an error trying to record the shipping for %(ref)s.\n"
 "Error:\n"
-"%(error)"
+"%(error)s"
 msgstr ""
-"GLS ha devuelto un error tratando de registrar la expedición para %(ref).\n"
+"GLS ha devuelto un error tratando de registrar la expedición para %(ref)s.\n"
 "Error:\n"
-"%(error)"
+"%(error)s"
 
 #. module: delivery_gls_asm
 #: code:addons/delivery_gls_asm/models/delivery_carrier.py:0
@@ -572,27 +572,27 @@ msgstr "Con recogida GLS/ASM"
 #: code:addons/delivery_gls_asm/models/gls_asm_request.py:0
 #, python-format
 msgid ""
-"GLS: No response from server getting state from ref %(ref).\n"
+"GLS: No response from server getting state from ref %(ref)s.\n"
 "Traceback:\n"
-"%(error)"
+"%(error)s"
 msgstr ""
 "GLS: Si respuesta del servidor intentando recuperar el estado de la "
-"referencia %(ref).\n"
+"referencia %(ref)s.\n"
 "Traceback:\n"
-"%(error)"
+"%(error)s"
 
 #. module: delivery_gls_asm
 #: code:addons/delivery_gls_asm/models/gls_asm_request.py:0
 #, python-format
 msgid ""
-"GLS: No response from server printing label with ref %(ref).\n"
+"GLS: No response from server printing label with ref %(ref)s.\n"
 "Traceback:\n"
-"%(error)"
+"%(error)s"
 msgstr ""
 "GLS: Sin respuesta del servidor trantando de imprimir la etiqueta con "
-"referencia %(ref)..\n"
+"referencia %(ref)s..\n"
 "Traceback:\n"
-"%(error)"
+"%(error)s"
 
 #. module: delivery_gls_asm
 #: model_terms:ir.ui.view,arch_db:delivery_gls_asm.delivery_manifest_wizard_form
@@ -718,13 +718,13 @@ msgstr ""
 #: code:addons/delivery_gls_asm/models/gls_asm_request.py:0
 #, python-format
 msgid ""
-"No response from server recording GLS delivery %(ref).\n"
+"No response from server recording GLS delivery %(ref)s.\n"
 "Traceback:\n"
-"%(error)"
+"%(error)s"
 msgstr ""
-"No hay respuesta del servidor que registra la entrega de GLS %(ref).\n"
+"No hay respuesta del servidor que registra la entrega de GLS %(ref)s.\n"
 "Rastrear:\n"
-"%(error)"
+"%(error)s"
 
 #. module: delivery_gls_asm
 #: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_service__19
@@ -1057,8 +1057,8 @@ msgstr "dPRO"
 #~ msgid ""
 #~ "No response from server getting manifisto for GLS.\n"
 #~ "Traceback:\n"
-#~ "%(error)"
+#~ "%(error)s"
 #~ msgstr ""
 #~ "No hay respuesta del servidor obteniendo manifisto para GLS.\n"
 #~ "Rastrear:\n"
-#~ "%(error)"
+#~ "%(error)s"
diff --git a/delivery_gls_asm/models/gls_asm_request.py b/delivery_gls_asm/models/gls_asm_request.py
@@ -230,8 +230,8 @@ def _send_shipping(self, vals):
         except Exception as e:
             raise UserError(
                 _(
-                    "No response from server recording GLS delivery %(ref).\n"
-                    "Traceback:\n%(error)"
+                    "No response from server recording GLS delivery %(ref)s.\n"
+                    "Traceback:\n%(error)s"
                 )
                 % {"ref": vals.get("referencia_c", ""), "error": e}
             ) from e
@@ -245,8 +245,8 @@ def _send_shipping(self, vals):
         if res["_return"] < 0:
             raise UserError(
                 _(
-                    "GLS returned an error trying to record the shipping for %(ref).\n"
-                    "Error:\n%(error)"
+                    "GLS returned an error trying to record the shipping for %(ref)s.\n"
+                    "Error:\n%(error)s"
                 )
                 % {
                     "ref": vals.get("referencia_c", ""),
@@ -275,8 +275,8 @@ def _send_pickup(self, vals):
         except Exception as e:
             raise UserError(
                 _(
-                    "No response from server recording GLS delivery %(ref).\n"
-                    "Traceback:\n%(error)"
+                    "No response from server recording GLS delivery %(ref)s.\n"
+                    "Traceback:\n%(error)s"
                 )
                 % {"ref": vals.get("referencia_c", ""), "error": e}
             ) from e
@@ -290,8 +290,8 @@ def _send_pickup(self, vals):
         if res["_return"] < 0:
             raise UserError(
                 _(
-                    "GLS returned an error trying to record the shipping for %(ref).\n"
-                    "Error:\n%(error)"
+                    "GLS returned an error trying to record the shipping for %(ref)s.\n"
+                    "Error:\n%(error)s"
                 )
                 % {
                     "ref": vals.get("referencia_c", ""),
@@ -311,8 +311,8 @@ def _get_delivery_info(self, reference=False):
         except Exception as e:
             raise UserError(
                 _(
-                    "GLS: No response from server getting state from ref %(ref).\n"
-                    "Traceback:\n%(error)"
+                    "GLS: No response from server getting state from ref %(ref)s.\n"
+                    "Traceback:\n%(error)s"
                 )
                 % {"ref": reference, "error": e}
             ) from e
@@ -367,8 +367,8 @@ def _shipping_label(self, reference=False):
         except Exception as e:
             raise UserError(
                 _(
-                    "GLS: No response from server printing label with ref %(ref).\n"
-                    "Traceback:\n%(error)"
+                    "GLS: No response from server printing label with ref %(ref)s.\n"
+                    "Traceback:\n%(error)s"
                 )
                 % {"ref": reference, "error": e}
             ) from e

diff --git a/delivery_gls_asm/tests/test_delivery_gls_asm.py b/delivery_gls_asm/tests/test_delivery_gls_asm.py
@@ -43,6 +43,7 @@ def setUpClass(cls):
         cls.sale_order.action_confirm()
         cls.picking = cls.sale_order.picking_ids
         cls.picking.move_lines.quantity_done = 20
+        cls.picking.number_of_packages = 1
 
     def test_01_gls_picking_confirm_simple(self):
         """The picking is confirm and the shipping is recorded to GLS"""