From 492ecd60f65afd58e89190b54d5431fe80cda5cb Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Mon, 4 Oct 2021 14:09:18 -0700 Subject: [PATCH 1/2] [FIX] delivery_hibou: context on button inside tree view for cancel, price can be Decimal --- delivery_hibou/models/stock.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/delivery_hibou/models/stock.py b/delivery_hibou/models/stock.py index 5f940728..52e9c670 100644 --- a/delivery_hibou/models/stock.py +++ b/delivery_hibou/models/stock.py @@ -12,7 +12,12 @@ class StockQuantPackage(models.Model): picking_id = self._context.get('active_id') picking_model = self._context.get('active_model') if not picking_id or picking_model != 'stock.picking': - raise UserError('Cannot cancel package other than through shipment/picking.') + params = self._context.get('params') + if params: + picking_id = params.get('id') + picking_model = params.get('model') + if not picking_id or picking_model != 'stock.picking': + raise UserError('Cannot cancel package other than through shipment/picking.') return self.env['stock.picking'].browse(picking_id) def send_to_shipper(self): @@ -116,7 +121,7 @@ class StockPicking(models.Model): res = res[0] if carrier.free_over and self.sale_id and self.sale_id._compute_amount_total_without_delivery() >= carrier.amount: res['exact_price'] = 0.0 - carrier_price = res['exact_price'] * (1.0 + (self.carrier_id.margin / 100.0)) + carrier_price = float(res['exact_price']) * (1.0 + (self.carrier_id.margin / 100.0)) carrier_prices.append(carrier_price) tracking_number = '' if res['tracking_number']: From 455c7bb1b37fe8fe13c3294ee4d41dc69e2f3a17 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Mon, 4 Oct 2021 14:09:58 -0700 Subject: [PATCH 2/2] [FIX] delivery_gso: error cancelling due to shadow _ --- delivery_gso/models/delivery_gso.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/delivery_gso/models/delivery_gso.py b/delivery_gso/models/delivery_gso.py index 9603380c..4c7f7864 100644 --- a/delivery_gso/models/delivery_gso.py +++ b/delivery_gso/models/delivery_gso.py @@ -273,7 +273,7 @@ class ProviderGSO(models.Model): } for tracking in picking.carrier_tracking_ref.split(','): request_body['TrackingNumber'] = tracking - _ = service.delete_shipment(request_body) + cancel_res = service.delete_shipment(request_body) except HTTPError as e: raise ValidationError(e) picking.message_post(body=_('Shipment N° %s has been cancelled') % (picking.carrier_tracking_ref, ))