nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-30 07:08:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes after sync testing

Browse Source
This commit is contained in:
Anand Doshi
2012-04-10 19:14:37 +05:30
parent a9ccc7d6bd
commit 2424387651
15 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/setup/doctype/naming_series/naming_series.js
View File

@@ -20,9 +20,14 @@ cur_frm.cscript.onload = function(doc, cdt, cdn){
set_field_options('select_doc_for_series', r.message);
}
$c_obj([doc],'get_transactions','',callback);
cur_frm.cscript.refresh();
// add page head
var ph = new PageHeader(cur_frm.fields_dict['Head HTML'].wrapper, 'Setup Series', 'Set prefix for numbering series on your transactions');
//var ph = new PageHeader(cur_frm.fields_dict['head_html'].wrapper, 'Setup Series', 'Set prefix for numbering series on your transactions');
}
cur_frm.cscript.refresh = function(doc, cdt, cdn) {
// hide buttons
$(cur_frm.frm_head.page_head.toolbar_area).toggle(false);
}
cur_frm.cscript.select_doc_for_series = function(doc, cdt, cdn) {
@@ -32,4 +37,4 @@ cur_frm.cscript.select_doc_for_series = function(doc, cdt, cdn) {
}
$c_obj([doc],'get_options','',callback)
}
}

19
erpnext/setup/doctype/naming_series/naming_series.txt
View File

@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
'creation': '2012-03-27 14:36:21',
'creation': '2012-04-10 13:01:16',
'docstatus': 0,
'modified': '2012-03-27 14:36:21',
'modified': '2012-04-10 18:45:34',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -13,9 +13,10 @@
# These values are common for all DocType
{
'colour': u'White:FFF',
'description': u'Set prefix for numbering series on your transactions',
'doctype': 'DocType',
'hide_heading': 1,
'hide_toolbar': 1,
'hide_heading': 0,
'hide_toolbar': 0,
'issingle': 1,
'module': u'Setup',
'name': '__common__',
@@ -23,7 +24,7 @@
'section_style': u'Tray',
'server_code_error': u' ',
'show_in_menu': 0,
'version': 58
'version': 66
},
# These values are common for all DocField
@@ -108,14 +109,6 @@
'label': u'Setup Series'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'head_html',
'fieldtype': u'HTML',
'label': u'Head HTML'
},
# DocField
{
'doctype': u'DocField',

12
erpnext/setup/page/modules_setup/modules_setup.js
View File

@@ -4,11 +4,15 @@ $.extend(wn.pages.modules_setup, {
modules: ['Activity', 'Accounts', 'Selling', 'Buying', 'Stock', 'Production', 'Projects',
'Support', 'HR', 'Website', 'To Do', 'Messages', 'Calendar', 'Knowledge Base'],
onload: function(wrapper) {
wn.pages.modules_setup.refresh(wn.boot.modules_list);
wn.pages.modules_setup.refresh_page(wn.boot.modules_list);
},
refresh: function(ml) {
refresh_page: function(ml) {
$('#modules-list').empty();
// 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) {
$('#modules-list').append(repl('<p style="cursor:move;">\
@@ -47,4 +51,4 @@ $.extend(wn.pages.modules_setup, {
btn: $('#modules-update').get(0)
});
}
});
});