diff --git a/addons/account_reporting/report/account_report_bs.rml b/addons/account_reporting/report/account_report_bs.rml index 59caba5ab76..b33ebb4bcc8 100644 --- a/addons/account_reporting/report/account_report_bs.rml +++ b/addons/account_reporting/report/account_report_bs.rml @@ -10,14 +10,52 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -25,7 +63,7 @@ - + @@ -41,26 +79,32 @@ - - + + + - + - + + - + + + + + @@ -69,63 +113,49 @@ - - - - [[ company.name ]] - - - - - - - - Currency: [[ company.currency_id.name ]] - - - - Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]] [[repeatIn(objects,'o') ]] - + + + + - - - - - - [[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]] [[o.name]] - - - - - + Account Balance - + + + + - Code + Company Name - Account Name + Printing date - Balance + Currency + + + Name - - + + - [[ repeatIn(lines(data['form'],object=o), 'a') ]][[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]] [[ a['code'] ]] + [[ company.name ]] - [[ '..'*(a['level']-1) ]][[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]] [[ a['name'] ]] + [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] - [[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]][[ '%.2f'% a['balance'] ]] + [[ company.currency_id.name ]] + + + [[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]] [[o.name]] @@ -135,6 +165,27 @@ + + + + Code + + + Account Name + + + Balance([[company.currency_id.code]]) + + + + + [[ repeatIn(lines(data['form']), 'a') ]][[ (a['level']>4 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]][[ a['code'] or removeParentNode('tr')]] + + [[ (a['level']>4 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]][[ '..'*(a['level']-1) ]][[ a['name'] ]] + + [[ (a['level']>4 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]][[ formatLang(a['balance']) ]] [[company.currency_id.symbol]] + + + -