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

ACCOUNT_TAX_INCLUDE: fix readonly by states and move account_analytic_id to line 

bzr revid: ced-55387fef7c3bfa3829310ed652b13ab8934648a4
This commit is contained in:
ced 2007-03-13 13:13:58 +00:00
parent 2b8c590830
commit 3720f7d66e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/account_tax_include/invoice_tax_incl.py
View File

@ -64,10 +64,7 @@ class account_invoice(osv.osv):
_inherit = "account.invoice"
_columns = {
'price_type': fields.selection([
('tax_included','Tax included'),
('tax_excluded','Tax excluded')
], 'Price method', required=True),
'price_type': fields.selection([('tax_included','Tax included'), ('tax_excluded','Tax excluded')], 'Price method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'amount_untaxed': fields.function(_amount_untaxed, method=True, string='Untaxed Amount'),
'amount_total': fields.function(_amount_total, method=True, string='Total', store=True),
}
@ -104,6 +101,7 @@ class account_invoice_line(osv.osv):
'account_id':line.account_id.id,
'product_id':line.product_id.id,
'uos_id':line.uos_id.id,
'account_analytic_id':line.account_analytic_id.id,
})
for tax in tax_obj.compute_inv(cr, uid, line.invoice_line_tax_id, (line.price_unit *(1.0-(line['discount'] or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id):
val={}