commit 649e2538e59a17a9e1488a07098e9c18a7056d3d
author Rushabh Mehta <rmehta@gmail.com> Wed Jul 20 15:30:17 2016 +0530
committer Rushabh Mehta <rmehta@gmail.com> Wed Jul 20 15:30:17 2016 +0530
tree f7a1ff95c656ca32592ea3b579b6aa7ea56e2b58
parent 2f0dbd9bd898006be30a7c3f93a993c18f4837f6

[fix] merge conflict?

erpnext/stock/stock_ledger.py

diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py
index 8d17a1e..fa6dd3c 100644
--- a/erpnext/stock/stock_ledger.py
+++ b/erpnext/stock/stock_ledger.py
@@ -346,9 +346,8 @@
 
 
 
-		if (frappe.local.flags.currently_saving
-			and frappe.local.flags.currently_saving.doctype==self.exceptions[0]["voucher_type"]
-			and frappe.local.flags.currently_saving.name==self.exceptions[0]["voucher_no"]):
+		if ((self.exceptions[0]["voucher_type"], self.exceptions[0]["voucher_no"]) in
+			frappe.local.flags.currently_saving):
 			msg = _("{0} units of {1} needed in {2} to complete this transaction.").format(
 				abs(deficiency), frappe.get_desk_link('Item', self.item_code),
 				frappe.get_desk_link('Warehouse', self.warehouse))