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

[FIX] delivery_hibou: context on button inside tree view for cancel, price can be Decimal

Browse Source
This commit is contained in:
Jared Kipe
2021-10-04 14:09:18 -07:00
parent 37c7822426
commit 492ecd60f6
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
delivery_hibou/models/stock.py
View File

@@ -11,6 +11,11 @@ class StockQuantPackage(models.Model):
def _get_active_picking(self): def _get_active_picking(self):
picking_id = self._context.get('active_id') picking_id = self._context.get('active_id')
picking_model = self._context.get('active_model') picking_model = self._context.get('active_model')
if not picking_id or picking_model != 'stock.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': if not picking_id or picking_model != 'stock.picking':
raise UserError('Cannot cancel package other than through shipment/picking.') raise UserError('Cannot cancel package other than through shipment/picking.')
return self.env['stock.picking'].browse(picking_id) return self.env['stock.picking'].browse(picking_id)
@@ -116,7 +121,7 @@ class StockPicking(models.Model):
res = res[0] res = res[0]
if carrier.free_over and self.sale_id and self.sale_id._compute_amount_total_without_delivery() >= carrier.amount: if carrier.free_over and self.sale_id and self.sale_id._compute_amount_total_without_delivery() >= carrier.amount:
res['exact_price'] = 0.0 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) carrier_prices.append(carrier_price)
tracking_number = '' tracking_number = ''
if res['tracking_number']: if res['tracking_number']: