diff --git a/addons/account_report/report/print_indicator.py b/addons/account_report/report/print_indicator.py index e13fe58383f..2952319b167 100644 --- a/addons/account_report/report/print_indicator.py +++ b/addons/account_report/report/print_indicator.py @@ -169,6 +169,7 @@ class accounting_report_indicator(report_sxw.rml_parse): # find_child(obj_inds) for obj_ind in obj_inds: + level = 0 res = { 'id':obj_ind.id, 'name':obj_ind.name, @@ -177,9 +178,15 @@ class accounting_report_indicator(report_sxw.rml_parse): 'disp_graph':obj_ind.disp_graph, 'disp_tree':obj_ind.disp_tree, 'note':obj_ind.note, + 'level' : obj_ind.parent_id or 0, 'type':obj_ind.type, 'array_table' : False, } + if obj_ind.parent_id: + for record in result: + if record['id'] == obj_ind.parent_id.id: + res['level'] = record['level'] + 1 + break if len(obj_ind.expression)>=2: res['array_table'] = True result.append(res) diff --git a/addons/account_report/report/print_indicator.rml b/addons/account_report/report/print_indicator.rml index 9a504e68e67..e0f3323311e 100644 --- a/addons/account_report/report/print_indicator.rml +++ b/addons/account_report/report/print_indicator.rml @@ -2,13 +2,21 @@ @@ -41,19 +49,23 @@ + + + + - + - + @@ -104,10 +116,10 @@
[[ repeatIn(lines(data['form']),'o')]] - + -() [[ o['type']=='view' and setTag('para','para',{'fontName':'Helvetica-Bold','fontSize':'10.5'}) ]][[ o['name'] ]] ([[ o['code'] ]]) +[['.....'*(o['level']) ]][[ setTag('font','font',{'color':'white'}) ]]() [[ o['type']=='view' and setTag('para','para',{'fontName':'Helvetica-Bold','fontSize':'10.5'}) ]][[ o['name'] ]] ([[ o['code'] ]]) @@ -116,54 +128,38 @@ - - - - - - -Expression : [[ o['expression'] ]] + + +[['..........'*(o['level']) ]][[ setTag('font','font',{'color':'white'}) ]]Expression : [[ o['expression'] ]] - - - - - - - + - - - - [[ format(o['note']) or removeParentNode('blockTable') ]] + [['..........'*(o['level']) ]][[ setTag('font','font',{'color':'white'}) ]] [[ format(o['note']) or removeParentNode('blockTable') ]] - - - - - -
+ + +Tabular Summary +
[[ repeatIn(getarray(data['form'],o,array_header=data['form']['select_base']),'array_header',td=len(data['form']['base_selection'][0][2]),data=data['form']['select_base']) or removeParentNode('section') ]] - + -
[[ repeatIn(lines(data['form']),'o')]] [[ repeatIn(getarray(data['form'],o,array_header=data['form']['select_base']),'array',td=len(data['form']['base_selection'][0][2]),data=data['form']['select_base']) or removeParentNode('section') ]] - +