From df5ab4e2287c80f0510f530cf1a9ff0f4e691ac0 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 21 Aug 2014 11:32:39 +0530 Subject: [PATCH 1/2] Minor fix in maintenance schedule --- .../doctype/maintenance_schedule/maintenance_schedule.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py index f276b56b03..4b06fe07fd 100644 --- a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +++ b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py @@ -194,6 +194,9 @@ class MaintenanceSchedule(TransactionBase): sr_details = frappe.db.get_value("Serial No", serial_no, ["warranty_expiry_date", "amc_expiry_date", "status", "delivery_date"], as_dict=1) + if not sr_details: + frappe.throw(_("Serial No {0} not found").format(serial_no)) + if sr_details.warranty_expiry_date and sr_details.warranty_expiry_date>=amc_start_date: throw(_("Serial No {0} is under warranty upto {1}").format(serial_no, sr_details.warranty_expiry_date)) From f71011aff094edab4426623d423cb501e4a4a19e Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 21 Aug 2014 11:34:31 +0530 Subject: [PATCH 2/2] Project query fixed --- erpnext/controllers/queries.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py index 4a30eed652..d555532419 100644 --- a/erpnext/controllers/queries.py +++ b/erpnext/controllers/queries.py @@ -200,7 +200,7 @@ def bom(doctype, txt, searchfield, start, page_len, filters): def get_project_name(doctype, txt, searchfield, start, page_len, filters): cond = '' - if filters['customer']: + if filters.get('customer'): cond = '(`tabProject`.customer = "' + filters['customer'] + '" or ifnull(`tabProject`.customer,"")="") and' return frappe.db.sql("""select `tabProject`.name from `tabProject`