Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rushabh Mehta 2012-11-22 13:58:48 +01:00
commit 56eed7500d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
accounts/page/voucher_import_tool/voucher_import_tool.py
View File

@ -208,15 +208,17 @@ def get_data(rows, company_abbr):
for acc_idx in xrange(len(accounts)):
col_idx = len(columns) + acc_idx
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:
total_debit += flt(r[col_idx])
else:
total_credit += abs(flt(r[col_idx]))
d['total_debit'] = total_debit
d['total_credit'] = total_credit
data.append([d, acc_dict])