From 313e5d801c6c919c8db7a4fa9a6e1ddef07b1d9d Mon Sep 17 00:00:00 2001 From: Yanina Aular Date: Wed, 19 Jun 2013 09:22:17 -0530 Subject: [PATCH] [ADD] time and ordered list of account --- account_financial_report/report/parser.py | 28 +++++++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/account_financial_report/report/parser.py b/account_financial_report/report/parser.py index 5dcacf17..6b3e68a9 100644 --- a/account_financial_report/report/parser.py +++ b/account_financial_report/report/parser.py @@ -347,7 +347,7 @@ class account_balance(report_sxw.rml_parse): ################################################################ # Get the accounts # ################################################################ - + start_time = time.clock() 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) @@ -359,7 +359,7 @@ class account_balance(report_sxw.rml_parse): credit_account_ids = list(set( credit_account_ids) - set(debit_account_ids)) - + print time.clock() - start_time, "seconds" # # Generate the report lines (checking each account) # @@ -432,8 +432,25 @@ class account_balance(report_sxw.rml_parse): result_acc = [] 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'))])) - print account_ids_x + account_ids_black = 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.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: id = aa_id[0] @@ -707,7 +724,8 @@ class account_balance(report_sxw.rml_parse): tot_crd += res['credit'] tot_ytd += res['ytd'] tot_eje += res['balance'] - + print time.clock() - start_time, "seconds" + if tot_check: str_label = form['lab_str'] res2 = {