From 4b5ced03ec1220a03726271664baa11dc9039e0e Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 20 Dec 2013 12:26:48 +0530 Subject: [PATCH] Fixes in merge functions --- accounts/doctype/account/account.py | 3 +++ stock/doctype/item/item.py | 3 +++ stock/doctype/warehouse/warehouse.py | 3 +++ 3 files changed, 9 insertions(+) diff --git a/accounts/doctype/account/account.py b/accounts/doctype/account/account.py index cae202847b..0640ad9783 100644 --- a/accounts/doctype/account/account.py +++ b/accounts/doctype/account/account.py @@ -211,6 +211,9 @@ class DocType: # Validate properties before merging if merge: + if not webnotes.conn.exists("Account", new): + webnotes.throw(_("Account ") + new +_(" does not exists")) + val = list(webnotes.conn.get_value("Account", new_account, ["group_or_ledger", "debit_or_credit", "is_pl_account"])) diff --git a/stock/doctype/item/item.py b/stock/doctype/item/item.py index 01f1d9f38f..8dbfef7bac 100644 --- a/stock/doctype/item/item.py +++ b/stock/doctype/item/item.py @@ -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]: diff --git a/stock/doctype/warehouse/warehouse.py b/stock/doctype/warehouse/warehouse.py index 3559960d22..8b1b5b5a1d 100644 --- a/stock/doctype/warehouse/warehouse.py +++ b/stock/doctype/warehouse/warehouse.py @@ -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"))