From c9bfbf94f2ec6413d803d45936920e506b9548e4 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 23 Nov 2012 16:34:28 +0530 Subject: [PATCH] fix in voucher import tool --- .../page/voucher_import_tool/voucher_import_tool.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/accounts/page/voucher_import_tool/voucher_import_tool.py b/accounts/page/voucher_import_tool/voucher_import_tool.py index 4eb98bb11a..142b8b937c 100644 --- a/accounts/page/voucher_import_tool/voucher_import_tool.py +++ b/accounts/page/voucher_import_tool/voucher_import_tool.py @@ -206,7 +206,7 @@ def get_data(rows, company_abbr): if accounts: total_debit = total_credit = 0 for acc_idx in xrange(len(accounts)): - col_idx = len(columns) - 1 + acc_idx + col_idx = len(columns) + acc_idx if flt(r[col_idx]) != 0: if not acc_dict.get(accounts[acc_idx]): acc_dict[accounts[acc_idx]] = 0 @@ -215,7 +215,7 @@ def get_data(rows, company_abbr): total_debit += flt(r[col_idx]) else: total_credit += abs(flt(r[col_idx])) - + d['total_debit'] = total_debit d['total_credit'] = total_credit @@ -227,5 +227,9 @@ def get_data(rows, company_abbr): columns = [c.replace(" ", "_").lower() for c in rows[i+1] if not c.endswith(" - " + company_abbr)] accounts = [c for c in rows[i+1] if c.endswith(" - " + company_abbr)] - + + if accounts and (len(columns) != rows[i+1].index(accounts[0])): + raise Exception, """A non-account column cannot be after an account \ + column. Please rectify it in the file and try again.""" + return data, start_row_idx \ No newline at end of file