From bb2bb03bccbd5b95b4f28ed3758843586d4e5191 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 10 Sep 2012 15:13:22 +0530 Subject: [PATCH 1/3] fix in bin reorder item condition --- erpnext/stock/doctype/bin/bin.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/bin/bin.py b/erpnext/stock/doctype/bin/bin.py index f2cd873e0f..442e4a79d7 100644 --- a/erpnext/stock/doctype/bin/bin.py +++ b/erpnext/stock/doctype/bin/bin.py @@ -344,7 +344,8 @@ class DocType: and t1.docstatus != 2 """, self.doc.item_code) - if ((flt(ret[0]['re_order_level']) > flt(current_qty[0][0])) and ret[0]['re_order_level']): + if ret[0]["re_order_level"] and current_qty and \ + (flt(ret[0]['re_order_level']) > flt(current_qty[0][0])): self.create_auto_indent(ret[0], doc_type, doc_name, current_qty[0][0]) From ff6754ccf4555a88a06c6981b1f0819792af4fc3 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 10 Sep 2012 15:46:38 +0530 Subject: [PATCH 2/3] fix in bin query --- erpnext/stock/doctype/bin/bin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/bin/bin.py b/erpnext/stock/doctype/bin/bin.py index 442e4a79d7..e413c02893 100644 --- a/erpnext/stock/doctype/bin/bin.py +++ b/erpnext/stock/doctype/bin/bin.py @@ -333,7 +333,7 @@ class DocType: if get_value('Global Defaults', None, 'auto_indent'): #check if re-order is required - ret = sql("select re_order_level, item_name, description, brand, item_group, lead_time_days, min_order_qty, email_notify, re_order_qty from tabItem where item_code = %s", (self.doc.item_code), as_dict=1) + ret = sql("select re_order_level, item_name, description, brand, item_group, lead_time_days, min_order_qty, email_notify, re_order_qty from tabItem where name = %s", (self.doc.item_code), as_dict=1) current_qty = sql(""" select sum(t1.actual_qty) + sum(t1.indented_qty) + sum(t1.ordered_qty) -sum(t1.reserved_qty) From 94dd7ef8796dd4940658a96414e1926730ab007a Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 12 Sep 2012 14:53:44 +0530 Subject: [PATCH 3/3] show employee name in employee link field in attendance form --- erpnext/hr/doctype/attendance/attendance.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/hr/doctype/attendance/attendance.js b/erpnext/hr/doctype/attendance/attendance.js index 4ccc63ed9b..120a50e318 100644 --- a/erpnext/hr/doctype/attendance/attendance.js +++ b/erpnext/hr/doctype/attendance/attendance.js @@ -18,13 +18,13 @@ cur_frm.add_fetch('employee', 'company', 'company'); //get employee's name based on employee id selected cur_frm.cscript.employee = function(doc,cdt,cdn){ - if(doc.employee) get_server_fields('get_emp_name', '', '', doc, cdt, cdn, 1); - refresh_field('employee_name'); + if(doc.employee) get_server_fields('get_emp_name', '', '', doc, cdt, cdn, 1); + refresh_field('employee_name'); } //Employee //----------------------------- cur_frm.fields_dict['employee'].get_query = function(doc,cdt,cdn) { - return 'SELECT `tabEmployee`.`name` FROM `tabEmployee` WHERE `tabEmployee`.status = "Active" AND `tabEmployee`.`docstatus`!= 2 AND `tabEmployee`.%(key)s LIKE "%s" ORDER BY `tabEmployee`.`name` ASC LIMIT 50'; + return 'SELECT `tabEmployee`.`name`, `tabEmployee`.`employee_name` FROM `tabEmployee` WHERE `tabEmployee`.status = "Active" AND `tabEmployee`.`docstatus`!= 2 AND (`tabEmployee`.`employee_name` LIKE "%s" OR `tabEmployee`.`%(key)s` LIKE "%s") ORDER BY `tabEmployee`.`name` ASC LIMIT 50'; }