Skip to content

Commit a50e1e7

Browse files
committed
[MIG] delivery_seur: Migration to 14.0
[FIX] delivery_seur: dependencies [IMP+FIX] Add seur_use_packages_from_picking field in carrier to use (or not) package from pickings + Set the correct weight if we use packages. From 13.0
1 parent c7ebe19 commit a50e1e7

File tree

5 files changed

+34
-4
lines changed

5 files changed

+34
-4
lines changed

delivery_seur/i18n/delivery_seur.pot

+10
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,11 @@ msgstr ""
196196
msgid "MULTIPACK"
197197
msgstr ""
198198

199+
#. module: delivery_seur
200+
#: model_terms:ir.ui.view,arch_db:delivery_seur.view_delivery_carrier_form
201+
msgid "Misc"
202+
msgstr ""
203+
199204
#. module: delivery_seur
200205
#: model:ir.model.fields.selection,name:delivery_seur.selection__delivery_carrier__seur_service_code__019
201206
msgid "NETEXPRESS"
@@ -328,6 +333,11 @@ msgstr ""
328333
msgid "This feature has delivery cost"
329334
msgstr ""
330335

336+
#. module: delivery_seur
337+
#: model:ir.model.fields,field_description:delivery_seur.field_delivery_carrier__seur_use_packages_from_picking
338+
msgid "Use packages from picking"
339+
msgstr ""
340+
331341
#. module: delivery_seur
332342
#: model:ir.model.fields,help:delivery_seur.field_delivery_carrier__seur_cit_password
333343
#: model:ir.model.fields,help:delivery_seur.field_delivery_carrier__seur_cit_username

delivery_seur/i18n/es.po

+10
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,11 @@ msgstr "MULTI DOC"
212212
msgid "MULTIPACK"
213213
msgstr "MULTIPACK"
214214

215+
#. module: delivery_seur
216+
#: model_terms:ir.ui.view,arch_db:delivery_seur.view_delivery_carrier_form
217+
msgid "Misc"
218+
msgstr "Varios"
219+
215220
#. module: delivery_seur
216221
#: selection:delivery.carrier,seur_service_code:0
217222
msgid "NETEXPRESS"
@@ -336,6 +341,11 @@ msgstr "Esta funcionalidad tiene coste de envío"
336341
msgid "Transfer"
337342
msgstr "Transferir"
338343

344+
#. module: delivery_seur
345+
#: model:ir.model.fields,field_description:delivery_seur.field_delivery_carrier__seur_use_packages_from_picking
346+
msgid "Use packages from picking"
347+
msgstr "Usar paquetes de picking"
348+
339349
#. module: delivery_seur
340350
#: model:ir.model.fields,help:delivery_seur.field_delivery_carrier__seur_cit_password
341351
#: model:ir.model.fields,help:delivery_seur.field_delivery_carrier__seur_cit_username

delivery_seur/models/delivery_carrier.py

+1
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ class DeliveryCarrier(models.Model):
116116
string="Printer",
117117
default="ZEBRA:LP2844-Z",
118118
)
119+
seur_use_packages_from_picking = fields.Boolean(string="Use packages from picking")
119120

120121
def seur_test_connection(self):
121122
self.ensure_one()

delivery_seur/models/seur_request.py

+10-4
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ def __init__(self, carrier, record):
4040
self.product_code = self.carrier.seur_product_code
4141
self.send_sms = self.carrier.seur_send_sms
4242
self.label_format = self.carrier.seur_label_format
43+
self.use_packages_from_picking = self.carrier.seur_use_packages_from_picking
4344

4445
def wsdl_get(self, service):
4546
if service in ["ImprimirECBWebService", "IntAppletWebService"]:
@@ -118,6 +119,13 @@ def _prepare_create_shipping(self):
118119
else:
119120
# Para el resto es obligado
120121
goods = "400"
122+
# peso
123+
if self.use_packages_from_picking and self.record.package_ids:
124+
weight = 0
125+
for package in self.record.package_ids:
126+
weight += max(package.shipping_weight, package.weight)
127+
else:
128+
weight = self.record.shipping_weight
121129
return {
122130
"ci": self.integration_code,
123131
"nif": self.vat,
@@ -130,10 +138,8 @@ def _prepare_create_shipping(self):
130138
# below that weight will be invoiced with a minimum of 1kg.
131139
# http://ayuda.seur.com
132140
# /faq/tamano-peso-de-los-paquetes-a-enviar-a-traves-de-seur-com
133-
"total_kilos": self.record.shipping_weight or 1,
134-
"pesoBulto": (
135-
(self.record.shipping_weight / self.record.number_of_packages or 1) or 1
136-
),
141+
"total_kilos": weight or 1,
142+
"pesoBulto": ((weight / self.record.number_of_packages or 1) or 1),
137143
"observaciones": self.record.note,
138144
"referencia_expedicion": self.record.name,
139145
"ref_bulto": "",

delivery_seur/views/delivery_carrier_views.xml

+3
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
4141
<field name="seur_label_format" />
4242
<field name="seur_label_size" />
4343
</group>
44+
<group string="Misc">
45+
<field name="seur_use_packages_from_picking" />
46+
</group>
4447
</group>
4548
</page>
4649
</xpath>

0 commit comments

Comments
 (0)