From af064e2f680bacc6c9262852e3803047803e55f0 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Wed, 15 Oct 2008 10:24:33 +0530 Subject: [PATCH 01/16] small changes in analytic_journal.py bzr revid: patelamit2003@gmail.com-20081015045433-sg86nmuys15ru758 --- addons/account/project/report/analytic_journal.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/project/report/analytic_journal.py b/addons/account/project/report/analytic_journal.py index 80673bba85d..5fc8466c90c 100644 --- a/addons/account/project/report/analytic_journal.py +++ b/addons/account/project/report/analytic_journal.py @@ -65,7 +65,7 @@ class account_analytic_journal(report_sxw.rml_parse): res = self.cr.dictfetchone() return res['sum'] or 0 -report_sxw.report_sxw('report.account.analytic.journal', 'account.analytic.journal', 'addons/account/project/report/analytic_journal.rml',parser=account_analytic_journal) +report_sxw.report_sxw('report.account.analytic.journal', 'account.analytic.journal', 'addons/account/project/report/analytic_journal.rml',parser=account_analytic_journal,header=False) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From ae6b016cfc460ef123439afd8c7c404686ab1733 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Wed, 15 Oct 2008 12:23:14 +0530 Subject: [PATCH 02/16] Add currency in anaytic journal report bzr revid: patelamit2003@gmail.com-20081015065314-nuezurccjjgs28id --- .../project/report/analytic_journal.rml | 2 +- addons/account/report/account_journal.py | 2 +- addons/account/report/account_journal.rml | 229 ++++++++++-------- 3 files changed, 133 insertions(+), 100 deletions(-) diff --git a/addons/account/project/report/analytic_journal.rml b/addons/account/project/report/analytic_journal.rml index 3a79a165873..d7e9f391114 100644 --- a/addons/account/project/report/analytic_journal.rml +++ b/addons/account/project/report/analytic_journal.rml @@ -17,7 +17,7 @@ [[ company.name ]] - Analytic Journal + Analytic Journal - [[ company.currency_id.name ]] diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py index 5110287b2b0..5076fbaba87 100644 --- a/addons/account/report/account_journal.py +++ b/addons/account/report/account_journal.py @@ -59,7 +59,7 @@ class journal_print(report_sxw.rml_parse): def _sum_credit(self, period_id, journal_id): self.cr.execute('select sum(credit) from account_move_line where period_id=%d and journal_id=%d and state<>\'draft\'', (period_id, journal_id)) return self.cr.fetchone()[0] or 0.0 -report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print) +report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print,header=False) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml index 0deffbdee64..f224402569a 100644 --- a/addons/account/report/account_journal.rml +++ b/addons/account/report/account_journal.rml @@ -3,6 +3,37 @@ @@ -13,24 +44,27 @@ - - - + + + + + + + - + + + + + - - - - - @@ -38,14 +72,17 @@ - - + + - - - - - + + + + + + + + @@ -53,111 +90,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + [[ repeatIn(objects, 'o') ]] - + - - - + Date - Journal + Voucher No - [[o.period_id.name ]] - - - - - [[ company.name ]] + Account Number - [[ o.journal_id.code ]] [[ o.journal_id.name ]] + Third party - Currency: [[ company.currency_id.name ]] + Entry label + + + Debit + + + Credit - + - Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]] - + + + + Total + + + [[ '%.2f' % sum_debit(o.period_id.id, o.journal_id.id) ]] + + + [[ '%.2f' % sum_credit(o.period_id.id, o.journal_id.id) ]] + + + + + + + [[ repeatIn(lines(o.period_id.id, o.journal_id.id), 'line') ]] + [[ line.date ]] + + + [[ line.ref ]] + + + [[ line.account_id.code ]] + + + [[ line.partner_id and line.partner_id.name ]] + + + [[ line.name ]] + + + [[ line.debit and '%.2f' % line.debit or '' ]] + + + [[ line.credit and '%.2f' % line.credit or '' ]] + + - - - - Date - - - Voucher Nb - - - Account Number - - - Third party - - - Entry label - - - Debit - - - Credit - - - - - - - - [[ repeatIn(lines(o.period_id.id, o.journal_id.id), 'line') ]] - [[ line.date ]] - - - - [[ line.ref ]] - - - [[ line.account_id.code ]] - - - [[ line.partner_id and line.partner_id.name ]] - - - [[ line.name ]] - - - [[ line.debit and '%.2f' % line.debit or '' ]] - - - [[ line.credit and '%.2f' % line.credit or '' ]] - - - - - - - TOTAL: - - - [[ '%.2f' % sum_debit(o.period_id.id, o.journal_id.id) ]] - - - [[ '%.2f' % sum_credit(o.period_id.id, o.journal_id.id) ]] - - - + \ No newline at end of file From d9a5c293b701754447216608f698cfbf6deb203d Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Wed, 15 Oct 2008 13:01:11 +0530 Subject: [PATCH 03/16] General journal report completed..(Rana Vinay) bzr revid: patelamit2003@gmail.com-20081015073111-exb3qh0ro2qporpd --- addons/account/report/general_journal.py | 2 +- addons/account/report/general_journal.rml | 311 +++++++++++++--------- 2 files changed, 189 insertions(+), 124 deletions(-) diff --git a/addons/account/report/general_journal.py b/addons/account/report/general_journal.py index 9233a98b765..8899977e17a 100644 --- a/addons/account/report/general_journal.py +++ b/addons/account/report/general_journal.py @@ -96,7 +96,7 @@ class journal_print(report_sxw.rml_parse): return 0.0 self.cr.execute('select sum(credit) from account_move_line where period_id in (' + self.period_ids + ') and journal_id in (' + self.journal_ids + ') and state<>\'draft\'') return self.cr.fetchone()[0] or 0.0 -report_sxw.report_sxw('report.account.general.journal', 'account.journal.period', 'addons/account/report/general_journal.rml',parser=journal_print) +report_sxw.report_sxw('report.account.general.journal', 'account.journal.period', 'addons/account/report/general_journal.rml',parser=journal_print, header=False) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/general_journal.rml b/addons/account/report/general_journal.rml index 8de0f1a82ea..f89c7d201b6 100644 --- a/addons/account/report/general_journal.rml +++ b/addons/account/report/general_journal.rml @@ -1,8 +1,32 @@ - @@ -55,9 +55,13 @@ - - - + + + + + + + @@ -76,7 +80,7 @@ - + @@ -86,14 +90,15 @@ - - + + - - + + + @@ -105,56 +110,8 @@ - - - - - Grand total - - - [[ comma_me(sum_debit(data)) ]] - - - [[ comma_me(sum_credit(data)) ]] - - - [[ comma_me(sum_sdebit(data)) ]] - - - [[ comma_me(sum_scredit(data)) ]] - - - [[ comma_me(sum_litige(data)) ]] - - - - - Balance - - - - - - - - - - - - - [[ comma_me(solde_debit(data)) ]] - - - [[ comma_me(solde_credit(data)) ]] - - - - - - - - - + + Code @@ -163,46 +120,73 @@ Partner name - Débit + Débit - Crédit + Crédit - Balance + Balance - In dispute + In dispute - [[ repeatIn(lines(data), 'a') ]][[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['ref'] ]] + Grand total - [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['type']==3 and a['code'] ]] [[ a['name'] ]] + - [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ comma_me(a['debit']) ]] + [[ sum_debit(data) or '0.0' ]] - [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ comma_me(a['credit']) ]] + [[ sum_credit(data) or '0.0' ]] - [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ comma_me(a['balance']) ]] + [[ (sum_scredit(data)-sum_sdebit(data)) or '0.0' ]] - [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ comma_me(a['enlitige']) ]] + [[ sum_litige(data) or '0.0' ]] + + + + + + [[ repeatIn(lines(data), 'a') ]][[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['ref'] ]] [[ a['type']==3 and a['code'] ]] + + + [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['name'] ]] + + + [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['debit'] or '0.0' ]] + + + [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['credit'] or '0.0' ]] + + + [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['balance'] or '0.0' ]] + + + [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['enlitige'] or '0.0' ]] - - - - - - - - + - + \ No newline at end of file From 1d9516449b0aa51a6dbb9298fa005787af83efc7 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Thu, 16 Oct 2008 12:51:37 +0530 Subject: [PATCH 15/16] small changes in account_tax_code report(Rana Vinay) bzr revid: patelamit2003@gmail.com-20081016072137-q2ole8xowfrdqyf1 --- addons/account/report/account_tax_code.rml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/account/report/account_tax_code.rml b/addons/account/report/account_tax_code.rml index f6295bc7368..c33827bf559 100644 --- a/addons/account/report/account_tax_code.rml +++ b/addons/account/report/account_tax_code.rml @@ -90,8 +90,6 @@ -
- [[ repeatIn(objects, 'o') ]]