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

[18.0][MIG] delivery_gls_asm: Migration to 18.0 #4090

Open
wants to merge 48 commits into
base: 18.0
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
24c7ad1
[ADD] gls_asm_delivery: New module
chienandalu Jun 5, 2020
2a86fb4
Translated using Weblate (Spanish)
chienandalu Oct 6, 2020
3da3a80
[IMP] delivery_gls and delivery_seur: add informative exceptions
chienandalu Oct 8, 2020
99c128a
[FIX] delivery_gls_asm: manifest
chienandalu Oct 9, 2020
bc6e5e1
[FIX] delivery_gls_manifest: manifest destination name
chienandalu Oct 15, 2020
c5d4e6e
[FIX] delivery_gls_asm: Proper signature for gls_asm_rate_shipment
pedrobaeza Feb 17, 2021
36976aa
[IMP] delivery_gls_asm: black, isort, prettier
victoralmau Feb 25, 2021
fda3621
[FIX] delivery_gls_asm: escaping shipping vals for xml
chienandalu Mar 9, 2021
ea94757
[MIG] delivery_gls_asm: Migration to 13.0
victoralmau Feb 25, 2021
4e0af8b
Added translation using Weblate (Catalan)
brendapaniagua Mar 19, 2021
e8914dc
Translated using Weblate (Spanish)
brendapaniagua Mar 19, 2021
fd5eb21
Translated using Weblate (Catalan)
brendapaniagua Mar 22, 2021
f71800e
[13.0][IMP] delivery_gls_asm: black, isort, prettier
hildickethan Apr 15, 2021
798762a
[14.0][MIG] delivery_gls_asm: Migration to 14.0
hildickethan Apr 16, 2021
3b38fc1
[14.0][IMP] delivery_gls_asm: Pick-up request integration
hildickethan Jul 29, 2021
d9eae29
[14.0][IMP] delivery_gls_asm: GLS states
hildickethan Nov 11, 2021
20f9e3c
[12.0][FIX] delivery_gls_asm: Escape destination street
hildickethan Nov 29, 2021
1389f0d
[FIX] delivery_gls_asm: escaped int
chienandalu Jan 12, 2022
7bfc2c8
[14.0][FIX] delivery_gls_asm: stock_picking_batch fail
Reyes4711-S73 Mar 23, 2022
bfeac3d
[IMP] delivery_gls_asm: warn about reference limit
chienandalu Dec 9, 2021
ceeb711
[14.0][IMP] delivery_gls_asm: Referencia albarán
hildickethan Apr 1, 2022
bd25f0d
[14.0][IMP] delivery_gls_asm: Cash on delivery
hildickethan Apr 7, 2022
97214cd
[IMP] delivery_gls_asm: master data
chienandalu May 10, 2022
d05ea63
[IMP] delivery_gls_asm: fallback to commercial entity phone
chienandalu May 10, 2022
14fac24
[IMP] delivery_gls_asm: Mark as return
hildickethan Feb 21, 2022
feae64d
[14.0][FIX] delivery_gls_asm: Convert into list if not Iterable
hildickethan Jun 7, 2022
388a0d6
[IMP] delivery_gls_asm: International tracking links
hildickethan Jul 13, 2022
8a90e09
[IMP] delivery_gls_asm: Add maintainers
hildickethan Jul 14, 2022
fd33f19
[14.0][FIX] delivery_gls_asm: prevent escape of bool
Jul 22, 2022
ac40056
[IMP] delivery_gls_asm: hide cancel button for other carriers
mariadforgeflow Oct 18, 2022
0ae979e
[MIG] delivery_gls_asm: Migration to 15.0
victoralmau Oct 19, 2022
a93353b
Translated using Weblate (Spanish)
Ivorra78 Jul 5, 2023
09269b2
[FIX]delivery_gls_asm: Discontinued GetManifiesto API method
manuelregidor Jul 25, 2023
8da2931
[FIX] delivery_gls_asm: delivery_package_number compatibility
chienandalu Sep 19, 2023
3849210
[IMP] delivery_gls_asm: Notas envío GLS
hildickethan May 19, 2023
93602f2
Translated using Weblate (Spanish)
Ivorra78 Sep 27, 2023
30b3aab
[FIX] *: Linter fixes
pedrobaeza Oct 28, 2023
bfa4eba
[MIG] delivery_gls_asm: Migration to 16.0
hildickethan Dec 15, 2023
a2c7297
[IMP] delivery_gls_asm: Nuevo servicio '96 - BUSINESS PARCEL'
ioans73 Feb 8, 2024
c9a0c1d
[IMP] delivery_gls_asm: rename/add shipping times
chienandalu Apr 16, 2024
cbbe18b
[IMP] delivery_gls_asm: Check value being sent
hildickethan May 27, 2024
cb809b6
[IMP] delivery_gls_asm: pre-commit auto fixes
Tisho99 Dec 19, 2024
81cc885
[MIG] delivery_gls_asm: Migration to 17.0
Tisho99 Dec 19, 2024
7f2d060
[UPD] Update delivery_gls_asm.pot
Dec 31, 2024
293ca89
[BOT] post-merge updates
OCA-git-bot Dec 31, 2024
cae45d7
[IMP] delivery_gls_asm: pre-commit auto fixes
arantxa-s73 Mar 21, 2025
d57851c
[MIG] delivery_gls_asm: Migration to 18.0
arantxa-s73 Mar 21, 2025
f94cecf
[DON'T MERGE] test-requirements.txt
arantxa-s73 Mar 21, 2025
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
Prev Previous commit
Next Next commit
[14.0][IMP] delivery_gls_asm: Cash on delivery
hildickethan authored and arantxa-s73 committed Mar 21, 2025
commit bd25f0d2e7db9ab1697fc5a438be58bcf8ac0644
5 changes: 5 additions & 0 deletions delivery_gls_asm/i18n/delivery_gls_asm.pot
Original file line number Diff line number Diff line change
@@ -196,6 +196,11 @@ msgstr ""
msgid "Cash On Delivery"
msgstr ""

#. module: delivery_gls_asm
#: model:ir.model.fields,field_description:delivery_gls_asm.field_delivery_carrier__gls_asm_cash_on_delivery
msgid "Cash on delivery"
msgstr ""

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__stock_picking__gls_pickup_state__closed
msgid "Cerrado"
5 changes: 5 additions & 0 deletions delivery_gls_asm/i18n/es.po
Original file line number Diff line number Diff line change
@@ -205,6 +205,11 @@ msgstr "Cancelar"
msgid "Cash On Delivery"
msgstr "Portes debidos"

#. module: delivery_gls_asm
#: model:ir.model.fields,field_description:delivery_gls_asm.field_delivery_carrier__gls_asm_cash_on_delivery
msgid "Cash on delivery"
msgstr "Contra reembolso"

#. module: delivery_gls_asm
#: model:ir.model.fields.selection,name:delivery_gls_asm.selection__stock_picking__gls_pickup_state__closed
msgid "Cerrado"
13 changes: 12 additions & 1 deletion delivery_gls_asm/models/delivery_carrier.py
Original file line number Diff line number Diff line change
@@ -47,6 +47,14 @@ class DeliveryCarrier(models.Model):
help="Checked if this service is used for pickups",
compute="_compute_gls_pickup_service",
)
gls_asm_cash_on_delivery = fields.Boolean(
string="Cash on delivery",
help=(
"If checked, it means that the carrier is paid with cash. It assumes "
"there is a sale order linked and it will use that "
"total amount as the value to be paid"
),
)

@api.depends("gls_asm_service")
def _compute_gls_pickup_service(self):
@@ -100,6 +108,9 @@ def _prepare_gls_asm_shipping(self, picking):
)
if not sender_partner.street:
raise UserError(_("Couldn't find the sender street"))
cash_amount = 0
if self.gls_asm_cash_on_delivery:
cash_amount = picking.sale_id.amount_total
return {
"fecha": fields.Date.today().strftime("%d/%m/%Y"),
"portes": self.gls_asm_postage_type,
@@ -155,7 +166,7 @@ def _prepare_gls_asm_shipping(self, picking):
), # Our unique reference
"referencia_0": "", # Not used if the above is set
"importes_debido": "0", # The customer pays the shipping
"importes_reembolso": "", # TODO: Support Cash On Delivery
"importes_reembolso": cash_amount or "",
"seguro": "0", # [optional]
"seguro_descripcion": "", # [optional]
"seguro_importe": "", # [optional]
1 change: 1 addition & 0 deletions delivery_gls_asm/views/delivery_asm_view.xml
Original file line number Diff line number Diff line change
@@ -29,6 +29,7 @@
name="gls_asm_postage_type"
attrs="{'required': [('delivery_type', '=', 'gls_asm'), ('prod_environment', '!=', False)]}"
/>
<field name="gls_asm_cash_on_delivery" />
</group>
</group>
</page>