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

Merge branch 'imp/12.0/delivery_planner_backports' into '12.0-test'

Browse Source 
imp/12.0/delivery_planner_backports into 12.0-test

See merge request hibou-io/hibou-odoo/suite!1075
This commit is contained in:
Hibou Bot
2021-10-04 21:10:35 +00:00
parent da072dd7d4 455c7bb1b3
commit 5e9937b2fa
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
delivery_gso/models/delivery_gso.py
View File

@@ -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, ))

9
delivery_hibou/models/stock.py
View File

@@ -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']: