From d05666e33b0fe8c0de6dd05b78b4a4225f35ce35 Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Wed, 9 Sep 2009 11:55:05 +0530 Subject: [PATCH] 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 --- addons/account/account.py | 2 +- addons/account/report/invoice.rml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index b4a14684a27..b6dd4bfb11b 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -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, diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml index b2a65b73f33..902a9db3e06 100644 --- a/addons/account/report/invoice.rml +++ b/addons/account/report/invoice.rml @@ -366,7 +366,7 @@ [[ t.name ]] [[ formatLang(t.base) ]] - [[ t.tax_code_id.notprintable and removeParentNode('blockTable') or '' ]][[ formatLang(t.amount) ]] + [[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]][[ formatLang(t.amount) ]]