From dc5a2ebee084b5e19e762625be6aed1b8fe295c2 Mon Sep 17 00:00:00 2001 From: "vra (Tiny)" Date: Wed, 3 Jun 2009 18:32:51 +0530 Subject: [PATCH] Improved all the related reports rml with sxw file. bzr revid: vinusoft85@gmail.com-20090603130251-1m1ou9dsbnj6amkt --- .../project/report/analytic_journal.rml | 376 +++++++++++++----- .../report/inverted_analytic_balance.rml | 300 +++++++------- .../report/crossovered_analytic.rml | 372 ++++++++++------- addons/account_payment/report/order.rml | 123 +++--- addons/account_reporting/account.py | 5 +- .../report/account_report_bs.rml | 9 +- 6 files changed, 739 insertions(+), 446 deletions(-) diff --git a/addons/account/project/report/analytic_journal.rml b/addons/account/project/report/analytic_journal.rml index d7570aa8943..6cb381531c9 100644 --- a/addons/account/project/report/analytic_journal.rml +++ b/addons/account/project/report/analytic_journal.rml @@ -2,137 +2,297 @@ - + - - - + - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - [[ repeatIn(objects,'o') ]] - - - Date - Code - Move name - Account n° - General - Analytic - - - - - + [[ repeatIn(objects,'o') ]] + - [[ o.code ]] - [[ o.name ]] - [[ formatLang(sum_general(o.id,data['form']['date1'],data['form']['date2'])) ]] - [[ formatLang(sum_analytic(o.id,data['form']['date1'],data['form']['date2'])) ]] + + Analitic Journal - [[ company.currency_id.name ]] + + + + + Period from : [[ data['form']['date1'] ]] + to : [[ data['form']['date2'] ]] + - + + + + + + + Date + + + Code + + + Move Name + + + Account n° + + + General + + + Analytic + + + + + + + + + + [[ o.code ]] - [[ o.name ]] + + + + + + + + + + + + + + + + + + [[ formatLang(sum_general(o.id,data['form']['date1'],data['form']['date2'])) ]] + + + [[ formatLang(sum_analytic(o.id,data['form']['date1'],data['form']['date2'])) ]] + + + + + +
- - [[ repeatIn(lines(o.id,data['form']['date1'],data['form']['date2']), 'move') ]] - - - - - - [[ move.name ]] - [[ move.account_id.code ]] - [[ move.account_id.name ]] - [[ formatLang(move.debit-move.credit) ]] - - - - - - - + [[ repeatIn(lines(o.id,data['form']['date1'],data['form']['date2']), 'move') ]] + + - [[ repeatIn(lines_a(move.id,o.id,data['form']['date1'],data['form']['date2']),'move_a') ]] - [[ formatLang(move_a.date,date = True) ]] + + + + + + + + + + + [[ move.name ]] + + + [[ move.account_id.code ]] - [[ move.account_id.name ]] + + + [[ formatLang(move.debit-move.credit) ]] + + + + + - [[ move_a.code ]] - [[ move_a.name ]] - [[ move_a.account_id.code ]] - [[ move_a.account_id.name ]] - - [[ formatLang( move_a.amount) ]] - - + + + + +
+ [[ repeatIn(lines_a(move.id,o.id,data['form']['date1'],data['form']['date2']),'move_a') ]] + + + + [[ move_a or removeParentNode('blockTable') ]] [[ formatLang(move_a.date,date = True) ]] + + + [[ move_a.code ]] + + + [[ move_a.name ]] + + + [[ move_a.account_id.code ]] - [[ move_a.account_id.name ]] + + + + + + + + [[ formatLang( move_a.amount) ]] + + + + + + +
+ + + + + +
- - - - - [[ repeatIn(lines_a(False,o.id,data['form']['date1'],data['form']['date2']),'move_a') ]] - [[ formatLang(move_a.date,date = True) ]] - [[ move_a.code ]] - [[ move_a.name ]] - [[move_a.account_id.code ]] - [[ move_a.account_id.name ]] - - [[ formatLang( move_a.amount) ]] - - - - + + + +
+ [[ repeatIn(lines_a(False,o.id,data['form']['date1'],data['form']['date2']),'move_a') ]] + + + + [[ move_a or removeParentNode('blockTable') ]] [[ formatLang(move_a.date,date = True) ]] + + + [[ move_a.code ]] + + + [[ move_a.name ]] + + + [[ move_a.account_id.code ]] - [[ move_a.account_id.name ]] + + + + + + + + [[ formatLang( move_a.amount) ]] + + + + + + +
+ + + - \ No newline at end of file + diff --git a/addons/account/project/report/inverted_analytic_balance.rml b/addons/account/project/report/inverted_analytic_balance.rml index 1f3850d2439..18511393253 100644 --- a/addons/account/project/report/inverted_analytic_balance.rml +++ b/addons/account/project/report/inverted_analytic_balance.rml @@ -2,37 +2,7 @@ @@ -40,165 +10,209 @@ - + - - - + - - + + + + + + + + + + + + + + + + - + + - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - + + + + - + + + - - - + + - + - Code - - - Account Name - - - Debit - - - Credit - - - Balance - - - Quantity + Inverted Analytic Balance - [[ company.currency_id.name ]] - + + + + + + + + + + + Code + + + Name + + + Debit + + + Credit + + + Balance + + + Quantity + + + + + + + Total - - [[ formatLang(sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]] - + + + - [[ formatLang(sum_credit(objects,data['form']['date1'],data['form']['date2']))]] + [[ formatLang(sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]] - [[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']))]] + [[ formatLang(sum_credit(objects,data['form']['date1'],data['form']['date2']))]] - [[ formatLang(sum_quantity(objects,data['form']['date1'],data['form']['date2'])) ]] + [[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']))]] - - - - - [[ repeatIn(lines_g(objects,data['form']['date1'],data['form']['date2']),'move_g') ]] - - - - [[ move_g['code'] ]] - - - - [[ move_g['name'] ]] - - - [[ formatLang(move_g['debit'])]] - - - [[formatLang(move_g['credit'])]] - - - [[ formatLang(move_g['balance'])]] - - - [[formatLang(move_g['quantity']) ]] - - - - - [[ repeatIn(lines_a(objects,move_g['id'],data['form']['date1'],data['form']['date2']),'move_a') ]] - [[ move_a['code'] ]] - - - [[ move_a['complete_name'] ]] - - - - [[ formatLang(move_a['debit']) ]] - - - [[ formatLang(move_a['credit']) ]] - - - [[ formatLang(move_a['balance']) ]] - - - [[ formatLang(move_a['quantity'] or 0.00) ]] - - - - + [[ formatLang(sum_quantity(objects,data['form']['date1'],data['form']['date2'])) ]] - + + + +
+ [[ repeatIn(lines_g(objects,data['form']['date1'],data['form']['date2']),'move_g') ]] + + + + [[ move_g or removeParentNode('blockTable') ]] [[ move_g['code'] ]] + + + [[ move_g['name'] ]] + + + [[ formatLang(move_g['debit'])]] + + + [[formatLang(move_g['credit'])]] + + + [[ formatLang(move_g['balance'])]] + + + [[formatLang(move_g['quantity']) ]] + + + + + + +
+ [[ repeatIn(lines_a(objects,move_g['id'],data['form']['date1'],data['form']['date2']),'move_a') ]] + + + + [[ move_a or removeParentNode('blockTable') ]] [[ move_a['code'] ]] + + + [[ move_a['complete_name'] ]] + + + [[ formatLang(move_a['debit']) ]] + + + [[ formatLang(move_a['credit']) ]] + + + [[ formatLang(move_a['balance']) ]] + + + [[ formatLang(move_a['quantity'] or 0.00) ]] + + + + + + +
+ + + +
+ + + - \ No newline at end of file + diff --git a/addons/account_analytic_plans/report/crossovered_analytic.rml b/addons/account_analytic_plans/report/crossovered_analytic.rml index c10ce01edba..78a01d82a96 100644 --- a/addons/account_analytic_plans/report/crossovered_analytic.rml +++ b/addons/account_analytic_plans/report/crossovered_analytic.rml @@ -2,7 +2,7 @@ @@ -10,213 +10,303 @@ - + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + Crossovered Analytic - [[ company.currency_id.name ]] + [[ company.name ]] + + + + - - - + From Date - Crossovered Analytic + To Date - - - - - - - - - - - [[ company.name ]] - - - Period from [[ data['form']['date1'] ]] - to [[ data['form']['date2'] ]] - - - Currency: [[ company.currency_id.name ]] + Printing date - - - - - - - Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]] - - - - Analytic Account Reference: - - - - + - Account Name + [[ data['form']['date1'] ]] - Code + [[ data['form']['date2'] ]] - Quantity - - - Amount - - - Percentage + [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]] - + + + + Analytic Account Reference: + + + + - [[ repeatIn(ref_lines(data['form']),'a') ]][[ a['ref_name'] ]] + Account Name - [[ a['ref_code'] ]] + Code - [[ '%.2f' % a['ref_qty'] ]] + Quantity - [[ '%.2f' % a['ref_amt'] ]] + Amount - 100.00% + Percentage - + - +
+ [[ repeatIn(ref_lines(data['form']),'a') ]] + + + + + [[ a['ref_name'] ]] + + + + [[ a['ref_code'] ]] + + + [[ '%.2f' % a['ref_qty'] ]] + + + [[ '%.2f' % a['ref_amt'] ]] + + + 100.00% + + + + +
+ - + Analytic Account : + - - - - + - Account Name + Account Name - Code + Code - Quantity + Quantity - Amount + Amount - Percentage + Percentage - - - - [[ repeatIn(lines(data['form']),'a') ]] - [[a['acc_name'] ]] - - - [[ a['code'] ]] - - - [[ '%.2f' % a['qty'] ]] - - - [[ '%.2f' % a['amt'] ]] - - - [[ '%.2f' % a['perc'] ]]% - - - - + + + +
+ [[ repeatIn(lines(data['form']),'a') ]] + + + + [[ a['acc_name'] ]] + + + [[ a['code'] ]] + + + [[ '%.2f' % a['qty'] ]] + + + [[ '%.2f' % a['amt'] ]] + + + [[ '%.2f' % a['perc'] ]]% + + + + + + +
+ - diff --git a/addons/account_payment/report/order.rml b/addons/account_payment/report/order.rml index 80c3a3382a9..69c4b21c5d6 100644 --- a/addons/account_payment/report/order.rml +++ b/addons/account_payment/report/order.rml @@ -17,109 +17,137 @@ - - - - - - + + + + + - + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - [[ repeatIn(objects, 'o') ]] - + [[ repeatIn(objects, 'o') ]] + - + - [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.name or '']] - [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street or '']] - [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street2 or '']] - [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.zip or '']] [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.city or '']] - [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.state and o.mode.bank_id.bank.state.name or '' ]] - [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.country and o.mode.bank_id.bank.country.name or '']] + [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.name or '']] + [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street or '']] + [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street2 or '']] + [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.zip or '']] [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.city or '']] + [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.state and o.mode.bank_id.bank.state.name or '' ]] + [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.country and o.mode.bank_id.bank.country.name or '']] - + - [[ o.mode and o.mode.name ]] - + [[ o.mode and o.mode.name ]] + - Reference: [[ o.reference ]] - Execution date: [[ o.date_done or '/']] - + Reference: [[ o.reference ]] + Execution date: [[ o.date_done or '/']] + - Partner + Partner - Bank account + Bank account - Reference + Reference - Date + Date - Amount + Amount + + + - [[repeatIn(o.line_ids, 'line') ]] - [[ line.partner_id and line.partner_id.name or '' ]] + [[repeatIn(o.line_ids, 'line') ]] + [[ line.partner_id and line.partner_id.name or '' ]] - [[ line.bank_id and line.bank_id.name ]] + [[ line.bank_id and line.bank_id.name ]] - [[ line.name ]] + [[ line.name ]] - [[ line.date ]] + [[ line.date ]] - [[ formatLang(line.amount_currency) ]] [[ line.currency.name ]] + [[ formatLang(line.amount_currency) ]] [[ line.currency.name ]] @@ -128,4 +156,3 @@ - diff --git a/addons/account_reporting/account.py b/addons/account_reporting/account.py index 676144ab8c2..a31dbf06c04 100644 --- a/addons/account_reporting/account.py +++ b/addons/account_reporting/account.py @@ -98,7 +98,10 @@ class account_report_bs(osv.osv): 'report_type' : fields.selection([('only_obj', 'Report Objects Only'),('with_account', 'Report Objects With Accounts'),('acc_with_child', 'Report Objects With Accounts and child of Accounts')],"Report Type") } _defaults = { - 'report_type': lambda *a :'only_obj' + 'report_type': lambda *a :'only_obj', + 'color_font': lambda *a :'', + 'color_back': lambda *a :'', + 'font_style': lambda *a :'', } def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80): diff --git a/addons/account_reporting/report/account_report_bs.rml b/addons/account_reporting/report/account_report_bs.rml index 06912cd3dae..3d81d427769 100644 --- a/addons/account_reporting/report/account_report_bs.rml +++ b/addons/account_reporting/report/account_report_bs.rml @@ -94,7 +94,7 @@ - [[o.name]] [[o.font_style and (setTag('font','font',{'face':o.font_style} ) ) ]] [[ o.color_font and ( setTag('font','font',{'color':o.color_font.name})) ]] [[ o.color_back and ( setTag('para','para',{'backColor':o.color_back.name})) ]] + [[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]] [[o.name]] @@ -119,15 +119,14 @@ - [[ repeatIn(lines(data['form'],object=o), 'a') ]] [[ a['code'] ]] [[ (a['font_style']) and (setTag('font','font',{'face':a['font_style']})) or (a['level']==1 and (setTag('para','para',{'fontName':'Helvetica-Bold'}))) ]] [[ a['color_font'] and ( setTag('font','font',{'color':a['color_font']})) ]] [[ a['color_back'] and ( setTag('para','para',{'backColor':a['color_back']})) ]] + [[ 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'] ]] - [[ '..'*(a['level']-1) ]] [[ a['name'] ]] [[ (a['font_style']) and (setTag('font','font',{'face':a['font_style']})) or (a['level']==1 and (setTag('para','para',{'fontName':'Helvetica-Bold'}))) ]] [[ a['color_font'] and ( setTag('font','font',{'color':a['color_font']})) ]] [[ a['color_back'] and ( setTag('para','para',{'backColor':a['color_back']})) ]] + [[ '..'*(a['level']-1) ]][[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]] [[ a['name'] ]] - [[ '%.2f'% a['balance'] ]] [[ (a['font_style']) and (setTag('font','font',{'face':a['font_style']})) or (a['level']==1 and (setTag('para','para',{'fontName':'Helvetica-Bold'}))) ]] [[ a['color_font'] and ( setTag('font','font',{'color':a['color_font']})) ]] [[ a['color_back'] and ( setTag('para','para',{'backColor':a['color_back']})) ]] + [[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]][[ '%.2f'% a['balance'] ]] -