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

Account : Taxname on Invoice Tax improved,.sxw file made compatible to .rml for invoice 

lp bug: https://launchpad.net/bugs/407290 fixed

bzr revid: jvo@tinyerp.com-20090909062505-m7wzkbvv94ywt0q6
This commit is contained in:
Jay (Open ERP) 2009-09-09 11:55:05 +05:30
parent 1d420cae79
commit d05666e33b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/account.py
View File

@ -1308,7 +1308,7 @@ class account_tax(osv.osv):
# we compute the amount for the current tax object and append it to the result
data = {'id':tax.id,
'name':tax.name,
'name':tax.description and tax.description + " - " + tax.name or tax.name,
'account_collected_id':tax.account_collected_id.id,
'account_paid_id':tax.account_paid_id.id,
'base_code_id': tax.base_code_id.id,

2
addons/account/report/invoice.rml
View File

@ -366,7 +366,7 @@
<tr>
<td><para style="terp_default_Centre_8">[[ t.name ]] </para></td>
<td><para style="terp_default_Right_8">[[ formatLang(t.base) ]]</para></td>
<td><para style="terp_default_Right_8">[[ t.tax_code_id.notprintable and removeParentNode('blockTable') or '' ]][[ formatLang(t.amount) ]]</para></td>
<td><para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]][[ formatLang(t.amount) ]]</para></td>
</tr>
</blockTable>
</td>