From 667b9f099bfeddace376421572a8208e0ea6858c Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Wed, 24 Apr 2013 10:46:04 +0200 Subject: [PATCH 1/2] [FIX] dp 'Sale Price' replaced by 'Product Price' --- product_special_type_sale/sale.py | 6 +++--- sale_delivery_term/sale.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/product_special_type_sale/sale.py b/product_special_type_sale/sale.py index 920983a2343..3b86a7c68fb 100644 --- a/product_special_type_sale/sale.py +++ b/product_special_type_sale/sale.py @@ -56,7 +56,7 @@ def _get_order(self, cr, uid, ids, context=None): _columns = { 'extra_discount_amount': fields.function(_special_lines, method=True, - digits_compute=dp.get_precision('Sale Price'), + digits_compute=dp.get_precision('Product Price'), string='Extra-Discount', help="The amount of extra-discount", multi='special_lines', @@ -65,7 +65,7 @@ def _get_order(self, cr, uid, ids, context=None): 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty', 'product_id'], 10), }), 'advance_amount': fields.function(_special_lines, method=True, - digits_compute=dp.get_precision('Sale Price'), + digits_compute=dp.get_precision('Product Price'), string='Advance', help="The amount of advances", multi='special_lines', @@ -74,7 +74,7 @@ def _get_order(self, cr, uid, ids, context=None): 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty', 'product_id'], 10), }), 'delivery_amount': fields.function(_special_lines, method=True, - digits_compute=dp.get_precision('Sale Price'), + digits_compute=dp.get_precision('Product Price'), string='Delivery Costs', help="The amount of delivery costs", multi='special_lines', diff --git a/sale_delivery_term/sale.py b/sale_delivery_term/sale.py index 38505a78ab2..2f37b298aae 100644 --- a/sale_delivery_term/sale.py +++ b/sale_delivery_term/sale.py @@ -116,7 +116,7 @@ def _get_uom_id(self, cr, uid, *args): 'delivery_term_id': fields.many2one('sale.delivery.term', 'Delivery term', required=True), 'name': fields.char('Description', size=256, required=True), 'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)]), - 'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price')), + 'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price')), 'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Sale Price')), 'product_uom_qty': fields.float('Quantity (UoM)', digits_compute= dp.get_precision('Product UoS'), required=True), From 3004387ff80dcb0e3541dd77a53025dc42e66e2c Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Wed, 24 Apr 2013 12:20:36 +0200 Subject: [PATCH 2/2] [FIX] replaced one more 'Sale Price' --- sale_delivery_term/sale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sale_delivery_term/sale.py b/sale_delivery_term/sale.py index 2f37b298aae..dd98b42bdba 100644 --- a/sale_delivery_term/sale.py +++ b/sale_delivery_term/sale.py @@ -118,7 +118,7 @@ def _get_uom_id(self, cr, uid, *args): 'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)]), 'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price')), 'price_subtotal': fields.function(_amount_line, string='Subtotal', - digits_compute= dp.get_precision('Sale Price')), + digits_compute= dp.get_precision('Product Price')), 'product_uom_qty': fields.float('Quantity (UoM)', digits_compute= dp.get_precision('Product UoS'), required=True), 'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True), 'product_uos_qty': fields.float('Quantity (UoS)' ,digits_compute= dp.get_precision('Product UoS')),