Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/accounts/doctype/journal_voucher/journal_voucher.py b/accounts/doctype/journal_voucher/journal_voucher.py
index 27b0518..aca5aec 100644
--- a/accounts/doctype/journal_voucher/journal_voucher.py
+++ b/accounts/doctype/journal_voucher/journal_voucher.py
@@ -231,11 +231,12 @@
for d in self.doclist.get({"parentfield": "entries"}):
if d.against_invoice and webnotes.conn.get_value("Sales Invoice",
d.against_invoice, "debit_to") != d.account:
- msgprint("Debit account is not matching with Sales Invoice", raise_exception=1)
+ webnotes.throw(_("Credited account (Customer) is not matching with Sales Invoice"))
if d.against_voucher and webnotes.conn.get_value("Purchase Invoice",
d.against_voucher, "credit_to") != d.account:
- msgprint("Credit account is not matching with Purchase Invoice", raise_exception=1)
+ webnotes.throw(_("Debited account (Supplier) is not matching with \
+ Purchase Invoice"))
def make_gl_entries(self, cancel=0, adv_adj=0):
from accounts.general_ledger import make_gl_entries
diff --git a/stock/doctype/item/item.py b/stock/doctype/item/item.py
index 9ae1bfd..e6c277e 100644
--- a/stock/doctype/item/item.py
+++ b/stock/doctype/item/item.py
@@ -272,4 +272,4 @@
from stock.stock_ledger import update_entries_after
for wh in webnotes.conn.sql("""select warehouse from `tabBin`
where item_code=%s""", newdn):
- update_entries_after({"item_code": newdn, "warehouse": wh})
+ update_entries_after({"item_code": newdn, "warehouse": wh[0]})