From 24f49e674232be7454f39cc71bc7bb15161ee94b Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 30 Aug 2011 19:30:28 +0530
Subject: [PATCH 1/2] scheduler fix

---
 cgi-bin/webnotes/utils/scheduler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cgi-bin/webnotes/utils/scheduler.py b/cgi-bin/webnotes/utils/scheduler.py
index 96db7bb5d8..7caa1fd6ee 100644
--- a/cgi-bin/webnotes/utils/scheduler.py
+++ b/cgi-bin/webnotes/utils/scheduler.py
@@ -89,7 +89,7 @@ class Scheduler:
 		import webnotes, webnotes.defs, webnotes.db
 
 		try:
-			webnotes.conn = webnotes.db.Database(user=db_name, password=webnotes.defs.db_password)
+			webnotes.conn = webnotes.db.Database(user=db_name, password=webnotes.get_db_password(db_name))
 			webnotes.session = {'user':'Administrator'}
 
 			module = '.'.join(event.split('.')[:-1])

From d551d7db241265d2e8af033e5675b52eefe552a9 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Wed, 7 Sep 2011 14:49:13 +0530
Subject: [PATCH 2/2] added default_print_format and reduced default grid cell
 to 100px

---
 js/form.compressed.js   | 5 +++--
 js/widgets/form/form.js | 5 +++++
 js/widgets/form/grid.js | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/js/form.compressed.js b/js/form.compressed.js
index a29f580874..e1b4f9cf28 100644
--- a/js/form.compressed.js
+++ b/js/form.compressed.js
@@ -62,7 +62,8 @@ this.setup_footer();if(!(this.meta.istable||user=='Guest'))this.frm_head=new _f.
 this.layout.wrapper.style.backgroundColor='#'+this.meta.colour.split(':')[1];this.setup_fields_std();}
 _f.Frm.prototype.setup_print=function(){var fl=getchildren('DocFormat',this.meta.name,'formats','DocType');var l=[];this.default_format='Standard';if(fl.length){this.default_format=fl[0].format;for(var i=0;i<fl.length;i++)
 l.push(fl[i].format);}
-l.push('Standard');this.print_sel=$a(null,'select','',{width:'160px'});add_sel_options(this.print_sel,l);this.print_sel.value=this.default_format;}
+if(this.meta.default_print_format)
+this.default_format=this.meta.default_print_format;l.push('Standard');this.print_sel=$a(null,'select','',{width:'160px'});add_sel_options(this.print_sel,l);this.print_sel.value=this.default_format;}
 _f.Frm.prototype.print_doc=function(){if(this.doc.docstatus==2){msgprint("Cannot Print Cancelled Documents.");return;}
 _p.show_dialog();}
 _f.Frm.prototype.email_doc=function(){if(!_e.dialog)_e.make();sel=this.print_sel;var c=$td(_e.dialog.rows['Format'].tab,0,1);if(c.cur_sel){c.removeChild(c.cur_sel);c.cur_sel=null;}
@@ -263,7 +264,7 @@ _f.Grid.prototype.make_ui=function(parent){var ht=make_table($a(parent,'div'),1,
 _f.Grid.prototype.show=function(){if(this.can_add_rows){$ds(this.tbar_div);}else{$dh(this.tbar_div);}
 $ds(this.wrapper);}
 _f.Grid.prototype.hide=function(){$dh(this.wrapper);$dh(this.tbar_div);}
-_f.Grid.prototype.insert_column=function(doctype,fieldname,fieldtype,label,width,options,perm,reqd){var idx=this.head_row.cells.length;if(!width)width='140px';if((width+'').slice(-2)!='px'){width=width+'px';}
+_f.Grid.prototype.insert_column=function(doctype,fieldname,fieldtype,label,width,options,perm,reqd){var idx=this.head_row.cells.length;if(!width)width='100px';if((width+'').slice(-2)!='px'){width=width+'px';}
 var col=this.head_row.insertCell(idx);col.doctype=doctype;col.fieldname=fieldname;col.fieldtype=fieldtype;col.innerHTML='<div>'+label+'</div>';col.label=label;if(reqd)
 col.childNodes[0].style.color="#D22";col.style.width=width;col.options=options;col.perm=perm;this.col_idx_by_name[fieldname]=idx;}
 _f.Grid.prototype.reset_table_width=function(){var w=0;for(var i=0,len=this.head_row.cells.length;i<len;i++){w+=cint(this.head_row.cells[i].style.width);}
diff --git a/js/widgets/form/form.js b/js/widgets/form/form.js
index fd6034e83c..bfe43653cf 100644
--- a/js/widgets/form/form.js
+++ b/js/widgets/form/form.js
@@ -176,6 +176,11 @@ _f.Frm.prototype.setup_print = function() {
 			l.push(fl[i].format);
 		
 	}
+
+	// if default print format is given, use it
+	if(this.meta.default_print_format)
+		this.default_format = this.meta.default_print_format;
+
 	l.push('Standard');
 	this.print_sel = $a(null, 'select', '', {width:'160px'});
 	add_sel_options(this.print_sel, l);
diff --git a/js/widgets/form/grid.js b/js/widgets/form/grid.js
index 9e34920655..1c3bde0c92 100644
--- a/js/widgets/form/grid.js
+++ b/js/widgets/form/grid.js
@@ -62,7 +62,7 @@ _f.Grid.prototype.hide = function() {
 _f.Grid.prototype.insert_column = function(doctype, fieldname, fieldtype, label, width, options, perm, reqd) {
 	
 	var idx = this.head_row.cells.length;
-	if(!width)width = '140px';
+	if(!width)width = '100px';
 	if((width+'').slice(-2)!='px') {
 		width= width + 'px';
 	}