Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename

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'
 	},

erpnext/hr/page/hr_home/hr_home.html

@@ -41,7 +41,7 @@
 					<div class="section-item">
 						<a class="section-link" 
 							title = "Leave allocation helper"
-							href="#!Form/Leave Control Panel/Leave Control Panel">Allocate Leaves</a>
+							href="#!Form/Leave Control Panel/Leave Control Panel">Leave Allocation Tool</a>
 					</div>
 					<div class="section-item">
 						<a class="section-link" 

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:

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:24:45',
 		'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',
+		'role': u'All'
-		'write': 1
 	},
 
 	# DocPerm
@@ -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'
 	}
 ]

js/all-app.js

@@ -1419,7 +1419,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('<span class="breadcrumbs">\
-  <a href="#%(home_page)s">Home</a></span>',{home_page:wn.boot.home_page}));if(module){$bspan.append(repl(' / <a href="#!%(module_small)s-home">%(module)s Home</a>',{module:module,module_small:module.toLowerCase()}))}
+  <a href="#%(home_page)s">Home</a></span>',{home_page:wn.boot.home_page}));if(module){$bspan.append(repl(' / <a href="#!%(module_page)s">%(module)s Home</a>',{module:module,module_page:erpnext.modules[module]}))}
 if(doctype&&(locals.DocType[doctype]&&!locals.DocType[doctype].issingle)){$bspan.append(repl(' / <a href="#!List/%(doctype)s">%(doctype)s</a>',{doctype:doctype}))}
 if(name){$bspan.append(' / '+name.bold())}
 $bspan.appendTo(parent);}
@@ -1662,7 +1662,7 @@ this.appframe.add_button('Edit',function(){cur_frm.edit_doc();},'icon-pencil');e
 this.appframe.add_button('Print View',function(){cur_frm.is_editable[cur_frm.docname]=0;cur_frm.refresh();},'icon-print');}
 var docstatus=cint(cur_frm.doc.docstatus);if(docstatus==0&&p[WRITE]){this.appframe.add_button('Save',function(){cur_frm.save('Save');},'');this.appframe.buttons['Save'].addClass('btn-info');}
 if(docstatus==0&&p[SUBMIT]&&(!cur_frm.doc.__islocal))
-this.appframe.add_button('Submit',function(){cur_frm.savesubmit();},'icon-lock');if(docstatus==1&&p[SUBMIT]){this.appframe.add_button('Update',function(){cur_frm.savesubmit();},'');if(!cur_frm.doc.__unsaved)this.appframe.buttons['Update'].toggle(false);}
+this.appframe.add_button('Submit',function(){cur_frm.savesubmit();},'icon-lock');if(docstatus==1&&p[SUBMIT]){this.appframe.add_button('Update',function(){cur_frm.saveupdate();},'');if(!cur_frm.doc.__unsaved)this.appframe.buttons['Update'].toggle(false);}
 if(docstatus==1&&p[CANCEL])
 this.appframe.add_button('Cancel',function(){cur_frm.savecancel()},'icon-remove');if(docstatus==2&&p[AMEND])
 this.appframe.add_button('Amend',function(){cur_frm.amend_doc()},'icon-pencil');},show:function(){},hide:function(){},hide_close:function(){this.$w.find('.close').toggle(false);}})
@@ -1796,8 +1796,9 @@ this.copy_doc(fn,1);}
 _f.get_value=function(dt,dn,fn){if(locals[dt]&&locals[dt][dn])
 return locals[dt][dn][fn];}
 _f.set_value=function(dt,dn,fn,v){var d=locals[dt][dn];if(!d){console.log('_f.set_value - '+fn+': "'+dt+','+dn+'" not found');return;}
-var changed=d[fn]!=v;if(changed&&(d[fn]==null||v==null)&&(cstr(d[fn])==cstr(v)))changed=0;if(changed){d[fn]=v;d.__unsaved=1;if(d.parent&&d.parenttype){locals[d.parenttype][d.parent].__unsaved=1;var frm=wn.views.formview[d.parenttype].frm;}else{locals[d.doctype][d.name].__unsaved=1;var frm=wn.views.formview[d.doctype]&&wn.views.formview[d.doctype].frm;}
+var changed=d[fn]!=v;if(changed&&(d[fn]==null||v==null)&&(cstr(d[fn])==cstr(v)))changed=0;if(changed){var prev_unsaved=d.__unsaved
-if(frm&&frm==cur_frm&&frm.frm_head){frm.frm_head.refresh_labels();}}}
+d[fn]=v;d.__unsaved=1;if(d.parent&&d.parenttype){locals[d.parenttype][d.parent].__unsaved=1;var frm=wn.views.formview[d.parenttype].frm;}else{locals[d.doctype][d.name].__unsaved=1;var frm=wn.views.formview[d.doctype]&&wn.views.formview[d.doctype].frm;}
+if(frm&&frm==cur_frm&&frm.frm_head&&!prev_unsaved){frm.frm_head.refresh_labels();frm.frm_head.refresh_toolbar();}}}
 _f.Frm.prototype.show_comments=function(){if(!cur_frm.comments){cur_frm.comments=new Dialog(540,400,'Comments');cur_frm.comments.comment_body=$a(cur_frm.comments.body,'div','dialog_frm');$y(cur_frm.comments.body,{backgroundColor:'#EEE'});cur_frm.comments.list=new CommentList(cur_frm.comments.comment_body);}
 cur_frm.comments.list.dt=cur_frm.doctype;cur_frm.comments.list.dn=cur_frm.docname;cur_frm.comments.show();cur_frm.comments.list.run();}
 /*