Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2197 from anandpdoshi/anand-september-15

Browse Source 
[minor] removed Suggest
This commit is contained in:
Anand Doshi 2014-09-16 15:18:57 +05:30
commit 8950abc36f
5 changed files with 1199 additions and 1217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/hr/doctype/employee/employee.json
View File

@ -326,7 +326,6 @@
"label": "Bank Name", "label": "Bank Name",
"oldfieldname": "bank_name", "oldfieldname": "bank_name",
"oldfieldtype": "Link", "oldfieldtype": "Link",
"options": "Suggest",
"permlevel": 0 "permlevel": 0
}, },
{ {
@ -674,7 +673,7 @@
], ],
"icon": "icon-user", "icon": "icon-user",
"idx": 1, "idx": 1,
"modified": "2014-08-27 05:55:00.514660", "modified": "2014-09-15 05:55:00.514660",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Employee", "name": "Employee",

13
erpnext/setup/doctype/contact_control/contact_control.js
View File

@ -1,19 +1,6 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors // Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt // License: GNU General Public License v3. See license.txt
cur_frm.cscript.get_states=function(doc, dt, dn) {
return $c('runserverobj', args={'method': 'check_state', 'docs':doc},
function(r, rt) {
if(r.message)
set_field_options('state', r.message);
}
);
}
cur_frm.cscript.country = function(doc, dt, dn) {
cur_frm.cscript.get_states(doc, dt, dn);
}
if(cur_frm.fields_dict['territory']) { if(cur_frm.fields_dict['territory']) {
cur_frm.fields_dict['territory'].get_query = function(doc, dt, dn) { cur_frm.fields_dict['territory'].get_query = function(doc, dt, dn) {
return { return {

3
erpnext/stock/doctype/warehouse/warehouse.json
View File

@ -135,7 +135,6 @@
"label": "State", "label": "State",
"oldfieldname": "state", "oldfieldname": "state",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "Suggest",
"permlevel": 0, "permlevel": 0,
"read_only": 0 "read_only": 0
}, },
@ -151,7 +150,7 @@
], ],
"icon": "icon-building", "icon": "icon-building",
"idx": 1, "idx": 1,
"modified": "2014-08-04 02:55:16.750848", "modified": "2014-09-15 02:55:16.750848",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Warehouse", "name": "Warehouse",

3
erpnext/utilities/doctype/address/address.json
View File

@ -59,7 +59,6 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "State", "label": "State",
"options": "Suggest",
"permlevel": 0, "permlevel": 0,
"search_index": 0 "search_index": 0
}, },
@ -199,7 +198,7 @@
"icon": "icon-map-marker", "icon": "icon-map-marker",
"idx": 1, "idx": 1,
"in_dialog": 0, "in_dialog": 0,
"modified": "2014-05-27 03:49:07.273657", "modified": "2014-09-15 03:49:07.273657",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Utilities", "module": "Utilities",
"name": "Address", "name": "Address",

4
erpnext/utilities/doctype/contact/contact.json
View File

@ -171,7 +171,6 @@
"fieldname": "department", "fieldname": "department",
"fieldtype": "Data", "fieldtype": "Data",
"label": "Department", "label": "Department",
"options": "Suggest",
"permlevel": 0 "permlevel": 0
}, },
{ {
@ -179,7 +178,6 @@
"fieldname": "designation", "fieldname": "designation",
"fieldtype": "Data", "fieldtype": "Data",
"label": "Designation", "label": "Designation",
"options": "Suggest",
"permlevel": 0 "permlevel": 0
}, },
{ {
@ -202,7 +200,7 @@
"idx": 1, "idx": 1,
"in_create": 0, "in_create": 0,
"in_dialog": 0, "in_dialog": 0,
"modified": "2014-07-30 05:44:25.767076", "modified": "2014-09-15 05:44:25.767076",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Utilities", "module": "Utilities",
"name": "Contact", "name": "Contact",