Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[UPD] delivery_gls_asm: Incluye el calculo del volumen #3709

Open
wants to merge 2 commits into
base: 16.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion delivery_gls_asm/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Delivery GLS-ASM
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:66ef5f3a61104be230f40121cdba33c3f8aa34e5125c8b183c1c13a7b32cfd19
!! source digest: sha256:f39958d0fb913d16e489512f04563aa92d7e8a08ec50eaae6e8dfecaf4044c24
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down
2 changes: 1 addition & 1 deletion delivery_gls_asm/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"name": "Delivery GLS-ASM",
"summary": "Delivery Carrier implementation for GLS with ASMRed API",
"version": "16.0.1.1.1",
"version": "16.0.1.0.0",
"category": "Stock",
"website": "https://github.com/OCA/l10n-spain",
"author": "Tecnativa, Odoo Community Association (OCA)",
Expand Down
66 changes: 15 additions & 51 deletions delivery_gls_asm/i18n/ca.po
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,16 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.3.2\n"

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_shiptime__0
msgid "10:00 Service"
msgstr "10:00 Servicio"

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_shiptime__2
msgid "14:00 Service"
msgstr "14:00 Servicio"

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_service__27
msgid "14H SOBRES"
Expand Down Expand Up @@ -141,8 +151,8 @@ msgid "BICI"
msgstr ""

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_service__96
msgid "BUSINESS PARCEL"
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_shiptime__3
msgid "BusinessParcel"
msgstr ""

#. module: delivery_gls_asm
Expand Down Expand Up @@ -239,14 +249,12 @@ msgid "Con incidencia"
msgstr ""

#. module: delivery_gls_asm
#. odoo-python
#: code:addons/delivery_gls_asm/models/delivery_carrier.py:0
#, python-format
msgid "Couldn't find the consignee street"
msgstr ""

#. module: delivery_gls_asm
#. odoo-python
#: code:addons/delivery_gls_asm/models/delivery_carrier.py:0
#, python-format
msgid "Couldn't find the sender street"
Expand Down Expand Up @@ -338,8 +346,8 @@ msgid "EUROBUSINESS SMALL PARCEL"
msgstr ""

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_shiptime__16
msgid "Economy"
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_shiptime__18
msgid "EconomyParcel"
msgstr ""

#. module: delivery_gls_asm
Expand Down Expand Up @@ -377,11 +385,6 @@ msgstr ""
msgid "Ent. Pto. ASM"
msgstr ""

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_shiptime__18
msgid "Entrega 24-48h (serv. 96) o 48h (serv. 37)"
msgstr ""

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__stock_picking__gls_shipment_state__cancel_returned
msgid "Entrega anulada (devuelta)"
Expand Down Expand Up @@ -412,26 +415,6 @@ msgstr ""
msgid "Estado recogida GLS"
msgstr ""

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_shiptime__17
msgid "Express"
msgstr ""

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_shiptime__0
msgid "Express 10:00"
msgstr ""

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_shiptime__2
msgid "Express 14:00"
msgstr ""

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_shiptime__3
msgid "Express 19:00"
msgstr ""

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_shiptime__9
msgid "Franja Horaria"
Expand All @@ -456,7 +439,6 @@ msgid "GLS ASM"
msgstr ""

#. module: delivery_gls_asm
#. odoo-python
#: code:addons/delivery_gls_asm/models/delivery_carrier.py:0
#, python-format
msgid ""
Expand All @@ -472,7 +454,6 @@ msgid "GLS Barcode"
msgstr ""

#. module: delivery_gls_asm
#. odoo-python
#: code:addons/delivery_gls_asm/models/delivery_carrier.py:0
#, python-format
msgid "GLS Cancellation failed with reason: %s"
Expand All @@ -494,7 +475,6 @@ msgid "GLS Label"
msgstr ""

#. module: delivery_gls_asm
#. odoo-python
#: code:addons/delivery_gls_asm/models/delivery_carrier.py:0
#: model:ir.actions.act_window,name:delivery_gls_asm.action_delivery_gls_asm_manifest_wizard
#: model:ir.actions.report,name:delivery_gls_asm.gls_asm_manifest_report
Expand All @@ -509,7 +489,6 @@ msgid "GLS Picking Reference"
msgstr ""

#. module: delivery_gls_asm
#. odoo-python
#: code:addons/delivery_gls_asm/models/delivery_carrier.py:0
#, python-format
msgid ""
Expand All @@ -524,7 +503,6 @@ msgid "GLS Service"
msgstr ""

#. module: delivery_gls_asm
#. odoo-python
#: code:addons/delivery_gls_asm/models/delivery_carrier.py:0
#, python-format
msgid ""
Expand All @@ -538,14 +516,12 @@ msgid "GLS UID"
msgstr ""

#. module: delivery_gls_asm
#. odoo-python
#: code:addons/delivery_gls_asm/models/stock_picking.py:0
#, python-format
msgid "GLS label for %s"
msgstr ""

#. module: delivery_gls_asm
#. odoo-python
#: code:addons/delivery_gls_asm/models/gls_asm_request.py:0
#, python-format
msgid ""
Expand All @@ -555,7 +531,6 @@ msgid ""
msgstr ""

#. module: delivery_gls_asm
#. odoo-python
#: code:addons/delivery_gls_asm/models/delivery_carrier.py:0
#, python-format
msgid ""
Expand All @@ -572,7 +547,6 @@ msgid "GLS/ASM With return"
msgstr ""

#. module: delivery_gls_asm
#. odoo-python
#: code:addons/delivery_gls_asm/models/gls_asm_request.py:0
#, python-format
msgid ""
Expand All @@ -582,7 +556,6 @@ msgid ""
msgstr ""

#. module: delivery_gls_asm
#. odoo-python
#: code:addons/delivery_gls_asm/models/gls_asm_request.py:0
#, python-format
msgid ""
Expand Down Expand Up @@ -654,7 +627,6 @@ msgid "Int. WEB"
msgstr ""

#. module: delivery_gls_asm
#. odoo-python
#: code:addons/delivery_gls_asm/wizard/gls_asm_manifest_wizard.py:0
#, python-format
msgid ""
Expand Down Expand Up @@ -708,7 +680,6 @@ msgid "No Realizada"
msgstr ""

#. module: delivery_gls_asm
#. odoo-python
#: code:addons/delivery_gls_asm/models/gls_asm_request.py:0
#, python-format
msgid ""
Expand Down Expand Up @@ -910,7 +881,7 @@ msgstr ""

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_shiptime__11
msgid "Rec. en agencia"
msgid "Rec. en NAVE."
msgstr ""

#. module: delivery_gls_asm
Expand Down Expand Up @@ -1024,7 +995,6 @@ msgid "Transfer"
msgstr ""

#. module: delivery_gls_asm
#. odoo-python
#: code:addons/delivery_gls_asm/models/delivery_carrier.py:0
#, python-format
msgid ""
Expand Down Expand Up @@ -1052,9 +1022,3 @@ msgstr ""
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_service__35
msgid "dPRO"
msgstr ""

#~ msgid "10:00 Service"
#~ msgstr "10:00 Servicio"

#~ msgid "14:00 Service"
#~ msgstr "14:00 Servicio"
46 changes: 18 additions & 28 deletions delivery_gls_asm/i18n/delivery_gls_asm.pot
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_shiptime__0
msgid "10:00 Service"
msgstr ""

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_shiptime__2
msgid "14:00 Service"
msgstr ""

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_service__27
msgid "14H SOBRES"
Expand Down Expand Up @@ -141,6 +151,11 @@ msgstr ""
msgid "BUSINESS PARCEL"
msgstr ""

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_shiptime__3
msgid "BusinessParcel"
msgstr ""

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_service__31
msgid "CAN MUESTRAS"
Expand Down Expand Up @@ -335,8 +350,8 @@ msgid "EUROBUSINESS SMALL PARCEL"
msgstr ""

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_shiptime__16
msgid "Economy"
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_shiptime__18
msgid "EconomyParcel"
msgstr ""

#. module: delivery_gls_asm
Expand Down Expand Up @@ -374,11 +389,6 @@ msgstr ""
msgid "Ent. Pto. ASM"
msgstr ""

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_shiptime__18
msgid "Entrega 24-48h (serv. 96) o 48h (serv. 37)"
msgstr ""

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__stock_picking__gls_shipment_state__cancel_returned
msgid "Entrega anulada (devuelta)"
Expand Down Expand Up @@ -409,26 +419,6 @@ msgstr ""
msgid "Estado recogida GLS"
msgstr ""

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_shiptime__17
msgid "Express"
msgstr ""

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_shiptime__0
msgid "Express 10:00"
msgstr ""

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_shiptime__2
msgid "Express 14:00"
msgstr ""

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_shiptime__3
msgid "Express 19:00"
msgstr ""

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_shiptime__9
msgid "Franja Horaria"
Expand Down Expand Up @@ -909,7 +899,7 @@ msgstr ""

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__delivery_carrier__gls_asm_shiptime__11
msgid "Rec. en agencia"
msgid "Rec. en NAVE."
msgstr ""

#. module: delivery_gls_asm
Expand Down
Loading
Loading