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

Fixes in warehouse merge function

Browse Source
This commit is contained in:
Nabin Hait 2014-01-21 20:57:39 +05:30
parent b2f2df4c64
commit 13a9e27320
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
stock/doctype/warehouse/warehouse.py
View File

@ -92,23 +92,19 @@ class DocType:
exists for this warehouse.""")) exists for this warehouse."""))
def before_rename(self, olddn, newdn, merge=False): def before_rename(self, olddn, newdn, merge=False):
# Add company abbr if not provided
from setup.doctype.company.company import get_name_with_abbr
new_warehouse = get_name_with_abbr(newdn, self.doc.company)
if merge: if merge:
if not webnotes.conn.exists("Warehouse", newdn): if not webnotes.conn.exists("Warehouse", newdn):
webnotes.throw(_("Warehouse ") + newdn +_(" does not exists")) webnotes.throw(_("Warehouse ") + newdn +_(" does not exists"))
if self.doc.company != webnotes.conn.get_value("Warehouse", new_warehouse, "company"): if self.doc.company != webnotes.conn.get_value("Warehouse", newdn, "company"):
webnotes.throw(_("Both Warehouse must belong to same Company")) webnotes.throw(_("Both Warehouse must belong to same Company"))
webnotes.conn.sql("delete from `tabBin` where warehouse=%s", olddn) webnotes.conn.sql("delete from `tabBin` where warehouse=%s", olddn)
from accounts.utils import rename_account_for from accounts.utils import rename_account_for
rename_account_for("Warehouse", olddn, new_warehouse, merge) rename_account_for("Warehouse", olddn, newdn, merge)
return new_warehouse return newdn
def after_rename(self, olddn, newdn, merge=False): def after_rename(self, olddn, newdn, merge=False):
if merge: if merge: