From 0cb69b66eea2dc4a754ea04f159fe822668dcf9e Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Mon, 2 Aug 2010 15:37:09 +0530 Subject: [PATCH] [IMP] account : remove the unused data from rml,sxw, for third_party_ledger report bzr revid: sbh@tinyerp.com-20100802100709-bbcka7uvq3tlval3 --- addons/account/report/third_party_ledger.py | 12 ++++---- addons/account/report/third_party_ledger.rml | 18 +++++------ .../report/third_party_ledger_other.rml | 30 +++++++++---------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/addons/account/report/third_party_ledger.py b/addons/account/report/third_party_ledger.py index 374e518d8b1..c7c2b6e08b0 100644 --- a/addons/account/report/third_party_ledger.py +++ b/addons/account/report/third_party_ledger.py @@ -128,7 +128,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header): objects = self.pool.get('res.partner').browse(self.cr, self.uid, new_ids) super(third_party_ledger, self).set_context(objects, data, new_ids, report_type) - def lines(self, partner, data): + def lines(self, partner): full_account = [] if self.reconcil: RECONCILE_TAG = " " @@ -165,7 +165,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header): res = self.cr.fetchall() return res - def _sum_debit_partner(self, partner, data): + def _sum_debit_partner(self, partner): result_tmp = 0.0 if self.reconcil : RECONCILE_TAG = " " @@ -187,7 +187,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header): result_tmp = result_tmp + 0.0 return result_tmp - def _sum_credit_partner(self, partner, data): + def _sum_credit_partner(self, partner): result_tmp = 0.0 if self.reconcil : RECONCILE_TAG = " " @@ -209,7 +209,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header): result_tmp = result_tmp + 0.0 return result_tmp - def _sum_debit(self, data): + def _sum_debit(self): if not self.ids: return 0.0 result_tmp = 0.0 @@ -248,7 +248,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header): result_tmp = result_tmp + 0.0 return result_tmp + result_init - def _sum_credit(self, data): + def _sum_credit(self): if not self.ids: return 0.0 result_tmp = 0.0 @@ -288,7 +288,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header): return result_tmp + result_init # - def _get_partners(self, data): + def _get_partners(self): if self.result_selection == 'customer': return 'Receivable Accounts' elif self.result_selection == 'supplier': diff --git a/addons/account/report/third_party_ledger.rml b/addons/account/report/third_party_ledger.rml index 1eddd325d26..f4312becd68 100644 --- a/addons/account/report/third_party_ledger.rml +++ b/addons/account/report/third_party_ledger.rml @@ -220,7 +220,7 @@ - [[ get_partners(data) ]] + [[ get_partners() ]] [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] @@ -262,13 +262,13 @@ Balance Brought Forward - [[ formatLang((sum_debit(data))) ]] + [[ formatLang((sum_debit())) ]] - [[ formatLang((sum_credit(data))) ]] + [[ formatLang((sum_credit())) ]] - [[ formatLang((sum_debit(data) - sum_credit(data))) ]] + [[ formatLang((sum_debit() - sum_credit())) ]] @@ -310,7 +310,7 @@
- [[ repeatIn(lines(p,data), 'line') ]] + [[ repeatIn(lines(p), 'line') ]] [[ display_currency(data) == False or removeParentNode('blockTable') ]] @@ -377,13 +377,13 @@ Balance Brought Forward - [[ formatLang((sum_debit(data))) ]] + [[ formatLang((sum_debit())) ]] - [[ formatLang((sum_credit(data))) ]] + [[ formatLang((sum_credit())) ]] - [[ formatLang((sum_debit(data) - sum_credit(data))) ]] + [[ formatLang((sum_debit() - sum_credit())) ]] @@ -435,7 +435,7 @@
- [[ repeatIn(lines(p,data), 'line') ]] + [[ repeatIn(lines(p), 'line') ]] [[ display_currency(data) == True or removeParentNode('blockTable') ]] diff --git a/addons/account/report/third_party_ledger_other.rml b/addons/account/report/third_party_ledger_other.rml index 7d42d26ad1b..f29b8937777 100644 --- a/addons/account/report/third_party_ledger_other.rml +++ b/addons/account/report/third_party_ledger_other.rml @@ -398,7 +398,7 @@ - [[ get_partners(data) ]] + [[ get_partners() ]] [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] @@ -442,13 +442,13 @@ Balance Brought Forward - [[ formatLang((sum_debit(data))) ]] + [[ formatLang((sum_debit())) ]] - [[ formatLang((sum_credit(data))) ]] + [[ formatLang((sum_credit())) ]] - [[ formatLang((sum_debit(data) - sum_credit(data))) ]] + [[ formatLang((sum_debit() - sum_credit())) ]] @@ -462,13 +462,13 @@ [[ p.ref ]] - [[ p.name ]] - [[ formatLang((sum_debit_partner(p,data))) ]] + [[ formatLang((sum_debit_partner(p))) ]] - [[ formatLang((sum_credit_partner(p,data))) ]] + [[ formatLang((sum_credit_partner(p))) ]] - [[ formatLang((sum_debit_partner(p,data) - sum_credit_partner(p,data))) ]] + [[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] @@ -487,7 +487,7 @@
- [[ repeatIn(lines(p,data), 'line') ]] + [[ repeatIn(lines(p), 'line') ]] [[ display_currency(data) == False or removeParentNode('blockTable') ]] @@ -550,13 +550,13 @@ Balance Brought Forward - [[ formatLang((sum_debit(data))) ]] + [[ formatLang((sum_debit())) ]] - [[ formatLang((sum_credit(data))) ]] + [[ formatLang((sum_credit())) ]] - [[ formatLang((sum_debit(data) - sum_credit(data))) ]] + [[ formatLang((sum_debit() - sum_credit())) ]] @@ -574,13 +574,13 @@ [[ p.ref ]] - [[ p.name ]] - [[ formatLang((sum_debit_partner(p,data))) ]] + [[ formatLang((sum_debit_partner(p))) ]] - [[ formatLang((sum_credit_partner(p,data))) ]] + [[ formatLang((sum_credit_partner(p))) ]] - [[ formatLang((sum_debit_partner(p,data) - sum_credit_partner(p,data))) ]] + [[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] @@ -607,7 +607,7 @@
- [[ repeatIn(lines(p,data), 'line') ]] + [[ repeatIn(lines(p), 'line') ]] [[ display_currency(data) == True or removeParentNode('blockTable') ]]