Merge branch 'master' of github.com:webnotes/erpnext

This commit is contained in:
Rushabh Mehta 2012-11-22 13:58:48 +01:00
commit 56eed7500d

View File

@ -208,7 +208,9 @@ def get_data(rows, company_abbr):
for acc_idx in xrange(len(accounts)): for acc_idx in xrange(len(accounts)):
col_idx = len(columns) + acc_idx col_idx = len(columns) + acc_idx
if flt(r[col_idx]) != 0: if flt(r[col_idx]) != 0:
acc_dict[accounts[acc_idx]] = r[col_idx] if not acc_dict.get(accounts[acc_idx]):
acc_dict[accounts[acc_idx]] = 0
acc_dict[accounts[acc_idx]] += flt(r[col_idx])
if flt(r[col_idx]) > 0: if flt(r[col_idx]) > 0:
total_debit += flt(r[col_idx]) total_debit += flt(r[col_idx])
else: else: