schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge, fixed production cleanup patch

Browse Source
This commit is contained in:
Nabin Hait
2012-12-10 19:28:38 +05:30
parent cb7dc4aa7e 89e2dd8dbb
commit 05de088473
162 changed files with 75 additions and 4216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
setup/doctype/features_setup/features_setup.txt
View File

@@ -5,7 +5,7 @@
{
'creation': '2012-04-13 11:56:31',
'docstatus': 0,
'modified': '2012-06-07 18:41:50',
'modified': '2012-12-10 18:30:00',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -274,7 +274,7 @@
'doctype': u'DocField',
'fieldname': u'production',
'fieldtype': u'Section Break',
'label': u'Production'
'label': u'Manufacturing'
},
# DocField

2
setup/doctype/setup_control/setup_control.py
View File

@@ -237,7 +237,7 @@ class DocType:
self.add_roles(pr)
def add_roles(self, pr):
roles_list = ['Accounts Manager', 'Accounts User', 'Blogger', 'HR Manager', 'HR User', 'Maintenance User', 'Maintenance Manager', 'Material Manager', 'Material User', 'Material Master Manager', 'Production Manager', 'Production User', 'Projects User', 'Purchase Manager', 'Purchase User', 'Purchase Master Manager', 'Quality Manager', 'Sales Manager', 'Sales User', 'Sales Master Manager', 'Support Manager', 'Support Team', 'System Manager', 'Website Manager']
roles_list = ['Accounts Manager', 'Accounts User', 'Blogger', 'HR Manager', 'HR User', 'Maintenance User', 'Maintenance Manager', 'Material Manager', 'Material User', 'Material Master Manager', 'Manufacturing Manager', 'Manufacturing User', 'Projects User', 'Purchase Manager', 'Purchase User', 'Purchase Master Manager', 'Quality Manager', 'Sales Manager', 'Sales User', 'Sales Master Manager', 'Support Manager', 'Support Team', 'System Manager', 'Website Manager']
for r in roles_list:
d = addchild(pr, 'userroles', 'UserRole', 1)
d.role = r

3
setup/page/modules_setup/modules_setup.js
View File

@@ -1,7 +1,7 @@
wn.require('lib/js/lib/jquery/jquery.ui.sortable.js');
$.extend(wn.pages.modules_setup, {
modules: ['Activity', 'Accounts', 'Selling', 'Buying', 'Stock', 'Production', 'Projects',
modules: ['Activity', 'Accounts', 'Selling', 'Buying', 'Stock', 'Manufacturing', 'Projects',
'Support', 'HR', 'Website', 'To Do', 'Messages', 'Calendar', 'Knowledge Base'],
onload: function(wrapper) {
wn.pages.modules_setup.refresh_page(wn.boot.modules_list);
@@ -11,7 +11,6 @@ $.extend(wn.pages.modules_setup, {
// Hide Setup and Dashboard modules
ml.indexOf('Setup')!=-1 && ml.splice(ml.indexOf('Setup'), 1);
ml.indexOf('Dashboard')!=-1 && ml.splice(ml.indexOf('Dashboard'), 1);
// checked modules
for(i in ml) {