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

[minor] removed pscript from Feature Setup, made Activity Type as mandator in Time Log

Browse Source
This commit is contained in:
Anand Doshi 2015-01-29 19:49:34 +05:30
parent 06fa46fafe
commit aff9a59f2d
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/projects/doctype/time_log/time_log.json
View File

@ -76,7 +76,7 @@
"options": "Activity Type", "options": "Activity Type",
"permlevel": 0, "permlevel": 0,
"read_only": 0, "read_only": 0,
"reqd": 0 "reqd": 1
}, },
{ {
"depends_on": "eval:doc.time_log_for != 'Manufacturing'", "depends_on": "eval:doc.time_log_for != 'Manufacturing'",
@ -199,7 +199,7 @@
"icon": "icon-time", "icon": "icon-time",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2015-01-07 15:11:45.194002", "modified": "2015-01-29 07:36:29.343589",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Projects", "module": "Projects",
"name": "Time Log", "name": "Time Log",

14
erpnext/public/js/feature_setup.js
View File

@ -13,7 +13,8 @@ Dictionary Format
} }
} }
// ====================================================================*/ // ====================================================================*/
pscript.feature_dict = { frappe.provide("erpnext.feature_setup");
erpnext.feature_setup.feature_dict = {
'fs_projects': { 'fs_projects': {
'BOM': {'fields':['project_name']}, 'BOM': {'fields':['project_name']},
'Delivery Note': {'fields':['project_name']}, 'Delivery Note': {'fields':['project_name']},
@ -183,15 +184,16 @@ pscript.feature_dict = {
} }
$(document).bind('form_refresh', function() { $(document).bind('form_refresh', function() {
var feature_dict = erpnext.feature_setup.feature_dict;
for(var sys_feat in sys_defaults) { for(var sys_feat in sys_defaults) {
if(sys_defaults[sys_feat]=='0' if(sys_defaults[sys_feat]=='0'
&& (sys_feat in pscript.feature_dict)) { //"Features to hide" exists && (sys_feat in feature_dict)) { //"Features to hide" exists
if(cur_frm.doc.doctype in pscript.feature_dict[sys_feat]) { if(cur_frm.doc.doctype in feature_dict[sys_feat]) {
for(var fort in pscript.feature_dict[sys_feat][cur_frm.doc.doctype]) { for(var fort in feature_dict[sys_feat][cur_frm.doc.doctype]) {
if(fort=='fields') { if(fort=='fields') {
hide_field(pscript.feature_dict[sys_feat][cur_frm.doc.doctype][fort]); hide_field(feature_dict[sys_feat][cur_frm.doc.doctype][fort]);
} else if(cur_frm.fields_dict[fort]) { } else if(cur_frm.fields_dict[fort]) {
cur_frm.fields_dict[fort].grid.set_column_disp(pscript.feature_dict[sys_feat][cur_frm.doc.doctype][fort], false); cur_frm.fields_dict[fort].grid.set_column_disp(feature_dict[sys_feat][cur_frm.doc.doctype][fort], false);
} else { } else {
msgprint(__('Grid "')+fort+__('" does not exists')); msgprint(__('Grid "')+fort+__('" does not exists'));
} }