OCA
/
account-financial-reporting
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[IMP]

pull/7/merge
Yanina Aular 12 years ago
parent
e67257fefe
commit
c5414fc5e1
1 changed files with 10 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      account_financial_report/report/parser.py

20
account_financial_report/report/parser.py
View File

@ -446,7 +446,7 @@ class account_balance(report_sxw.rml_parse):
account_not_black_ids = [i.id for i in account_not_black] account_not_black_ids = [i.id for i in account_not_black]
all_account_period = {} # All accounts per period all_account_period = {} # All accounts per period
# Iteration limit depending on the number of columns # Iteration limit depending on the number of columns
if form['columns'] == 'thirteen': if form['columns'] == 'thirteen':
limit = 13 limit = 13
@ -560,7 +560,7 @@ class account_balance(report_sxw.rml_parse):
if form['inf_type'] == 'IS': if form['inf_type'] == 'IS':
d, c, b = map(z, [ d, c, b = map(z, [
all_account_period[pn-1][id]['debit'], all_account_period[pn-1][id]['credit'], all_account_period[pn-1][id]['balance']])
all_account_period.get(pn-1).get(id).get('debit', 0.0), all_account_period.get(pn-1).get(id).get('credit', 0.0), all_account_period.get(pn-1).get(id).get('balance', 0.0)])
res.update({ res.update({
'dbr%s' % pn: self.exchange(d), 'dbr%s' % pn: self.exchange(d),
'cdr%s' % pn: self.exchange(c), 'cdr%s' % pn: self.exchange(c),
@ -568,7 +568,7 @@ class account_balance(report_sxw.rml_parse):
}) })
else: else:
i, d, c = map(z, [ i, d, c = map(z, [
all_account_period[pn-1][id]['balanceinit'], all_account_period[pn-1][id]['debit'], all_account_period[pn-1][id]['credit']])
all_account_period.get(pn-1).get(id).get('balanceinit', 0.0), all_account_period.get(pn-1).get(id).get('debit', 0.0), all_account_period.get(pn-1).get(id).get('credit', 0.0)])
b = z(i+d-c) b = z(i+d-c)
res.update({ res.update({
'dbr%s' % pn: self.exchange(d), 'dbr%s' % pn: self.exchange(d),
@ -578,7 +578,7 @@ class account_balance(report_sxw.rml_parse):
if form['inf_type'] == 'IS': if form['inf_type'] == 'IS':
d, c, b = map(z, [ d, c, b = map(z, [
all_account_period['all'][id]['debit'], all_account_period['all'][id]['credit'], all_account_period['all'][id]['balance']])
all_account_period.get('all').get(id).get('debit', 0.0), all_account_period.get('all').get(id).get('credit',0.0), all_account_period.get('all').get(id).get('balance')])
res.update({ res.update({
'dbr5': self.exchange(d), 'dbr5': self.exchange(d),
'cdr5': self.exchange(c), 'cdr5': self.exchange(c),
@ -586,7 +586,7 @@ class account_balance(report_sxw.rml_parse):
}) })
else: else:
i, d, c = map(z, [ i, d, c = map(z, [
all_account_period['all'][id]['balanceinit'], all_account_period['all'][id]['debit'], all_account_period['all'][id]['credit']])
all_account_period.get('all').get(id).get('balanceinit', 0.0), all_account_period.get('all').get(id).get('debit', 0.0), all_account_period.get('all').get(id).get('credit',0.0)])
b = z(i+d-c) b = z(i+d-c)
res.update({ res.update({
'dbr5': self.exchange(d), 'dbr5': self.exchange(d),
@ -600,7 +600,7 @@ class account_balance(report_sxw.rml_parse):
if form['inf_type'] == 'IS': if form['inf_type'] == 'IS':
d, c, b = map(z, [ d, c, b = map(z, [
all_account_period[p_num].get(id).get('debit', 0.0), all_account_period[p_num].get(id).get('credit', 0.0), all_account_period[p_num].get(id).get('balance', 0.0)])
all_account_period.get(p_num).get(id).get('debit', 0.0), all_account_period.get(p_num).get(id).get('credit', 0.0), all_account_period.get(p_num).get(id).get('balance', 0.0)])
res.update({ res.update({
'dbr%s' % pn: self.exchange(d), 'dbr%s' % pn: self.exchange(d),
'cdr%s' % pn: self.exchange(c), 'cdr%s' % pn: self.exchange(c),
@ -608,7 +608,7 @@ class account_balance(report_sxw.rml_parse):
}) })
else: else:
i, d, c = map(z, [ i, d, c = map(z, [
all_account_period[p_num].get(id).get('balanceinit', 0.0), all_account_period[p_num].get(id).get('debit', 0.0), all_account_period[p_num].get(id).get('credit', 0.0)])
all_account_period.get(p_num).get(id).get('balanceinit', 0.0), all_account_period.get(p_num).get(id).get('debit', 0.0), all_account_period.get(p_num).get(id).get('credit', 0.0)])
b = z(i+d-c) b = z(i+d-c)
res.update({ res.update({
'dbr%s' % pn: self.exchange(d), 'dbr%s' % pn: self.exchange(d),
@ -620,7 +620,7 @@ class account_balance(report_sxw.rml_parse):
if form['inf_type'] == 'IS': if form['inf_type'] == 'IS':
d, c, b = map(z, [ d, c, b = map(z, [
all_account_period['all'].get(id).get('debit', 0.0), all_account_period['all'].get(id).get('credit', 0.0), all_account_period['all'].get(id).get('balance', 0.0)])
all_account_period.get('all').get(id).get('debit', 0.0), all_account_period.get('all').get(id).get('credit', 0.0), all_account_period.get('all').get(id).get('balance', 0.0)])
res.update({ res.update({
'dbr13': self.exchange(d), 'dbr13': self.exchange(d),
'cdr13': self.exchange(c), 'cdr13': self.exchange(c),
@ -628,7 +628,7 @@ class account_balance(report_sxw.rml_parse):
}) })
else: else:
i, d, c = map(z, [ i, d, c = map(z, [
all_account_period['all'].get(id).get('balanceinit', 0.0), all_account_period['all'].get(id).get('debit', 0.0), all_account_period['all'].get(id).get('credit', 0.0)])
all_account_period.get('all').get(id).get('balanceinit', 0.0), all_account_period.get('all').get(id).get('debit', 0.0), all_account_period.get('all').get(id).get('credit', 0.0)])
b = z(i+d-c) b = z(i+d-c)
res.update({ res.update({
'dbr13': self.exchange(d), 'dbr13': self.exchange(d),
@ -638,7 +638,7 @@ class account_balance(report_sxw.rml_parse):
else: else:
i, d, c = map(z, [ i, d, c = map(z, [
all_account_period['all'].get(id).get('balanceinit', 0.0), all_account_period['all'].get(id).get('debit', 0.0), all_account_period['all'].get(id).get('credit', 0.0)])
all_account_period.get('all').get(id).get('balanceinit', 0.0), all_account_period.get('all').get(id).get('debit', 0.0), all_account_period.get('all').get(id).get('credit', 0.0)])
b = z(i+d-c) b = z(i+d-c)
res.update({ res.update({
'balanceinit': self.exchange(i), 'balanceinit': self.exchange(i),

Write Preview
Loading…
Cancel
Save