diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index 65f8aae76db..5aaf0c63e0a 100755 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -163,6 +163,7 @@ class account_balance(report_sxw.rml_parse): 'credit1':'', 'balance1' :'', 'id' : account.id, + 'type' : account.type, 'code': account.code, 'name': account.name, 'level': level, @@ -172,6 +173,7 @@ class account_balance(report_sxw.rml_parse): 'leef': not bool(account.child_id), 'bal_type':'', } + print ">>>",res['type'] self.sum_debit += account.debit self.sum_credit += account.credit if not (res['credit'] or res['debit']) and not account.child_id: @@ -226,6 +228,7 @@ class account_balance(report_sxw.rml_parse): for r in res: sum = r['debit1'] - r['credit1'] r['balance1'] = sum + r['type']= '' r['id'] ='' r['code']= '' r['name']='' diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index d42e96710c6..6272d775d21 100755 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -76,7 +76,7 @@ - + @@ -108,33 +108,37 @@ + fontSize="4.5" /> + fontSize="5.0" /> + fontSize="5.5" /> + fontName="Helvetica" + fontSize="6.0" /> + + fontName="Times-Italic" + fontSize="6.5" /> + + fontName="Helvetica" + fontSize="6.8" /> + + @@ -174,11 +178,11 @@ + fontSize="7.0" leading="7"/> + fontSize="7.5" leading="7"/> + fontSize="8.5" leading="7"/> + fontSize="9.0" leading="7"/> + fontSize="9.5" leading="7"/> + fontSize="7.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> + fontSize="7.5" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> + fontSize="8.5" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> + fontSize="9.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> + fontSize="9.5" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> @@ -251,7 +255,7 @@ - + Code @@ -271,32 +275,24 @@ - - [[ repeatIn(lines(data['form']), 'a') ]] - - [[ setTag('para','para',{'style':('Level'+str(a['level']))}) ]][[ a['code'] or removeParentNode('tr') ]] - [[ setTag('para','para',{'style':('Level'+str(a['level']))}) ]][[ setTag('blockTable','blockTable',{'style':'TrLevel'+str(a['level'])}) ]][[ a['name'] ]] - - [[ a['level']>3 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit']) or '0.00' ]] - [[ a['level']<4 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit']) or '0.00' ]] - - - [[ a['level']>3 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit']) or '0.00' ]] - [[ a['level']<4 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit']) or '0.00' ]] - - - [[ a['level']>3 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance']) or '0.00' ]] - [[ a['level']<4 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance']) or '0.00' ]] - - - - [[ setTag('para','para',{'style':('Det_Level'+str(a['level']))}) ]][[ a['jname'] or removeParentNode('tr') ]] - [[ setTag('para','para',{'style':('Det_Level'+str(a['level']))}) ]] [[ setTag('tr','tr',{'style':('TrLevel_Name'+str(a['level']))}) ]][ref: [[ a['ref'] or removeParentNode('font') ]] ] [[ a['lname'] ]] - [[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit1']) or '0.00']] - [[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit1']) or '0.00']] - [[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance1']) or '0.00' ]] - - + + [[ repeatIn(lines(data['form']), 'a') ]] + [[ setTag('para','para',{'style':('Level'+str(a['level']))}) ]][[ a['code'] or removeParentNode('tr') ]] + [[ setTag('para','para',{'style':('Level'+str(a['level']))}) ]][[ setTag('blockTable','blockTable',{'style':'TrLevel'+str(a['level'])}) ]][[ a['name'] ]] + + [[ a['type']=='view' and removeParentNode('font') ]][[ setTag('para','para',{'style':('Level'+str(a['level']))}) ]][[ formatLang(a['debit']) or '0.00' ]] + [[ a['type']!='view' and removeParentNode('font') ]][[ setTag('para','para',{'style':('Level'+str(a['level']))}) ]] [[ formatLang(a['debit']) or '0.00' ]] + + + [[ a['type']=='view' and removeParentNode('font') ]][[ setTag('para','para',{'style':('Level'+str(a['level']))}) ]][[ formatLang(a['credit']) or '0.00' ]] + [[ a['type']<>'view' and removeParentNode('font') ]][[ setTag('para','para',{'style':('Level'+str(a['level']))}) ]] [[ formatLang(a['credit']) or '0.00' ]] + + + [[ a['type']=='view' and removeParentNode('font') ]][[ setTag('para','para',{'style':('Level'+str(a['level']))}) ]][[ formatLang(a['balance']) or '0.00' ]] + [[ a['type']<>'view' and removeParentNode('font') ]][[ setTag('para','para',{'style':('Level'+str(a['level']))}) ]] [[ formatLang(a['balance']) or '0.00' ]] + + + diff --git a/addons/crm_configuration/__terp__.py b/addons/crm_configuration/__terp__.py index ba9f560644e..0f6ccf2cabf 100644 --- a/addons/crm_configuration/__terp__.py +++ b/addons/crm_configuration/__terp__.py @@ -9,7 +9,7 @@ people to intelligently and efficiently manage tasks, issues, and requests. It manages key tasks such as communication, identification, prioritization, assignment, resolution and notification.""", - "depends" : ["crm","report_crm", "process", "account", "board_document"], + "depends" : ["crm","report_crm", "process", "account"], "init_xml" : [ "crm_config_view.xml", "crm_bugs_view.xml",