Skip to content

Commit

Permalink
[MRG] [FIX] dp 'Sale Price' replaced by 'Product Price'
Browse files Browse the repository at this point in the history
  • Loading branch information
tafaRU authored and gurneyalex committed Nov 29, 2013
2 parents 0083e4b + 3004387 commit e1de006
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions product_special_type_sale/sale.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions sale_delivery_term/sale.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@ def _get_uom_id(self, cr, uid, *args):
required=True, ondelete='restrict'),
'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')),
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')),
Expand Down

0 comments on commit e1de006

Please sign in to comment.