From e343ac717391c068a568cde3285ebdb5b28c46be Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 6 Feb 2013 18:42:26 +0530 Subject: [PATCH] fixes in voucher import tool --- accounts/doctype/journal_voucher/journal_voucher.py | 4 +++- accounts/page/voucher_import_tool/voucher_import_tool.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/accounts/doctype/journal_voucher/journal_voucher.py b/accounts/doctype/journal_voucher/journal_voucher.py index 4f20308369..eafd7ee25c 100644 --- a/accounts/doctype/journal_voucher/journal_voucher.py +++ b/accounts/doctype/journal_voucher/journal_voucher.py @@ -51,7 +51,7 @@ class DocType(AccountsController): self.doc.posting_date, 'Posting Date') self.set_against_account() - self.create_remarks() + self.create_remarks() self.set_aging_date() self.set_print_format_fields() @@ -152,6 +152,8 @@ class DocType(AccountsController): if r: self.doc.remark = ("\n").join(r) + else: + webnotes.msgprint("Remarks is mandatory", raise_exception=1) def set_aging_date(self): if self.doc.is_opening != 'Yes': diff --git a/accounts/page/voucher_import_tool/voucher_import_tool.py b/accounts/page/voucher_import_tool/voucher_import_tool.py index 0d3a7f70cd..f99a0781e9 100644 --- a/accounts/page/voucher_import_tool/voucher_import_tool.py +++ b/accounts/page/voucher_import_tool/voucher_import_tool.py @@ -168,7 +168,7 @@ def import_vouchers(common_values, data, start_idx, import_type): webnotes.conn.commit() except Exception, e: webnotes.conn.rollback() - err_msg = webnotes.message_log and webnotes.message_log[0] or unicode(e) + err_msg = webnotes.message_log and "
".join(webnotes.message_log) or unicode(e) messages.append("""

[row #%s] %s failed: %s

""" % ((start_idx + 1) + i, jv.name or "", err_msg or "No message")) messages.append("

All transactions rolled back

")