|
@ -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', |
|
|