From 619e16c956688c69c14882bdf1d1244d6eac06bd Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 18 Apr 2012 17:17:02 +0530 Subject: [PATCH 1/4] removed account_url from global defaults --- .../setup/doctype/global_defaults/global_defaults.py | 1 - .../doctype/global_defaults/global_defaults.txt | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/erpnext/setup/doctype/global_defaults/global_defaults.py b/erpnext/setup/doctype/global_defaults/global_defaults.py index 41b3429ec95..89310f072ce 100644 --- a/erpnext/setup/doctype/global_defaults/global_defaults.py +++ b/erpnext/setup/doctype/global_defaults/global_defaults.py @@ -34,7 +34,6 @@ keydict = { 'valuation_method': 'default_valuation_method', 'date_format': 'date_format', 'currency_format':'default_currency_format', - 'account_url':'account_url' } class DocType: diff --git a/erpnext/setup/doctype/global_defaults/global_defaults.txt b/erpnext/setup/doctype/global_defaults/global_defaults.txt index 4c37e52aa94..fa356fc0cac 100644 --- a/erpnext/setup/doctype/global_defaults/global_defaults.txt +++ b/erpnext/setup/doctype/global_defaults/global_defaults.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-27 14:36:21', + 'creation': '2012-04-18 17:00:50', 'docstatus': 0, - 'modified': '2012-03-27 14:36:21', + 'modified': '2012-04-18 17:15:47', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -28,7 +28,7 @@ 'section_style': u'Tabbed', 'server_code_error': u' ', 'show_in_menu': 1, - 'version': 517 + 'version': 1 }, # These values are common for all DocField @@ -82,15 +82,15 @@ { 'doctype': u'DocPerm', 'permlevel': 1, - 'role': u'All' + 'role': u'System Manager', + 'write': 1 }, # DocPerm { 'doctype': u'DocPerm', 'permlevel': 1, - 'role': u'System Manager', - 'write': 1 + 'role': u'All' }, # DocPerm From ecf59f4c7710e0d0a42c8e5368136caf06a2e636 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 18 Apr 2012 17:18:33 +0530 Subject: [PATCH 2/4] fix in breadcrubs - module home page issue --- js/all-app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/all-app.js b/js/all-app.js index b68a485e40d..4570c610f1b 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -1388,7 +1388,7 @@ return false;} * lib/js/wn/views/breadcrumbs.js */ wn.provide('wn.views');wn.views.breadcrumbs=function(parent,module,doctype,name){$(parent).empty();var $bspan=$(repl('\ - Home',{home_page:wn.boot.home_page}));if(module){$bspan.append(repl(' / %(module)s Home',{module:module,module_small:module.toLowerCase()}))} + Home',{home_page:wn.boot.home_page}));if(module){$bspan.append(repl(' / %(module)s Home',{module:module,module_page:erpnext.modules[module]}))} if(doctype&&(locals.DocType[doctype]&&!locals.DocType[doctype].issingle)){$bspan.append(repl(' / %(doctype)s',{doctype:doctype}))} if(name){$bspan.append(' / '+name.bold())} $bspan.appendTo(parent);} From 7c67aad05906d4e0f2773ab4a162b02677416dbd Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 18 Apr 2012 17:25:06 +0530 Subject: [PATCH 3/4] removed account_url from global defaults --- .../global_defaults/global_defaults.txt | 51 +++++++------------ 1 file changed, 17 insertions(+), 34 deletions(-) diff --git a/erpnext/setup/doctype/global_defaults/global_defaults.txt b/erpnext/setup/doctype/global_defaults/global_defaults.txt index fa356fc0cac..cde3e065a06 100644 --- a/erpnext/setup/doctype/global_defaults/global_defaults.txt +++ b/erpnext/setup/doctype/global_defaults/global_defaults.txt @@ -5,7 +5,7 @@ { 'creation': '2012-04-18 17:00:50', 'docstatus': 0, - 'modified': '2012-04-18 17:15:47', + 'modified': '2012-04-18 17:24:45', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -101,39 +101,6 @@ 'write': 1 }, - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'system', - 'fieldtype': u'Section Break', - 'label': u'System' - }, - - # DocField - { - 'colour': u'White:FFF', - 'description': u'Example: http://frappe.erpnext.com', - 'doctype': u'DocField', - 'fieldname': u'account_url', - 'fieldtype': u'Data', - 'label': u'Account URL' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'column_break0', - 'fieldtype': u'Column Break' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'sms_sender_name', - 'fieldtype': u'Data', - 'label': u'SMS Sender Name' - }, - # DocField { 'doctype': u'DocField', @@ -549,5 +516,21 @@ 'fieldtype': u'Select', 'label': u'Employee Records to be created by ', 'options': u'\nNaming Series\nEmployee Number' + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'system', + 'fieldtype': u'Section Break', + 'label': u'System' + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'sms_sender_name', + 'fieldtype': u'Data', + 'label': u'SMS Sender Name' } ] \ No newline at end of file From f642168a26b18e1d54665688ced3a394dba63071 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 18 Apr 2012 18:35:30 +0530 Subject: [PATCH 4/4] hr home: changed Allocate Leaves --> Leave Allocation Tool --- .../search_criteria/sales_register/sales_register.txt | 4 ++-- erpnext/hr/page/hr_home/hr_home.html | 2 +- js/all-app.js | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/erpnext/accounts/search_criteria/sales_register/sales_register.txt b/erpnext/accounts/search_criteria/sales_register/sales_register.txt index e68cd57a6f0..fe436a0e145 100644 --- a/erpnext/accounts/search_criteria/sales_register/sales_register.txt +++ b/erpnext/accounts/search_criteria/sales_register/sales_register.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-04-03 12:49:52', + 'creation': '2012-04-11 17:36:48', 'docstatus': 0, - 'modified': '2012-04-03 12:49:52', + 'modified': '2012-04-18 17:41:46', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/hr/page/hr_home/hr_home.html b/erpnext/hr/page/hr_home/hr_home.html index 47e7e6734e6..7f0c65d9452 100644 --- a/erpnext/hr/page/hr_home/hr_home.html +++ b/erpnext/hr/page/hr_home/hr_home.html @@ -41,7 +41,7 @@
Allocate Leaves + href="#!Form/Leave Control Panel/Leave Control Panel">Leave Allocation Tool