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

[IMP] calculation with level

pull/7/merge
Yanina Aular 2013-06-20 14:15:35 -05:30
parent d4588414e8
commit 1aff898d80
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
account_financial_report/report/parser.py
View File

@ -348,9 +348,12 @@ class account_balance(report_sxw.rml_parse):
################################################################ ################################################################
# Get the accounts # # Get the accounts #
################################################################ ################################################################
all_account_ids = _get_children_and_consol(self.cr, self.uid, account_ids, 100, self.context)
account_ids = _get_children_and_consol(self.cr, self.uid, account_ids, form[ account_ids = _get_children_and_consol(self.cr, self.uid, account_ids, form[
'display_account_level'] and form['display_account_level'] or 100, self.context) 'display_account_level'] and form['display_account_level'] or 100, self.context)
credit_account_ids = _get_children_and_consol( credit_account_ids = _get_children_and_consol(
self.cr, self.uid, credit_account_ids, 100, self.context, change_sign=True) self.cr, self.uid, credit_account_ids, 100, self.context, change_sign=True)
@ -411,12 +414,12 @@ class account_balance(report_sxw.rml_parse):
############################################################### ###############################################################
account_black_ids = account_obj.search(self.cr, self.uid, ( account_black_ids = account_obj.search(self.cr, self.uid, (
[('id', 'in', [i[0] for i in account_ids]), [('id', 'in', [i[0] for i in all_account_ids]),
('type', 'not in', ('type', 'not in',
('view', 'consolidation'))])) ('view', 'consolidation'))]))
account_not_black_ids = account_obj.search(self.cr, self.uid, ([('id', 'in', [ account_not_black_ids = account_obj.search(self.cr, self.uid, ([('id', 'in', [
i[0] for i in account_ids]), ('type', 'in', ('view', 'consolidation'))])) i[0] for i in all_account_ids]), ('type', 'in', ('view', 'consolidation'))]))
#This could be done quickly with a sql sentence #This could be done quickly with a sql sentence
account_not_black = account_obj.browse( account_not_black = account_obj.browse(
@ -490,6 +493,7 @@ class account_balance(report_sxw.rml_parse):
for acc_id in account_not_black_ids: for acc_id in account_not_black_ids:
acc_childs = dict_not_black.get(acc_id).get('obj').child_id acc_childs = dict_not_black.get(acc_id).get('obj').child_id
for child_id in acc_childs: for child_id in acc_childs:
#pdb.set_trace()
dict_not_black.get(acc_id)['debit'] += all_account.get( dict_not_black.get(acc_id)['debit'] += all_account.get(
child_id.id).get('debit') child_id.id).get('debit')
dict_not_black.get(acc_id)['credit'] += all_account.get( dict_not_black.get(acc_id)['credit'] += all_account.get(
@ -735,6 +739,12 @@ class account_balance(report_sxw.rml_parse):
'total': True, 'total': True,
} }
if form['columns'] == 'qtr': if form['columns'] == 'qtr':
for i in range(1, 6):
bal = 'bal%s' % i
res2[bal] = eval("tot_bal%s", self.context, mode='exec', nocopy=True)
#pdb.set_trace()
#eval("tot_bal%s += res.get('bal%s', 0.0)" % (i,i), self.context, mode='exec', nocopy=True)
res2.update(dict( res2.update(dict(
bal1=tot_bal1, bal1=tot_bal1,
bal2=tot_bal2, bal2=tot_bal2,