audrius/suite
1
0
Fork 1
mirror of https://gitlab.com/hibou-io/hibou-odoo/suite.git synced 2025-01-20 12:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

[IMP] delivery_fedex_hibou: per-package insurance and sig.req.

Browse Source
This commit is contained in:
Jared Kipe
2021-10-28 11:07:02 -07:00
parent 3f087cbe18
commit ecca572597
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
delivery_fedex_hibou/models/delivery_fedex.py
View File

@@ -230,7 +230,6 @@ class DeliveryFedex(models.Model):
payment_acc_number = superself._get_fedex_payment_account_number() payment_acc_number = superself._get_fedex_payment_account_number()
order_name = superself.get_order_name(picking=picking) order_name = superself.get_order_name(picking=picking)
attn = superself.get_attn(picking=picking) attn = superself.get_attn(picking=picking)
insurance_value = superself.get_insurance_value(picking=picking)
residential = self._get_fedex_recipient_is_residential(recipient) residential = self._get_fedex_recipient_is_residential(recipient)
srm.web_authentication_detail(superself.fedex_developer_key, superself.fedex_developer_password) srm.web_authentication_detail(superself.fedex_developer_key, superself.fedex_developer_password)
@@ -312,7 +311,7 @@ class DeliveryFedex(models.Model):
# package_length=packaging.length, # package_length=packaging.length,
sequence_number=sequence, sequence_number=sequence,
ref=('%s-%d' % (order_name, sequence)), ref=('%s-%d' % (order_name, sequence)),
insurance=insurance_value insurance=superself.get_insurance_value(picking=picking, package=package)
) )
srm.set_master_package(net_weight, package_count, master_tracking_id=master_tracking_id) srm.set_master_package(net_weight, package_count, master_tracking_id=master_tracking_id)
request = srm.process_shipment() request = srm.process_shipment()
@@ -386,7 +385,7 @@ class DeliveryFedex(models.Model):
# package_width=packaging.width, # package_width=packaging.width,
# package_length=packaging.length, # package_length=packaging.length,
ref=order_name, ref=order_name,
insurance=insurance_value insurance=superself.get_insurance_value(picking=picking, package=picking_packages[:1])
) )
srm.set_master_package(net_weight, 1) srm.set_master_package(net_weight, 1)
@@ -475,7 +474,7 @@ class DeliveryFedex(models.Model):
acc_number = superself._get_fedex_account_number(order=order, picking=picking) acc_number = superself._get_fedex_account_number(order=order, picking=picking)
meter_number = superself._get_fedex_meter_number(order=order, picking=picking) meter_number = superself._get_fedex_meter_number(order=order, picking=picking)
order_name = superself.get_order_name(order=order, picking=picking) order_name = superself.get_order_name(order=order, picking=picking)
insurance_value = superself.get_insurance_value(order=order, picking=picking) insurance_value = superself.get_insurance_value(order=order, picking=picking, package=package)
residential = self._get_fedex_recipient_is_residential(recipient) residential = self._get_fedex_recipient_is_residential(recipient)
date_planned = fields.Datetime.now() date_planned = fields.Datetime.now()
if self.env.context.get('date_planned'): if self.env.context.get('date_planned'):