From 649e2538e59a17a9e1488a07098e9c18a7056d3d Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 20 Jul 2016 15:30:17 +0530 Subject: [PATCH] [fix] merge conflict? --- erpnext/stock/stock_ledger.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py index 8d17a1eee3..fa6dd3c6bf 100644 --- a/erpnext/stock/stock_ledger.py +++ b/erpnext/stock/stock_ledger.py @@ -346,9 +346,8 @@ class update_entries_after(object): - 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))