odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] delivery: total passed to get_price_from_picking 

The total used to check which delivery.grid.line to apply must be in
the currency of the company because the delivery.grid.line records with
variable == Price are expressed in the currency of the company.

opw:647799
This commit is contained in:
Goffin Simon 2015-09-01 15:57:41 +02:00
parent f243a01795
commit c3b847daa8
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/delivery/delivery.py
View File

@ -223,6 +223,7 @@ class delivery_grid(osv.osv):
quantity += q
total = (order.amount_total or 0.0) - total_delivery
total = self.pool['res.currency'].compute(cr, uid, order.currency_id.id, order.company_id.currency_id.id, total, context=context)
return self.get_price_from_picking(cr, uid, id, total,weight, volume, quantity, context=context)
def get_price_from_picking(self, cr, uid, id, total, weight, volume, quantity, context=None):