From e97c4924b7e0744ff7ea1cb1c3cc37ceba610146 Mon Sep 17 00:00:00 2001 From: "Darshan Kalola (OpenERP)" Date: Mon, 11 Nov 2013 18:54:18 +0530 Subject: [PATCH] [IMP]solve yml issue and improve unit price for invoice line. bzr revid: dka@tinyerp.com-20131111132418-aeazzv8dkyaijgne --- addons/account/account_invoice.py | 2 +- addons/product/product.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index 42f3effd6f9..e089d23a6eb 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -1534,7 +1534,7 @@ class account_invoice_line(osv.osv): if type in ('in_invoice', 'in_refund'): result.update( {'price_unit': price_unit or res.standard_price,'invoice_line_tax_id': tax_id} ) else: - result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id}) + result.update({'price_unit': res.lst_price, 'invoice_line_tax_id': tax_id}) result['uos_id'] = uom_id or res.uom_id.id diff --git a/addons/product/product.py b/addons/product/product.py index 18b660a11e0..fa3b65bdcf8 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -772,8 +772,8 @@ class product_product(osv.osv): product_uom_obj = self.pool.get('product.uom') for product in self.browse(cr, uid, ids, context=context): res[product.id] = product[ptype] or 0.0 - if ptype == 'list_price': - res[product.id] = (res[product.id] + ((res[product.id] * (product.price_margin)) / 100)) + \ + if ptype == 'list_price' or ptype == 'lst_price': + res[product.id] = (product.list_price + ((product.list_price * (product.price_margin)) / 100)) + \ product.price_extra if 'uom' in context: uom = product.uom_id or product.uos_id