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

merge 

bzr revid: fp@fp-laptop-20110917173959-nrf248w30ryfubvo
This commit is contained in:
fp 2011-09-17 19:39:59 +02:00
parent b698ba6e29 b8b21aac04
commit 05c74cb8a9
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/sale_layout/sale_layout.py
View File

@ -27,9 +27,15 @@ class sale_order_line(osv.osv):
def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
res = {}
line_ids = []
for id in ids:
res[id] = 0.0
for line in self.browse(cr, uid, ids, context=context):
if line.layout_type == 'article':
return super(sale_order_line, self)._amount_line(cr, uid, ids, field_name, arg, context)
line_ids.append(line.id)
if line_ids:
res_article = super(sale_order_line, self)._amount_line(cr, uid, line_ids, field_name, arg, context)
res.update(res_article)
return res
def invoice_line_create(self, cr, uid, ids, context=None):
@ -116,6 +122,8 @@ class sale_order_line(osv.osv):
'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}),
'product_uom_qty': fields.float('Quantity (UoM)', digits=(16,2)),
'product_uom': fields.many2one('product.uom', 'Product UoM'),
# Override the field to call the overridden _amount_line function
'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Sale Price')),
}
_defaults = {