diff --git a/addons/account/report/tax_report.py b/addons/account/report/tax_report.py index c3c7967070f..6e8cc64f29c 100755 --- a/addons/account/report/tax_report.py +++ b/addons/account/report/tax_report.py @@ -83,12 +83,11 @@ class tax_report(rml_parse.rml_parse): top_result.append(res_dict) res_general = self._get_general(res[i][1].id,period_list,company_id,based_on) - print"====res_general===",res_general ind_general = 0 while ind_general < len(res_general) : res_general[ind_general]['type'] = 2 res_general[ind_general]['pos'] = 0 - res_general[ind_general]['level'] = res_dict['level'] + ' ' + res_general[ind_general]['level'] = res_dict['level'] top_result.append(res_general[ind_general]) ind_general+=1 i+=1 @@ -144,7 +143,7 @@ class tax_report(rml_parse.rml_parse): GROUP BY account.id,account.name,account.code', ('draft',tax_code_id, company_id)) res = self.cr.dictfetchall() - print"======res=====",res + #AND line.period_id IN ('+ period_sql_list +') \ i = 0 diff --git a/addons/account/report/tax_report.rml b/addons/account/report/tax_report.rml index 50dd5a89dda..903a4b7f661 100755 --- a/addons/account/report/tax_report.rml +++ b/addons/account/report/tax_report.rml @@ -215,19 +215,19 @@ [[ repeatIn(get_lines(data['form']['based_on'],data['form']['periods'],data['form']['company_id']), 'o') ]] [[ o['level'] ]] - [[o['type']==1 and ( setTag('para','para',{'fontName':'Helvetica'}))]] + [[o['type']==1 and ( setTag('para','para',{'fontName':'Helvetica'}))]] [[ setTag('tr','tr',{'style':'TrLevel'+str(o['level']), 'paraStyle':('Level'+str(o['level']))}) ]] [[ o['code'] ]] [[ o['name'] ]] - [[o['type']==2 and (o['debit']) ]] + [[o['type']==2 and (o['debit']) or '0.0' ]] - [[o['type']==2 and (o['credit']) ]] + [[o['type']==2 and (o['credit']) or '0.0' ]] - [[ o['tax_amount'] ]] + [[ o['tax_amount'] or '0.0' ]]