Techsystech
/
account-financial-reporting
mirror of https://github.com/OCA/account-financial-reporting.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[FIX] Avoiding the Total appears, 

When it doesn't make sense.
6.0
Humberto Arocha 2012-06-21 23:22:45 -05:30
parent c852dcaa80
commit 137499037b
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
account_financial_report/report/account_balance.py
View File

@ -154,6 +154,7 @@ class account_balance(report_sxw.rml_parse):
else: else:
self.to_currency_id = form['currency_id'] and type(form['currency_id']) in (list, tuple) and form['currency_id'][0] or form['currency_id'] self.to_currency_id = form['currency_id'] and type(form['currency_id']) in (list, tuple) and form['currency_id'][0] or form['currency_id']
tot_check = False
tot_eje = 0.0 tot_eje = 0.0
if form.has_key('account_list') and form['account_list']: if form.has_key('account_list') and form['account_list']:
@ -312,9 +313,10 @@ class account_balance(report_sxw.rml_parse):
# Include all accounts # Include all accounts
result_acc.append(res) result_acc.append(res)
if form['tot_check'] and res['type'] == 'view' and res['level'] == 1 and (res['id'] not in tot): if form['tot_check'] and res['type'] == 'view' and res['level'] == 1 and (res['id'] not in tot):
tot_check = True
tot[res['id']] = True tot[res['id']] = True
tot_eje += res['balance'] tot_eje += res['balance']
if form['tot_check']: if tot_check:
str_label = form['lab_str'] str_label = form['lab_str']
res2 = { res2 = {
'type' : 'view', 'type' : 'view',

4
account_financial_report/report/account_balance_2_cols.py
View File

@ -158,6 +158,7 @@ class account_balance(report_sxw.rml_parse):
else: else:
self.to_currency_id = form['currency_id'] and type(form['currency_id']) in (list, tuple) and form['currency_id'][0] or form['currency_id'] self.to_currency_id = form['currency_id'] and type(form['currency_id']) in (list, tuple) and form['currency_id'][0] or form['currency_id']
tot_check = False
tot_bin = 0.0 tot_bin = 0.0
tot_deb = 0.0 tot_deb = 0.0
tot_crd = 0.0 tot_crd = 0.0
@ -331,13 +332,14 @@ class account_balance(report_sxw.rml_parse):
# Include all accounts # Include all accounts
result_acc.append(res) result_acc.append(res)
if form['tot_check'] and res['type'] == 'view' and res['level'] == 1 and (res['id'] not in tot): if form['tot_check'] and res['type'] == 'view' and res['level'] == 1 and (res['id'] not in tot):
tot_check = True
tot[res['id']] = True tot[res['id']] = True
tot_bin += res['balanceinit'] tot_bin += res['balanceinit']
tot_deb += res['debit'] tot_deb += res['debit']
tot_crd += res['credit'] tot_crd += res['credit']
tot_eje += res['balance'] tot_eje += res['balance']
if form['tot_check']: if tot_check:
str_label = form['lab_str'] str_label = form['lab_str']
res2 = { res2 = {
'type' : 'view', 'type' : 'view',

5
account_financial_report/report/account_balance_4_cols.py
View File

@ -161,7 +161,7 @@ class account_balance(report_sxw.rml_parse):
self.to_currency_id = self.from_currency_id self.to_currency_id = self.from_currency_id
else: else:
self.to_currency_id = form['currency_id'] and type(form['currency_id']) in (list, tuple) and form['currency_id'][0] or form['currency_id'] self.to_currency_id = form['currency_id'] and type(form['currency_id']) in (list, tuple) and form['currency_id'][0] or form['currency_id']
tot_check = False
tot_bin = 0.0 tot_bin = 0.0
tot_deb = 0.0 tot_deb = 0.0
tot_crd = 0.0 tot_crd = 0.0
@ -348,6 +348,7 @@ class account_balance(report_sxw.rml_parse):
# Include all accounts # Include all accounts
result_acc.append(res) result_acc.append(res)
if form['tot_check'] and res['type'] == 'view' and res['level'] == 1 and (res['id'] not in tot): if form['tot_check'] and res['type'] == 'view' and res['level'] == 1 and (res['id'] not in tot):
tot_check = True
tot[res['id']] = True tot[res['id']] = True
tot_bin += res['balanceinit'] tot_bin += res['balanceinit']
tot_deb += res['debit'] tot_deb += res['debit']
@ -355,7 +356,7 @@ class account_balance(report_sxw.rml_parse):
tot_eje += res['balance'] tot_eje += res['balance']
#if (form['tot_check'] and res['type']=='view' and res['level']==1 and (res['id'] not in tot)): #if (form['tot_check'] and res['type']=='view' and res['level']==1 and (res['id'] not in tot)):
if form['tot_check']: if tot_check:
str_label = form['lab_str'] str_label = form['lab_str']
res2 = { res2 = {
'type' : 'view', 'type' : 'view',