Browse Source

[IMP] Now it is possible to print the remaining reports

pull/7/merge
Humberto Arocha 12 years ago
parent
commit
7c2aec9627
  1. 73
      account_financial_report/report/parser.py

73
account_financial_report/report/parser.py

@ -615,6 +615,77 @@ class account_balance(report_sxw.rml_parse):
else:
all_account_period[p_act] = all_account
else:
if form['inf_type'] == 'IS':
ctx_to_use = _ctx_end(self.context.copy())
else:
ctx_i = _ctx_init(self.context.copy())
ctx_to_use = _ctx_end(self.context.copy())
account_black = account_obj.browse(
self.cr, self.uid, account_black_ids, ctx_to_use)
if form['inf_type'] == 'BS':
account_black_init = account_obj.browse(
self.cr, self.uid, account_black_ids, ctx_i)
#~ Negros
dict_black = {}
for i in account_black:
black_data = {}
black_data['obj'] = i
black_data['debit'] = i.debit
black_data['credit'] = i.credit
black_data['balance'] = i.balance
if form['inf_type'] == 'BS':
black_data['balanceinit'] = 0.0
dict_black[i.id] = black_data
if form['inf_type'] == 'BS':
for i in account_black_init:
dict_black[i.id]['balanceinit'] = i.balance
#########################
#~ No negros
dict_not_black = {}
for i in account_not_black:
not_black_data = {}
not_black_data['obj'] = i
not_black_data['debit'] = 0.0
not_black_data['credit'] = 0.0
not_black_data['balance'] = 0.0
if form['inf_type'] == 'BS':
not_black_data['balanceinit'] = 0.0
dict_not_black[i.id] = not_black_data
###########################
all_account = dict_black.copy(
) # se hace una copia, porque se modificara
print "##################"
for i in dict_not_black:
print dict_not_black[i].get('obj').name, dict_not_black[i].get('debit')
for acc_id in account_not_black_ids:
print dict_not_black[acc_id].get('obj').name
acc_childs = dict_not_black[acc_id].get('obj').child_id
for child_id in acc_childs:
dict_not_black[acc_id]['debit'] += all_account[
child_id.id].get('debit')
dict_not_black[acc_id]['credit'] += all_account[
child_id.id].get('credit')
dict_not_black[acc_id]['balance'] += all_account[
child_id.id].get('balance')
if form['inf_type'] == 'BS':
dict_not_black[acc_id]['balanceinit'] += all_account[
child_id.id].get('balanceinit')
all_account[acc_id] = dict_not_black[acc_id]
print "##################"
for i in all_account:
print all_account[i].get('obj').name, all_account[i].get('debit')
all_account_period['all'] = all_account
# pdb.set_trace()
# print "periodo 1 #######################"
# for i in all_account_period.get(1):
@ -744,7 +815,7 @@ class account_balance(report_sxw.rml_parse):
self.cr, self.uid, id, ctx_end)
i, d, c = map(z, [
aa_brw_init.balance, aa_brw_end.debit, aa_brw_end.credit])
all_account_period['all'][id]['balanceinit'], all_account_period['all'][id]['debit'], all_account_period['all'][id]['credit']])
b = z(i+d-c)
res.update({
'balanceinit': self.exchange(i),

Loading…
Cancel
Save