diff --git a/erpnext/accounts/page/accounts_home/accounts_home.html b/erpnext/accounts/page/accounts_home/accounts_home.html index fc08360112f..a2033ec174a 100644 --- a/erpnext/accounts/page/accounts_home/accounts_home.html +++ b/erpnext/accounts/page/accounts_home/accounts_home.html @@ -98,7 +98,7 @@
Order Terms Template + href="#!List/Terms and Conditions">Terms and Conditions Template
Order Terms Template + href="#!List/Terms and Conditions">Terms and Conditions Template
diff --git a/erpnext/hr/page/hr_home/hr_home.html b/erpnext/hr/page/hr_home/hr_home.html index 0b98157e8e3..007ee769d4f 100644 --- a/erpnext/hr/page/hr_home/hr_home.html +++ b/erpnext/hr/page/hr_home/hr_home.html @@ -93,7 +93,7 @@
Key Performance Area (KRA) Template + href="#!List/Appraisal Template">Appraisal Template
- \ No newline at end of file + diff --git a/erpnext/patches/jan_mar_2012/rename_dt.py b/erpnext/patches/jan_mar_2012/rename_dt.py index e591a872155..171fe3f86ca 100644 --- a/erpnext/patches/jan_mar_2012/rename_dt.py +++ b/erpnext/patches/jan_mar_2012/rename_dt.py @@ -164,7 +164,7 @@ def update_dt_in_records(rendt): webnotes.conn.sql("update `tabStock Ledger Entry` set voucher_type = replace(voucher_type, '%s', '%s') where voucher_type = '%s'" % (d, rendt[d], d)) # Custom fld: options - webnotes.conn.sql("update `tabCustom Field` set options = replace(options, %s, %s) where fieldtype in ('Link', 'Select')", (d, rendt[d])) + webnotes.conn.sql("update `tabCustom Field` set options = replace(options, %s, %s) where fieldtype in ('Link', 'Select', 'Table')", (d, rendt[d])) #Property Setter: value (if property=options) webnotes.conn.sql("update `tabProperty Setter` set value = replace(value, %s, %s) where property = 'Options'", (d, rendt[d])) diff --git a/erpnext/production/page/production_home/production_home.html b/erpnext/production/page/production_home/production_home.html index b2762ad60ce..7a20097fc70 100644 --- a/erpnext/production/page/production_home/production_home.html +++ b/erpnext/production/page/production_home/production_home.html @@ -40,11 +40,6 @@ title = "browse bill of materials in a tree" href="#!Bill of Materials">BOM Browser -
- BOM Replace Item -
- \ No newline at end of file + diff --git a/erpnext/projects/page/projects_home/projects_home.html b/erpnext/projects/page/projects_home/projects_home.html index 37da61ffc86..0cb760e7b12 100644 --- a/erpnext/projects/page/projects_home/projects_home.html +++ b/erpnext/projects/page/projects_home/projects_home.html @@ -8,7 +8,7 @@

Project master

Task

Project activity / task

-

Timesheet

+

Timesheet

Timesheet for tasks

@@ -35,4 +35,4 @@
- \ No newline at end of file + diff --git a/erpnext/setup/doctype/naming_series/naming_series.js b/erpnext/setup/doctype/naming_series/naming_series.js index cd70dd79daf..799adb74214 100644 --- a/erpnext/setup/doctype/naming_series/naming_series.js +++ b/erpnext/setup/doctype/naming_series/naming_series.js @@ -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) -} \ No newline at end of file +} diff --git a/erpnext/setup/doctype/naming_series/naming_series.txt b/erpnext/setup/doctype/naming_series/naming_series.txt index dd3a0ef15cb..6cb1dab6b4e 100644 --- a/erpnext/setup/doctype/naming_series/naming_series.txt +++ b/erpnext/setup/doctype/naming_series/naming_series.txt @@ -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', diff --git a/erpnext/setup/page/modules_setup/modules_setup.js b/erpnext/setup/page/modules_setup/modules_setup.js index c7f80fcf9e4..71fed933b2a 100644 --- a/erpnext/setup/page/modules_setup/modules_setup.js +++ b/erpnext/setup/page/modules_setup/modules_setup.js @@ -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('

\ @@ -47,4 +51,4 @@ $.extend(wn.pages.modules_setup, { btn: $('#modules-update').get(0) }); } -}); \ No newline at end of file +}); diff --git a/erpnext/startup/event_handlers.py b/erpnext/startup/event_handlers.py index e5846b5beaf..54abdf5286c 100644 --- a/erpnext/startup/event_handlers.py +++ b/erpnext/startup/event_handlers.py @@ -92,6 +92,7 @@ def boot_session(bootinfo): bootinfo['docs'] += webnotes.model.doctype.get('Search Criteria') bootinfo['modules_list'] = webnotes.conn.get_global('modules_list') + webnotes.msgprint(bootinfo['modules_list']) # if no company, show a dialog box to create a new company bootinfo['setup_complete'] = webnotes.conn.sql("""select name from diff --git a/erpnext/startup/js/feature_setup.js b/erpnext/startup/js/feature_setup.js index 4a7ebfefd05..b929a7cec6f 100644 --- a/erpnext/startup/js/feature_setup.js +++ b/erpnext/startup/js/feature_setup.js @@ -84,7 +84,7 @@ pscript.feature_dict = { 'Delivery Note': {'delivery_note_details':['serial_no'],'packing_details':['serial_no']}, 'Installation Note': {'installed_item_details':['serial_no']}, 'Item': {'fields':['has_serial_no']}, - 'Maintenance Schedule': {'item_maintenance_details':['serial_no'],'maintenance_schedule_details':['serial_no']}, + 'Maintenance Schedule': {'item_maintenance_detail':['serial_no'],'maintenance_schedule_detail':['serial_no']}, 'Maintenance Visit': {'maintenance_visit_details':['serial_no']}, 'Purchase Receipt': {'purchase_receipt_details':['serial_no']}, 'Quality Inspection': {'fields':['item_serial_no']}, diff --git a/erpnext/stock/page/stock_home/stock_home.html b/erpnext/stock/page/stock_home/stock_home.html index 0ae70dc7364..aede4e3552e 100644 --- a/erpnext/stock/page/stock_home/stock_home.html +++ b/erpnext/stock/page/stock_home/stock_home.html @@ -59,7 +59,7 @@

Landed Cost Wizard + href="#!Form/Landed Cost Wizard/Landed Cost Wizard">Landed Cost Wizard