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] Se afina metodo de consolidacion de cuentas

6.0
Humberto Arocha 2012-07-27 01:38:48 -05:30
parent c687bd8183
commit 417ff99db2
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
account_financial_report/report/parser.py
View File

@ -169,6 +169,7 @@ class account_balance(report_sxw.rml_parse):
if form.has_key('account_list') and form['account_list']: if form.has_key('account_list') and form['account_list']:
account_ids = form['account_list'] account_ids = form['account_list']
del form['account_list'] del form['account_list']
credit_account_ids = account_ids
res = {} res = {}
result_acc = [] result_acc = []
accounts_levels = {} accounts_levels = {}
@ -192,15 +193,26 @@ class account_balance(report_sxw.rml_parse):
ids2=[] ids2=[]
for aa_brw in aa_obj.browse(cr, uid, ids, context): for aa_brw in aa_obj.browse(cr, uid, ids, context):
if aa_brw.child_id and aa_brw.level < level and aa_brw.type !='consolidation': if aa_brw.child_id and aa_brw.level < level and aa_brw.type !='consolidation':
change_sign or ids2.append([aa_brw.id,True, False]) if not change_sign:
ids2 += _get_children_and_consol(cr, uid, [x.id for x in aa_brw.child_id], level, context) ids2.append([aa_brw.id,True, False])
change_sign and ids2.append(aa_brw.id) or ids2.append([aa_brw.id,False,True]) ids2 += _get_children_and_consol(cr, uid, [x.id for x in aa_brw.child_id], level, context,change_sign=change_sign)
if change_sign:
ids2.append(aa_brw.id)
else: else:
change_sign and ids2.append(aa_brw.id) or ids2.append([aa_brw.id,True,True]) ids2.append([aa_brw.id,False,True])
else:
if change_sign:
ids2.append(aa_brw.id)
else:
ids2.append([aa_brw.id,True,True])
return ids2 return ids2
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) 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)
credit_account_ids = _get_children_and_consol(self.cr, self.uid, credit_account_ids, 100,self.context,change_sign=True)
print 'credit_account_ids ', credit_account_ids
account_obj = self.pool.get('account.account') account_obj = self.pool.get('account.account')
period_obj = self.pool.get('account.period') period_obj = self.pool.get('account.period')
fiscalyear_obj = self.pool.get('account.fiscalyear') fiscalyear_obj = self.pool.get('account.fiscalyear')