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

[IMP] account_balance Module : Fix the Total problem and Put Indentation in Reports.C

Browse Source 
bzr revid: vra@tinyerp.com-20090612073537-60opsxhisz9peyg8
This commit is contained in:
vra (Tiny)
2009-06-12 13:05:37 +05:30
parent bab693467f
commit 3460f27ca8
4 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_balance/report/account_balance.py
+4 -5
View File
@@ -393,7 +393,6 @@ class account_balance(report_sxw.rml_parse):
ids = self.ids
if not ids:
return []
ctx = self.context.copy()
result_total_parent=[]
@@ -413,16 +412,16 @@ class account_balance(report_sxw.rml_parse):
if level==1:
doneAccount={}
for entry in merged_accounts:
if entry[0].id in doneAccount:
continue
doneAccount[entry[0].id] = 1
for k in range(0,len(entry)):
temp_credit=0.00
temp_debit=0.00
temp_credit+=entry[k].credit
temp_debit+=entry[k].debit
if entry[0].type <> 'view':
temp_credit+=entry[k].credit
temp_debit+=entry[k].debit
if self.flag==1:
self.result_total["sum_credit" + str(k)]=0.00
addons/account_balance/report/account_balance.rml
+4 -4
View File
@@ -227,7 +227,7 @@
<para style="terp_default_9"><font>[[ (data['form']['format_perc'] or not data['form']['show_columns']) and removeParentNode('blockTable') ]]</font>[[ a['code'] ]]</para>
</td>
<td>
<para style="terp_default_9">[[ a['name'] ]]</para>
<para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font></para>
</td>
<td>
<para style="terp_default_9">[[ a['pattern'] ]]</para>
@@ -252,7 +252,7 @@
<para style="terp_default_9"><font>[[ (not data['form']['format_perc'] or not data['form']['show_columns']) and removeParentNode('blockTable') ]]</font>[[ a['code'] ]]</para>
</td>
<td>
<para style="terp_default_9">[[ a['name'] ]]</para>
<para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font></para>
</td>
<td>
<para style="terp_default_9">[[ a['pattern'] ]]</para>
@@ -280,7 +280,7 @@
<para style="terp_default_9"><font>[[ (data['form']['format_perc'] or data['form']['show_columns']) and removeParentNode('blockTable') ]]</font>[[ a['code'] ]]</para>
</td>
<td>
<para style="terp_default_9">[[ a['name'] ]]</para>
<para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font></para>
</td>
<td>
<para style="terp_default_9">[[ a['pattern'] ]]</para>
@@ -297,7 +297,7 @@
<para style="terp_default_9"><font>[[ (not data['form']['format_perc'] or data['form']['show_columns']) and removeParentNode('blockTable') ]]</font>[[ a['code'] ]]</para>
</td>
<td>
<para style="terp_default_9">[[ a['name'] ]]</para>
<para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font></para>
</td>
<td>
<para style="terp_default_9">[[ a['pattern'] ]]</para>
addons/account_balance/report/account_balance_landscape.py
+3 -3
View File
@@ -421,9 +421,9 @@ class account_balance_landscape(rml_parse.rml_parse):
for k in range(0,len(entry)):
temp_credit=0.00
temp_debit=0.00
temp_credit+=entry[k].credit
temp_debit+=entry[k].debit
if entry[0].type <> 'view':
temp_credit+=entry[k].credit
temp_debit+=entry[k].debit
if self.flag==1:
self.result_total["sum_credit" + str(k)]=0.00
addons/account_balance/report/account_balance_landscape.rml
+4 -4
View File
@@ -227,7 +227,7 @@
<para style="terp_default_9"><font>[[ (data['form']['format_perc'] or not data['form']['show_columns']) and removeParentNode('blockTable') ]]</font>[[ a['code'] ]]</para>
</td>
<td>
<para style="terp_default_9">[[ a['name'] ]]</para>
<para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font></para>
</td>
<td>
<para style="terp_default_9">[[ a['pattern'] ]]</para>
@@ -252,7 +252,7 @@
<para style="terp_default_9"><font>[[ (not data['form']['format_perc'] or not data['form']['show_columns']) and removeParentNode('blockTable') ]]</font>[[ a['code'] ]]</para>
</td>
<td>
<para style="terp_default_9">[[ a['name'] ]]</para>
<para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font></para>
</td>
<td>
<para style="terp_default_9">[[ a['pattern'] ]]</para>
@@ -280,7 +280,7 @@
<para style="terp_default_9"><font>[[ (data['form']['format_perc'] or data['form']['show_columns']) and removeParentNode('blockTable') ]]</font>[[ a['code'] ]]</para>
</td>
<td>
<para style="terp_default_9">[[ a['name'] ]]</para>
<para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font></para>
</td>
<td>
<para style="terp_default_9">[[ a['pattern'] ]]</para>
@@ -299,7 +299,7 @@
<para style="terp_default_9"><font>[[ (not data['form']['format_perc'] or data['form']['show_columns']) and removeParentNode('blockTable') ]]</font>[[ a['code'] ]]</para>
</td>
<td>
<para style="terp_default_9">[[ a['name'] ]]</para>
<para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font></para>
</td>
<td>
<para style="terp_default_9">[[ a['pattern'] ]]</para>