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

SALE: fix total for uos/uom 

bzr revid: ced-4a5570ba5868644cdec3550d06c6edafe60ae25a
This commit is contained in:
ced 2007-06-12 11:50:27 +00:00
parent 26b5a79287
commit 880941c7d8
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/sale/sale.py
View File

@ -68,14 +68,14 @@ class sale_order(osv.osv):
return super(sale_order, self).copy(cr, uid, id, default, context)
def _amount_untaxed(self, cr, uid, ids, field_name, arg, context):
id_set = ",".join(map(str, ids))
cr.execute("SELECT s.id,COALESCE(SUM(l.price_unit*l.product_uos_qty*(100-l.discount))/100.0,0) AS amount FROM sale_order s LEFT OUTER JOIN sale_order_line l ON (s.id=l.order_id) WHERE s.id IN ("+id_set+") GROUP BY s.id ")
res = dict(cr.fetchall())
res = {}
cur_obj=self.pool.get('res.currency')
for id in res.keys():
order=self.browse(cr, uid, [id])[0]
cur=order.pricelist_id.currency_id
res[id]=cur_obj.round(cr, uid, cur, res[id])
for sale in self.browse(cr, uid, ids):
res[sale.id] = 0.0
for line in sale.order_line:
res[sale.id] += line.price_subtotal
cur = sale.pricelist_id.currency_id
res[sale.id] = cur_obj.round(cr, uid, cur, res[sale.id])
return res
def _amount_tax(self, cr, uid, ids, field_name, arg, context):