pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] account : remove the unused data from rml,sxw, for third_party_ledger report

Browse Source 
bzr revid: sbh@tinyerp.com-20100802100709-bbcka7uvq3tlval3
This commit is contained in:
sbh (Open ERP)
2010-08-02 15:37:09 +05:30
parent 9910801686
commit 0cb69b66ee
3 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/report/third_party_ledger.py
+6 -6
View File
@@ -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':
addons/account/report/third_party_ledger.rml
+9 -9
View File
@@ -220,7 +220,7 @@
</tr>
</blockTable>
</td>
<td><para style="terp_default_Centre_8">[[ get_partners(data) ]]</para></td>
<td><para style="terp_default_Centre_8">[[ get_partners() ]]</para></td>
<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
</tr>
</blockTable>
@@ -262,13 +262,13 @@
<para style="terp_default_Bold_9">Balance Brought Forward</para>
</td>
<td>
<para style="P5"><u>[[ formatLang((sum_debit(data))) ]]</u></para>
<para style="P5"><u>[[ formatLang((sum_debit())) ]]</u></para>
</td>
<td>
<para style="P5"><u>[[ formatLang((sum_credit(data))) ]]</u></para>
<para style="P5"><u>[[ formatLang((sum_credit())) ]]</u></para>
</td>
<td>
<para style="P5"><u>[[ formatLang((sum_debit(data) - sum_credit(data))) ]]</u></para>
<para style="P5"><u>[[ formatLang((sum_debit() - sum_credit())) ]]</u></para>
</td>
</tr>
</blockTable>
@@ -310,7 +310,7 @@
<font color="white"> </font>
</para>
<section>
<para style="P1">[[ repeatIn(lines(p,data), 'line') ]]</para>
<para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
<blockTable colWidths="65.0,28.0,45.0,175.0,77.0,75.0,74.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>
@@ -377,13 +377,13 @@
<para style="terp_default_Bold_9">Balance Brought Forward</para>
</td>
<td>
<para style="P5"><u>[[ formatLang((sum_debit(data))) ]]</u></para>
<para style="P5"><u>[[ formatLang((sum_debit())) ]]</u></para>
</td>
<td>
<para style="P5"><u>[[ formatLang((sum_credit(data))) ]]</u></para>
<para style="P5"><u>[[ formatLang((sum_credit())) ]]</u></para>
</td>
<td>
<para style="P5"><u>[[ formatLang((sum_debit(data) - sum_credit(data))) ]]</u></para>
<para style="P5"><u>[[ formatLang((sum_debit() - sum_credit())) ]]</u></para>
</td>
<td>
</td>
@@ -435,7 +435,7 @@
<font color="white"> </font>
</para>
<section>
<para style="P1">[[ repeatIn(lines(p,data), 'line') ]]</para>
<para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
<blockTable colWidths="57.0,25.0,40.0,154.0,67.0,66.0,65.0,65.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>
addons/account/report/third_party_ledger_other.rml
+15 -15
View File
@@ -398,7 +398,7 @@
</blockTable>
</td>
<td>
<para style="terp_default_Centre_8">[[ get_partners(data) ]]</para>
<para style="terp_default_Centre_8">[[ get_partners() ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]]</para>
@@ -442,13 +442,13 @@
<para style="terp_default_Bold_9">Balance Brought Forward</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_debit(data))) ]]</para>
<para style="P5">[[ formatLang((sum_debit())) ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_credit(data))) ]]</para>
<para style="P5">[[ formatLang((sum_credit())) ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_debit(data) - sum_credit(data))) ]]</para>
<para style="P5">[[ formatLang((sum_debit() - sum_credit())) ]]</para>
</td>
</tr>
</blockTable>
@@ -462,13 +462,13 @@
<para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_debit_partner(p,data))) ]]</para>
<para style="P5">[[ formatLang((sum_debit_partner(p))) ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_credit_partner(p,data))) ]]</para>
<para style="P5">[[ formatLang((sum_credit_partner(p))) ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_debit_partner(p,data) - sum_credit_partner(p,data))) ]]</para>
<para style="P5">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]]</para>
</td>
</tr>
<tr>
@@ -487,7 +487,7 @@
</tr>
</blockTable>
<section>
<para style="P1">[[ repeatIn(lines(p,data), 'line') ]]</para>
<para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
<blockTable colWidths="65.0,28.0,45.0,175.0,77.0,75.0,74.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>
@@ -550,13 +550,13 @@
<para style="terp_default_Bold_9">Balance Brought Forward</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_debit(data))) ]]</para>
<para style="P5">[[ formatLang((sum_debit())) ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_credit(data))) ]]</para>
<para style="P5">[[ formatLang((sum_credit())) ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_debit(data) - sum_credit(data))) ]]</para>
<para style="P5">[[ formatLang((sum_debit() - sum_credit())) ]]</para>
</td>
<td>
<para style="P5">
@@ -574,13 +574,13 @@
<para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_debit_partner(p,data))) ]]</para>
<para style="P5">[[ formatLang((sum_debit_partner(p))) ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_credit_partner(p,data))) ]]</para>
<para style="P5">[[ formatLang((sum_credit_partner(p))) ]]</para>
</td>
<td>
<para style="P5">[[ formatLang((sum_debit_partner(p,data) - sum_credit_partner(p,data))) ]]</para>
<para style="P5">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]]</para>
</td>
<td>
<para style="P5">
@@ -607,7 +607,7 @@
</tr>
</blockTable>
<section>
<para style="P1">[[ repeatIn(lines(p,data), 'line') ]]</para>
<para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
<blockTable colWidths="57.0,25.0,40.0,154.0,67.0,66.0,65.0,65.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>