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

fix 

bzr revid: fp@tinyerp.com-20100914224308-1zjie3joivzqshc4
This commit is contained in:
Fabien Pinckaers 2010-09-15 00:43:08 +02:00
parent 307c97aa73
commit 1a0b9a9fed
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/account_voucher/voucher.py
View File

@ -177,7 +177,7 @@ class account_voucher(osv.osv):
total_tax = 0.0
if not tax[0].price_include:
for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_amount, 1).get('taxes'):
for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_amount, 1).get('taxes',[]):
total_tax += tax_line.get('amount')
total += total_tax
else:
@ -186,7 +186,7 @@ class account_voucher(osv.osv):
line_total = 0.0
line_tax = 0.0
for tax_line in tax_pool.compute_all(cr, uid, tax, line.untax_amount or line.amount, 1).get('taxes'):
for tax_line in tax_pool.compute_all(cr, uid, tax, line.untax_amount or line.amount, 1).get('taxes',[]):
line_tax += tax_line.get('amount')
line_total += tax_line.get('price_unit')
total_tax += line_tax
@ -228,7 +228,7 @@ class account_voucher(osv.osv):
tax = tax_pool.browse(cr, uid, taxes)
if not tax[0].price_include:
for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_total, 1).get('taxes'):
for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_total, 1).get('taxes',[]):
total_tax += tax_line.get('amount')
total += total_tax

2
addons/crm/crm.py
View File

@ -499,7 +499,7 @@ class crm_case_section(osv.osv):
_name = "crm.case.section"
_description = "Sales Teams"
_order = "name"
_order = "parent_id, name"
_columns = {
'name': fields.char('Sales Team', size=64, required=True, translate=True),