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] rename variables 

(lp:c2c-addons/6.1  rev 80.1.7)
Guewen Baconnier @ Camptocamp 2012-09-11 15:11:35 +02:00
parent 641027a568
commit 099473ffc6
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
account_financial_report_webkit/report/common_partner_reports.py
View File

@ -324,3 +324,4 @@ class CommonPartnersReportHeaderWebkit(CommonReportHeaderWebkit):
if not res: if not res:
return [] return []
return res return res

13
account_financial_report_webkit/report/partners_ledger.py
View File

@ -127,14 +127,14 @@ class PartnersLedgerWebkit(report_sxw.rml_parse, CommonPartnersReportHeaderWebki
init_balance = main_filter in ('filter_no', 'filter_period') init_balance = main_filter in ('filter_no', 'filter_period')
initial_balance_mode = init_balance and self._get_initial_balance_mode(start) or False initial_balance_mode = init_balance and self._get_initial_balance_mode(start) or False
init_balance_memoizer = {} initial_balance_lines = {}
if initial_balance_mode == 'initial_balance': if initial_balance_mode == 'initial_balance':
init_balance_memoizer = self._compute_partners_initial_balances(accounts, initial_balance_lines = self._compute_partners_initial_balances(accounts,
start_period, start_period,
partner_filter=partner_ids, partner_filter=partner_ids,
exclude_reconcile=False) exclude_reconcile=False)
ledger_lines_memoizer = self._compute_partner_ledger_lines(accounts, ledger_lines = self._compute_partner_ledger_lines(accounts,
main_filter, main_filter,
target_move, target_move,
start, start,
@ -142,12 +142,12 @@ class PartnersLedgerWebkit(report_sxw.rml_parse, CommonPartnersReportHeaderWebki
partner_filter=partner_ids) partner_filter=partner_ids)
objects = [] objects = []
for account in self.pool.get('account.account').browse(self.cursor, self.uid, accounts): for account in self.pool.get('account.account').browse(self.cursor, self.uid, accounts):
account.ledger_lines = ledger_lines_memoizer.get(account.id, {}) account.ledger_lines = ledger_lines.get(account.id, {})
account.init_balance = init_balance_memoizer.get(account.id, {}) account.init_balance = initial_balance_lines.get(account.id, {})
## we have to compute partner order based on inital balance ## we have to compute partner order based on inital balance
## and ledger line as we may have partner with init bal ## and ledger line as we may have partner with init bal
## that are not in ledger line and vice versa ## that are not in ledger line and vice versa
ledg_lines_pids = ledger_lines_memoizer.get(account.id, {}).keys() ledg_lines_pids = ledger_lines.get(account.id, {}).keys()
if initial_balance_mode: if initial_balance_mode:
non_null_init_balances = dict([(ib, amounts) for ib, amounts in account.init_balance.iteritems() non_null_init_balances = dict([(ib, amounts) for ib, amounts in account.init_balance.iteritems()
if amounts['init_balance'] or amounts['init_balance_currency']]) if amounts['init_balance'] or amounts['init_balance_currency']])
@ -157,7 +157,6 @@ class PartnersLedgerWebkit(report_sxw.rml_parse, CommonPartnersReportHeaderWebki
init_bal_lines_pids = [] init_bal_lines_pids = []
account.partners_order = self._order_partners(ledg_lines_pids, init_bal_lines_pids) account.partners_order = self._order_partners(ledg_lines_pids, init_bal_lines_pids)
account.ledger_lines = ledger_lines_memoizer.get(account.id, {})
objects.append(account) objects.append(account)
self.localcontext.update({ self.localcontext.update({