fixes in voucher import tool
diff --git a/accounts/doctype/journal_voucher/journal_voucher.py b/accounts/doctype/journal_voucher/journal_voucher.py
index 4f20308..eafd7ee 100644
--- a/accounts/doctype/journal_voucher/journal_voucher.py
+++ b/accounts/doctype/journal_voucher/journal_voucher.py
@@ -51,7 +51,7 @@
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 @@
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 0d3a7f7..f99a078 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 @@
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 "<br>".join(webnotes.message_log) or unicode(e)
messages.append("""<p style='color: red'>[row #%s] %s failed: %s</p>"""
% ((start_idx + 1) + i, jv.name or "", err_msg or "No message"))
messages.append("<p style='color: red'>All transactions rolled back</p>")