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

[ADD] time and ordered list of account

pull/7/merge
Yanina Aular 2013-06-19 09:22:17 -05:30
parent 81a1cb167f
commit 313e5d801c
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
account_financial_report/report/parser.py
View File

@ -347,7 +347,7 @@ class account_balance(report_sxw.rml_parse):
################################################################ ################################################################
# Get the accounts # # Get the accounts #
################################################################ ################################################################
start_time = time.clock()
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)
@ -359,7 +359,7 @@ class account_balance(report_sxw.rml_parse):
credit_account_ids = list(set( credit_account_ids = list(set(
credit_account_ids) - set(debit_account_ids)) credit_account_ids) - set(debit_account_ids))
print time.clock() - start_time, "seconds"
# #
# Generate the report lines (checking each account) # Generate the report lines (checking each account)
# #
@ -432,8 +432,25 @@ class account_balance(report_sxw.rml_parse):
result_acc = [] result_acc = []
tot = {} tot = {}
account_ids_x = account_obj.search(self.cr , self.uid, ([('id', 'in', [i[0] for i in account_ids]),('type','not in',('view','consolidation'))])) account_ids_black = account_obj.search(self.cr, self.uid, ([('id', 'in', [i[0] for i in account_ids]),('type','not in',('view','consolidation'))]))
print account_ids_x account_ids_black = account_obj.browse(self.cr, self.uid, account_ids_black)
account_ids_not_black = account_obj.search(self.cr, self.uid, ([('id', 'in', [i[0] for i in account_ids]),('type','in',('view','consolidation'))]))
account_ids_not_black = account_obj.browse(self.cr, self.uid, account_ids_not_black)
account_ids_not_black.sort(key=lambda x: x.level)
account_ids_not_black.reverse()
print "Negros"
for i in account_ids_black:
print i.name
print i.level
print "No Negros"
for i in account_ids_not_black:
print i.name
print i.level
start_time = time.clock()
for aa_id in account_ids: for aa_id in account_ids:
id = aa_id[0] id = aa_id[0]
@ -707,7 +724,8 @@ class account_balance(report_sxw.rml_parse):
tot_crd += res['credit'] tot_crd += res['credit']
tot_ytd += res['ytd'] tot_ytd += res['ytd']
tot_eje += res['balance'] tot_eje += res['balance']
print time.clock() - start_time, "seconds"
if tot_check: if tot_check:
str_label = form['lab_str'] str_label = form['lab_str']
res2 = { res2 = {