added customer get_query to allow search based on customer name. also don't show name again if id naming is based on customer name and not series
diff --git a/accounts/doctype/c_form/c_form.js b/accounts/doctype/c_form/c_form.js
index d9e5c68..adb989d 100644
--- a/accounts/doctype/c_form/c_form.js
+++ b/accounts/doctype/c_form/c_form.js
@@ -26,4 +26,6 @@
cur_frm.cscript.invoice_no = function(doc, cdt, cdn) {
var d = locals[cdt][cdn];
get_server_fields('get_invoice_details', d.invoice_no, 'invoice_details', doc, cdt, cdn, 1);
-}
\ No newline at end of file
+}
+
+cur_frm.fields_dict.customer.get_query = erpnext.utils.customer_query;
\ No newline at end of file
diff --git a/production/doctype/production_planning_tool/production_planning_tool.js b/production/doctype/production_planning_tool/production_planning_tool.js
index 11d6e44..9caf829 100644
--- a/production/doctype/production_planning_tool/production_planning_tool.js
+++ b/production/doctype/production_planning_tool/production_planning_tool.js
@@ -48,3 +48,8 @@
var d = locals[this.doctype][this.docname];
return 'SELECT DISTINCT `tabBOM`.`name` FROM `tabBOM` WHERE `tabBOM`.`item` = "' + d.item_code + '" AND `tabBOM`.`is_active` = "Yes" AND `tabBOM`.docstatus = 1 AND `tabBOM`.`name` like "%s" ORDER BY `tabBOM`.`name` LIMIT 50';
}
+
+cur_frm.fields_dict.customer.get_query = erpnext.utils.customer_query;
+
+cur_frm.fields_dict.pp_so_details.grid.get_field("customer").get_query =
+ erpnext.utils.customer_query;
\ No newline at end of file
diff --git a/projects/doctype/project/project.js b/projects/doctype/project/project.js
index 5605441..7f847b9 100644
--- a/projects/doctype/project/project.js
+++ b/projects/doctype/project/project.js
@@ -27,4 +27,6 @@
cur_frm.gantt_area.empty();
erpnext.show_task_gantt(cur_frm.gantt_area, cur_frm.docname);
}
-}
\ No newline at end of file
+}
+
+cur_frm.fields_dict.customer.get_query = erpnext.utils.customer_query;
\ No newline at end of file
diff --git a/projects/doctype/task/task.js b/projects/doctype/task/task.js
index 295c58e..18c1653 100644
--- a/projects/doctype/task/task.js
+++ b/projects/doctype/task/task.js
@@ -27,6 +27,8 @@
if(doc.project) get_server_fields('get_project_details', '','', doc, cdt, cdn, 1);
}
+
+// TODO: remove these? field doesn't exist, but custom field could exist
cur_frm.fields_dict['customer'].get_query = function(doc,cdt,cdn){
var cond='';
if(doc.project) cond = 'ifnull(`tabProject`.customer, "") = `tabCustomer`.name AND ifnull(`tabProject`.name, "") = "'+doc.project+'" AND';
diff --git a/projects/doctype/task/task.py b/projects/doctype/task/task.py
index 423d343..175379f 100644
--- a/projects/doctype/task/task.py
+++ b/projects/doctype/task/task.py
@@ -41,7 +41,8 @@
if cust:
ret = {'customer': cust and cust[0][0] or '', 'customer_name': cust and cust[0][1] or ''}
return ret
-
+
+ # TODO: Remove these? as the field customer doesn't exists
def get_customer_details(self):
cust = sql("select customer_name from `tabCustomer` where name=%s", self.doc.customer)
if cust:
diff --git a/projects/doctype/timesheet/timesheet.js b/projects/doctype/timesheet/timesheet.js
index 81f0420..dc973fe 100644
--- a/projects/doctype/timesheet/timesheet.js
+++ b/projects/doctype/timesheet/timesheet.js
@@ -44,4 +44,7 @@
if(d.project_name) cond = 'ifnull(`tabTask`.project, "") = "'+d.project_name+'" AND';
return repl('SELECT distinct `tabTask`.`subject` FROM `tabTask` WHERE %(cond)s `tabTask`.`subject` LIKE "%s" ORDER BY `tabTask`.`subject` ASC LIMIT 50', {cond:cond});
-}
\ No newline at end of file
+}
+
+cur_frm.fields_dict.timesheet_details.grid.get_field("customer_name").get_query =
+ erpnext.utils.customer_query;
\ No newline at end of file
diff --git a/public/js/account_tree_grid.js b/public/js/account_tree_grid.js
index cf33ee4..10e1dac 100644
--- a/public/js/account_tree_grid.js
+++ b/public/js/account_tree_grid.js
@@ -105,7 +105,7 @@
}
me.init_account(d);
- });
+ });
}
this.set_indent();
this.prepare_balances();
diff --git a/public/js/utils.js b/public/js/utils.js
index 185baa6..4398498 100644
--- a/public/js/utils.js
+++ b/public/js/utils.js
@@ -51,3 +51,35 @@
case when company_name like \"%s%%\" then 0 else 1 end, \
lead_name asc limit 50";
};
+
+// searches for customer
+erpnext.utils.customer_query = function() {
+ if(sys_defaults.cust_master_name == "Customer Name") {
+ var fields = ["name", "customer_group", "country", "territory"];
+ } else {
+ var fields = ["name", "customer_name", "customer_group", "country", "territory"];
+ }
+
+ return "select " + fields.join(", ") + " from `tabCustomer` where docstatus < 2 and \
+ (%(key)s like \"%s\" or customer_name like \"%%%s\") \
+ order by \
+ case when name like \"%s%%\" then 0 else 1 end, \
+ case when customer_name like \"%s%%\" then 0 else 1 end, \
+ name, customer_name limit 50";
+};
+
+// searches for supplier
+erpnext.utils.supplier_query = function() {
+ if(sys_defaults.supp_master_name == "Supplier Name") {
+ var fields = ["name", "supplier_type"];
+ } else {
+ var fields = ["name", "supplier_name", "supplier_type"];
+ }
+
+ return "select " + fields.join(", ") + " from `tabSupplier` where docstatus < 2 and \
+ (%(key)s like \"%s\" or supplier_name like \"%%%s\") \
+ order by \
+ case when name like \"%s%%\" then 0 else 1 end, \
+ case when supplier_name like \"%s%%\" then 0 else 1 end, \
+ name, supplier_name limit 50";
+};
\ No newline at end of file
diff --git a/selling/doctype/installation_note/installation_note.js b/selling/doctype/installation_note/installation_note.js
index 44f6ac8..f298eda 100644
--- a/selling/doctype/installation_note/installation_note.js
+++ b/selling/doctype/installation_note/installation_note.js
@@ -83,3 +83,4 @@
return 'SELECT name,CONCAT(first_name," ",ifnull(last_name,"")) As FullName,department,designation FROM tabContact WHERE customer = "'+ doc.customer +'" AND docstatus != 2 AND name LIKE "%s" ORDER BY name ASC LIMIT 50';
}
+cur_frm.fields_dict.customer.get_query = erpnext.utils.customer_query;
\ No newline at end of file
diff --git a/selling/doctype/lead/lead.js b/selling/doctype/lead/lead.js
index 78182f2..8c940bc 100644
--- a/selling/doctype/lead/lead.js
+++ b/selling/doctype/lead/lead.js
@@ -148,4 +148,6 @@
//get query select Territory
cur_frm.fields_dict['territory'].get_query = function(doc,cdt,cdn) {
return 'SELECT `tabTerritory`.`name`,`tabTerritory`.`parent_territory` FROM `tabTerritory` WHERE `tabTerritory`.`is_group` = "No" AND `tabTerritory`.`docstatus`!= 2 AND `tabTerritory`.%(key)s LIKE "%s" ORDER BY `tabTerritory`.`name` ASC LIMIT 50';
-}
\ No newline at end of file
+}
+
+cur_frm.fields_dict.customer.get_query = erpnext.utils.customer_query;
\ No newline at end of file
diff --git a/selling/doctype/opportunity/opportunity.js b/selling/doctype/opportunity/opportunity.js
index 4070f5e..a729092 100644
--- a/selling/doctype/opportunity/opportunity.js
+++ b/selling/doctype/opportunity/opportunity.js
@@ -210,4 +210,6 @@
cur_frm.fields_dict['territory'].get_query = function(doc,cdt,cdn) {
return 'SELECT `tabTerritory`.`name`,`tabTerritory`.`parent_territory` FROM `tabTerritory` WHERE `tabTerritory`.`is_group` = "No" AND `tabTerritory`.`docstatus`!= 2 AND `tabTerritory`.%(key)s LIKE "%s" ORDER BY `tabTerritory`.`name` ASC LIMIT 50';}
-cur_frm.fields_dict.lead.get_query = erpnext.utils.lead_query;
\ No newline at end of file
+cur_frm.fields_dict.lead.get_query = erpnext.utils.lead_query;
+
+cur_frm.fields_dict.customer.get_query = erpnext.utils.customer_query;
\ No newline at end of file
diff --git a/selling/doctype/sales_common/sales_common.js b/selling/doctype/sales_common/sales_common.js
index be6f3f1..65112b5 100644
--- a/selling/doctype/sales_common/sales_common.js
+++ b/selling/doctype/sales_common/sales_common.js
@@ -857,3 +857,5 @@
validated = false;
}
}
+
+cur_frm.fields_dict.customer.get_query = erpnext.utils.customer_query;
\ No newline at end of file
diff --git a/selling/doctype/shipping_address/shipping_address.js b/selling/doctype/shipping_address/shipping_address.js
index 0ac173a..deea4ed 100755
--- a/selling/doctype/shipping_address/shipping_address.js
+++ b/selling/doctype/shipping_address/shipping_address.js
@@ -18,3 +18,5 @@
// =====================================================================
cur_frm.add_fetch('customer','customer_name','customer_name');
cur_frm.add_fetch('customer','address','customer_address');
+
+cur_frm.fields_dict.customer.get_query = erpnext.utils.customer_query;
\ No newline at end of file
diff --git a/stock/doctype/bin/bin.py b/stock/doctype/bin/bin.py
index 2f78f9c..fdf9eeb 100644
--- a/stock/doctype/bin/bin.py
+++ b/stock/doctype/bin/bin.py
@@ -273,7 +273,7 @@
self.exc_list = []
for sle in sll:
# block if stock level goes negative on any date
- if val_method != 'Moving Average' or flt(allow_negative_stock) == 0:
+ if (val_method != 'Moving Average') or (cint(allow_negative_stock) == 0):
if self.validate_negative_stock(cqty, sle):
cqty += sle['actual_qty']
continue
diff --git a/stock/doctype/delivery_note/delivery_note.js b/stock/doctype/delivery_note/delivery_note.js
index e1f8b37..4a3910a 100644
--- a/stock/doctype/delivery_note/delivery_note.js
+++ b/stock/doctype/delivery_note/delivery_note.js
@@ -332,4 +332,4 @@
doctype: 'Delivery Note'
}
cur_frm.cscript.notify(doc, args);
-}
+}
\ No newline at end of file
diff --git a/stock/doctype/item/item.js b/stock/doctype/item/item.js
index 332a3f0..c5501d5 100644
--- a/stock/doctype/item/item.js
+++ b/stock/doctype/item/item.js
@@ -141,4 +141,7 @@
cur_frm.fields_dict['ref_rate_details'].grid.onrowadd = function(doc, cdt, cdn){
locals[cdt][cdn].ref_currency = sys_defaults.currency;
refresh_field('ref_currency',cdn,'ref_rate_details');
-}
\ No newline at end of file
+}
+
+cur_frm.fields_dict.item_customer_details.grid.get_field("customer_name").get_query =
+ erpnext.utils.customer_query;
\ No newline at end of file
diff --git a/stock/doctype/serial_no/serial_no.js b/stock/doctype/serial_no/serial_no.js
index 901acd2..62a9126 100644
--- a/stock/doctype/serial_no/serial_no.js
+++ b/stock/doctype/serial_no/serial_no.js
@@ -67,4 +67,6 @@
WHERE `tabItem`.`docstatus`!= 2 AND ifnull(`tabItem`.`has_serial_no`, "No") = "Yes" \
AND (ifnull(`tabItem`.`end_of_life`,"") = "" OR `tabItem`.`end_of_life` > NOW() OR `tabItem`.`end_of_life`="0000-00-00") \
AND `tabItem`.%(key)s LIKE "%s" ORDER BY `tabItem`.`name` ASC LIMIT 50';
-}
\ No newline at end of file
+}
+
+cur_frm.fields_dict.customer.get_query = erpnext.utils.customer_query;
\ No newline at end of file
diff --git a/stock/doctype/stock_entry/stock_entry.js b/stock/doctype/stock_entry/stock_entry.js
index b40a413..859bd58 100644
--- a/stock/doctype/stock_entry/stock_entry.js
+++ b/stock/doctype/stock_entry/stock_entry.js
@@ -230,3 +230,5 @@
validated = false;
}
}
+
+cur_frm.fields_dict.customer.get_query = erpnext.utils.customer_query;
\ No newline at end of file
diff --git a/support/doctype/communication/communication.js b/support/doctype/communication/communication.js
index 76161ab..9995729 100644
--- a/support/doctype/communication/communication.js
+++ b/support/doctype/communication/communication.js
@@ -136,4 +136,6 @@
cur_frm.cscript.hide_dialog = function() {
if(cur_frm.communication_list)
cur_frm.communication_list.run();
-}
\ No newline at end of file
+}
+
+cur_frm.fields_dict.customer.get_query = erpnext.utils.customer_query;
\ No newline at end of file
diff --git a/support/doctype/customer_issue/customer_issue.js b/support/doctype/customer_issue/customer_issue.js
index 545ff56..81c10d4 100644
--- a/support/doctype/customer_issue/customer_issue.js
+++ b/support/doctype/customer_issue/customer_issue.js
@@ -144,3 +144,5 @@
WHERE `tabTerritory`.`is_group` = "No" AND `tabTerritory`.`docstatus`!= 2 \
AND `tabTerritory`.%(key)s LIKE "%s" ORDER BY `tabTerritory`.`name` ASC LIMIT 50';
}
+
+cur_frm.fields_dict.customer.get_query = erpnext.utils.customer_query;
\ No newline at end of file
diff --git a/support/doctype/maintenance_schedule/maintenance_schedule.js b/support/doctype/maintenance_schedule/maintenance_schedule.js
index efa3eac..21d2e62 100644
--- a/support/doctype/maintenance_schedule/maintenance_schedule.js
+++ b/support/doctype/maintenance_schedule/maintenance_schedule.js
@@ -131,3 +131,5 @@
cur_frm.fields_dict['territory'].get_query = function(doc,cdt,cdn) {
return 'SELECT `tabTerritory`.`name`,`tabTerritory`.`parent_territory` FROM `tabTerritory` WHERE `tabTerritory`.`is_group` = "No" AND `tabTerritory`.`docstatus`!= 2 AND `tabTerritory`.%(key)s LIKE "%s" ORDER BY `tabTerritory`.`name` ASC LIMIT 50';
}
+
+cur_frm.fields_dict.customer.get_query = erpnext.utils.customer_query;
\ No newline at end of file
diff --git a/support/doctype/maintenance_visit/maintenance_visit.js b/support/doctype/maintenance_visit/maintenance_visit.js
index 1e5e9c8..a53c090 100644
--- a/support/doctype/maintenance_visit/maintenance_visit.js
+++ b/support/doctype/maintenance_visit/maintenance_visit.js
@@ -114,3 +114,5 @@
cur_frm.fields_dict['territory'].get_query = function(doc,cdt,cdn) {
return 'SELECT `tabTerritory`.`name`,`tabTerritory`.`parent_territory` FROM `tabTerritory` WHERE `tabTerritory`.`is_group` = "No" AND `tabTerritory`.`docstatus`!= 2 AND `tabTerritory`.%(key)s LIKE "%s" ORDER BY `tabTerritory`.`name` ASC LIMIT 50';
}
+
+cur_frm.fields_dict.customer.get_query = erpnext.utils.customer_query;
\ No newline at end of file
diff --git a/support/doctype/support_ticket/support_ticket.js b/support/doctype/support_ticket/support_ticket.js
index 50f49b0..6ab2c68 100644
--- a/support/doctype/support_ticket/support_ticket.js
+++ b/support/doctype/support_ticket/support_ticket.js
@@ -189,4 +189,6 @@
this.make();
}
-cur_frm.fields_dict.allocated_to.get_query = erpnext.utils.profile_query;
\ No newline at end of file
+cur_frm.fields_dict.allocated_to.get_query = erpnext.utils.profile_query;
+
+cur_frm.fields_dict.customer.get_query = erpnext.utils.customer_query;
\ No newline at end of file
diff --git a/support/doctype/support_ticket/support_ticket.py b/support/doctype/support_ticket/support_ticket.py
index d04f473..dde4fd2 100644
--- a/support/doctype/support_ticket/support_ticket.py
+++ b/support/doctype/support_ticket/support_ticket.py
@@ -56,7 +56,7 @@
msg=response)
self.doc.new_response = None
- webnotes.conn.set(self.doc,'status','Waiting for Customer')
+ webnotes.conn.set(self.doc, 'status', 'Waiting for Customer')
self.make_response_record(response)
def last_response(self):
diff --git a/utilities/doctype/address/address.js b/utilities/doctype/address/address.js
index 3b27ba8..0ace167 100644
--- a/utilities/doctype/address/address.js
+++ b/utilities/doctype/address/address.js
@@ -41,4 +41,4 @@
cur_frm.address_list.run();
}
-
+cur_frm.fields_dict.customer.get_query = erpnext.utils.customer_query;
\ No newline at end of file
diff --git a/utilities/doctype/contact/contact.js b/utilities/doctype/contact/contact.js
index 1b0894e..5c71acf 100644
--- a/utilities/doctype/contact/contact.js
+++ b/utilities/doctype/contact/contact.js
@@ -42,4 +42,4 @@
cur_frm.contact_list.run();
}
-
+cur_frm.fields_dict.customer.get_query = erpnext.utils.customer_query;