nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-05 21:29:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1220 from nabinhait/hotfix

Browse Source 
Fixes in stock projected qty report
This commit is contained in:
Pratik Vyas
2013-12-20 01:36:27 -08:00
parent ae2e8996b0 4b5ced03ec
commit 6fc0262cb6
6 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
stock/doctype/item/item.py
View File

@@ -246,6 +246,9 @@ class DocType(DocListController, WebsiteGenerator):
def before_rename(self, olddn, newdn, merge=False):
if merge:
# Validate properties before merging
if not webnotes.conn.exists("Item", newdn):
webnotes.throw(_("Item ") + newdn +_(" does not exists"))
field_list = ["stock_uom", "is_stock_item", "has_serial_no", "has_batch_no"]
new_properties = [cstr(d) for d in webnotes.conn.get_value("Item", newdn, field_list)]
if new_properties != [cstr(self.doc.fields[fld]) for fld in field_list]:

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

@@ -84,6 +84,9 @@ class DocType:
new_warehouse = get_name_with_abbr(newdn, self.doc.company)
if merge:
if not webnotes.conn.exists("Warehouse", newdn):
webnotes.throw(_("Warehouse ") + newdn +_(" does not exists"))
if self.doc.company != webnotes.conn.get_value("Warehouse", new_warehouse, "company"):
webnotes.throw(_("Both Warehouse must belong to same Company"))