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

[MIG] delivery_gso: for Odoo 13.0

Browse Source
This commit is contained in:
Connor Christian
2020-11-12 14:24:55 -05:00
committed by Jared Kipe
parent c827d8b0e1
commit edd1e5c947
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
delivery_gso/models/delivery_gso.py
View File

@@ -160,7 +160,7 @@ class ProviderGSO(models.Model):
company = self.get_shipper_company(picking=picking) company = self.get_shipper_company(picking=picking)
from_ = self.get_shipper_warehouse(picking=picking) from_ = self.get_shipper_warehouse(picking=picking)
to = self.get_recipient(picking=picking) to = self.get_recipient(picking=picking)
address_type = 'B' if bool(to.company or to.parent_id.company) else 'R' address_type = 'B' if "company" in (to.company_type, to.parent_id.company_type) else 'R'
request_body = { request_body = {
'AccountNumber': sudoself.gso_account_number, 'AccountNumber': sudoself.gso_account_number,
@@ -251,7 +251,7 @@ class ProviderGSO(models.Model):
} }
for tracking in picking.carrier_tracking_ref.split(','): for tracking in picking.carrier_tracking_ref.split(','):
request_body['TrackingNumber'] = tracking request_body['TrackingNumber'] = tracking
_ = service.delete_shipment(request_body) __ = service.delete_shipment(request_body)
except HTTPError as e: except HTTPError as e:
raise ValidationError(e) raise ValidationError(e)
picking.message_post(body=_('Shipment N° %s has been cancelled') % (picking.carrier_tracking_ref, )) picking.message_post(body=_('Shipment N° %s has been cancelled') % (picking.carrier_tracking_ref, ))
@@ -262,7 +262,7 @@ class ProviderGSO(models.Model):
service = sudoself._get_gso_service() service = sudoself._get_gso_service()
from_ = sudoself.get_shipper_warehouse(order=order) from_ = sudoself.get_shipper_warehouse(order=order)
to = sudoself.get_recipient(order=order) to = sudoself.get_recipient(order=order)
address_type = 'B' if bool(to.company or to.parent_id.company) else 'R' address_type = 'B' if "company" in (to.company_type, to.parent_id.company_type) else 'R'
est_weight_value = self._gso_convert_weight( est_weight_value = self._gso_convert_weight(
sum([(line.product_id.weight * line.product_uom_qty) for line in order.order_line]) or 0.0) sum([(line.product_id.weight * line.product_uom_qty) for line in order.order_line]) or 0.0)