Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix] merge conflict?

Browse Source
This commit is contained in:
Rushabh Mehta 2016-07-20 15:30:17 +05:30
parent 2f0dbd9bd8
commit 649e2538e5
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/stock/stock_ledger.py
View File

@ -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))