From e9a62d1236adbe398932a843c7155e1dff42d874 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Mon, 23 Jul 2012 11:46:37 +0530
Subject: [PATCH 01/10] reload trial balance report

---
 .../search_criteria/trial_balance/trial_balance.txt         | 3 +--
 erpnext/patches/july_2012/sync_trial_balance.py             | 4 ++++
 erpnext/patches/patch_list.py                               | 6 ++++++
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 erpnext/patches/july_2012/sync_trial_balance.py

diff --git a/erpnext/accounts/search_criteria/trial_balance/trial_balance.txt b/erpnext/accounts/search_criteria/trial_balance/trial_balance.txt
index 63e7b4950d..175c8e60a4 100644
--- a/erpnext/accounts/search_criteria/trial_balance/trial_balance.txt
+++ b/erpnext/accounts/search_criteria/trial_balance/trial_balance.txt
@@ -5,7 +5,7 @@
 	{
 		'creation': '2012-04-03 12:49:53',
 		'docstatus': 0,
-		'modified': '2012-04-03 12:49:53',
+		'modified': '2012-07-23 11:49:53',
 		'modified_by': u'Administrator',
 		'owner': u'Administrator'
 	},
@@ -14,7 +14,6 @@
 	{
 		'columns': u'Account\x01ID',
 		'criteria_name': u'Trial Balance',
-		'description': u'Trial Balance',
 		'dis_filters': u'transaction_date',
 		'doc_type': u'Account',
 		'doctype': 'Search Criteria',
diff --git a/erpnext/patches/july_2012/sync_trial_balance.py b/erpnext/patches/july_2012/sync_trial_balance.py
new file mode 100644
index 0000000000..41e4cdf49f
--- /dev/null
+++ b/erpnext/patches/july_2012/sync_trial_balance.py
@@ -0,0 +1,4 @@
+def execute():
+	import webnotes
+	from webnotes.modules import reload_doc
+	reload_doc('accounts', 'search_criteria', 'trial_balance')
\ No newline at end of file
diff --git a/erpnext/patches/patch_list.py b/erpnext/patches/patch_list.py
index b538c3d7b1..b945cd8e6e 100644
--- a/erpnext/patches/patch_list.py
+++ b/erpnext/patches/patch_list.py
@@ -492,4 +492,10 @@ patch_list = [
 		'patch_file': 'remove_event_role_owner_match',
 		'description': "Remove Owner match from Event DocType's Permissions"
 	},
+	{
+		'patch_module': 'patches.july_2012',
+		'patch_file': 'sync_trial_balance',
+		'description': "sync trial balance"
+	},
+	
 ]
\ No newline at end of file

From 44c6a5bef52bbfa7bf85c4dc35ba475ee2b069de Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Mon, 23 Jul 2012 11:54:06 +0530
Subject: [PATCH 02/10] dont display description on old report

---
 public/js/report-legacy.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/report-legacy.js b/public/js/report-legacy.js
index 0d757b629c..30ca8488e0 100644
--- a/public/js/report-legacy.js
+++ b/public/js/report-legacy.js
@@ -28,7 +28,7 @@ _r.ReportBuilder.prototype.run=function(){this.dt.run();}
 _r.ReportBuilder.prototype.clear_criteria=function(){this.column_picker.clear();this.column_picker.set_defaults();for(var i=0;i<this.filter_fields.length;i++){this.filter_fields[i].df.filter_hide=0;this.filter_fields[i].df.ignore=0;if(this.filter_fields[i].is_custom){this.filter_fields[i].df.filter_hide=1;this.filter_fields[i].df.ignore=1;}
 this.filter_fields[i].set_input(null);}
 this.set_sort_options();this.set_main_title('Report: '+get_doctype_label(this.doctype));this.current_loaded=null;this.customized_filters=null;this.sc=null;this.has_index=1;this.has_headings=1;for(var i in this.fn_list)this[this.fn_list[i]]=null;}
-_r.ReportBuilder.prototype.set_main_title=function(t,t1){var title=t+(t1?t1:'');_r.rb_con.appframe.$titlebar.find('.report-title').html(title);set_title(title);}
+_r.ReportBuilder.prototype.set_main_title=function(title){_r.rb_con.appframe.$titlebar.find('.report-title').html(title);set_title(title);}
 _r.ReportBuilder.prototype.select_column=function(dt,label,value){if(value==null)value=1;this.column_picker.set(dt,label,value);}
 _r.ReportBuilder.prototype.set_filter=function(dt,label,value){if(this.filter_fields_dict[dt+'\1'+label])
 this.filter_fields_dict[dt+'\1'+label].set_input(value);}
@@ -44,7 +44,7 @@ var acl=[];var new_sl=[];for(var i=0;i<acl.length;i++){var tmp=acl[i].split(' AS
 this.set_sort_options(new_sl);if(sc&&sc.sort_by){this.dt.sort_sel.value=sc.sort_by;}
 if(sc&&sc.sort_order){sc.sort_order=='ASC'?this.dt.set_asc():this.dt.set_desc();}
 if(sc&&sc.page_len){this.dt.page_len_sel.inp.value=sc.page_len;}
-this.current_loaded=criteria_name;this.set_main_title(criteria_name,sc.description);}
+this.current_loaded=criteria_name;this.set_main_title(criteria_name);}
 _r.ReportBuilder.prototype.setup_filters_and_cols=function(){function can_dt_be_submitted(dt){if(locals.DocType&&locals.DocType[dt]&&locals.DocType[dt].allow_trash)return 1;var plist=getchildren('DocPerm',dt,'permissions','DocType');for(var pidx in plist){if(plist[pidx].submit)return 1;}
 return 0;}
 var me=this;var dt=me.parent_dt?me.parent_dt:me.doctype;var fl=[{'fieldtype':'Data','label':'ID','fieldname':'name','in_filter':1,'parent':dt},{'fieldtype':'Data','label':'Owner','fieldname':'owner','in_filter':1,'parent':dt},{'fieldtype':'Date','label':'Created on','fieldname':'creation','in_filter':0,'parent':dt},{'fieldtype':'Date','label':'Last modified on','fieldname':'modified','in_filter':0,'parent':dt},];if(can_dt_be_submitted(dt)){fl[fl.length]={'fieldtype':'Check','label':'Saved','fieldname':'docstatus','search_index':1,'in_filter':1,'def_filter':1,'parent':dt};fl[fl.length]={'fieldtype':'Check','label':'Submitted','fieldname':'docstatus','search_index':1,'in_filter':1,'def_filter':1,'parent':dt};fl[fl.length]={'fieldtype':'Check','label':'Cancelled','fieldname':'docstatus','search_index':1,'in_filter':1,'parent':dt};}

From 39b8ec0ed8af7d447885246738d652199fec9892 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Mon, 23 Jul 2012 15:03:57 +0530
Subject: [PATCH 03/10] fixes in new report: same fieldname in multiple table

---
 public/js/all-app.js | 2 +-
 public/js/all-web.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/all-app.js b/public/js/all-app.js
index 6f96b3b109..24df70f3c8 100644
--- a/public/js/all-app.js
+++ b/public/js/all-app.js
@@ -352,7 +352,7 @@ return[me.fieldselect.$select.find('option:selected').attr('table'),me.field.df.
 this.add_field_option(this.filter_fields[i])}else{this.build_options();}},build_options:function(){var me=this;me.table_fields=[];var std_filters=[{fieldname:'name',fieldtype:'Data',label:'ID',parent:me.doctype},{fieldname:'modified',fieldtype:'Date',label:'Last Modified',parent:me.doctype},{fieldname:'owner',fieldtype:'Data',label:'Created By',parent:me.doctype},{fieldname:'creation',fieldtype:'Date',label:'Created On',parent:me.doctype},{fieldname:'_user_tags',fieldtype:'Data',label:'Tags',parent:me.doctype},{fieldname:'docstatus',fieldtype:'Int',label:'Doc Status',parent:me.doctype},];var doctype_obj=locals['DocType'][me.doctype];if(doctype_obj&&cint(doctype_obj.istable)){std_filters=std_filters.concat([{fieldname:'parent',fieldtype:'Data',label:'Parent',parent:me.doctype}]);}
 if(this.with_blank){this.$select.append($('<option>',{value:''}).text(''));}
 $.each(std_filters.concat(wn.meta.docfield_list[me.doctype]),function(i,df){me.add_field_option(df);});$.each(me.table_fields,function(i,table_df){if(table_df.options){$.each(wn.meta.docfield_list[table_df.options],function(i,df){me.add_field_option(df);});}});},add_field_option:function(df){var me=this;if(me.doctype&&df.parent==me.doctype){var label=df.label;var table=me.doctype;if(df.fieldtype=='Table')me.table_fields.push(df);}else{var label=df.label+' ('+df.parent+')';var table=df.parent;}
-if(wn.model.no_value_type.indexOf(df.fieldtype)==-1&&!me.fields_by_name[df.fieldname]){this.$select.append($('<option>',{value:df.fieldname,table:table}).text(label));me.fields_by_name[df.fieldname]=df;}}})
+if(df.fieldname=='description')console.log(me.fields_by_name[df.fieldname]);if(wn.model.no_value_type.indexOf(df.fieldtype)==-1&&!(me.fields_by_name[df.fieldname]&&me.fields_by_name[df.fieldname]['parent']==df.parent)){this.$select.append($('<option>',{value:df.fieldname,table:table}).text(label));me.fields_by_name[df.fieldname]=df;}}})
 /*
  *	lib/js/wn/views/container.js
  */
diff --git a/public/js/all-web.js b/public/js/all-web.js
index 0244801869..1a17a13daf 100644
--- a/public/js/all-web.js
+++ b/public/js/all-web.js
@@ -239,7 +239,7 @@ return[me.fieldselect.$select.find('option:selected').attr('table'),me.field.df.
 this.add_field_option(this.filter_fields[i])}else{this.build_options();}},build_options:function(){var me=this;me.table_fields=[];var std_filters=[{fieldname:'name',fieldtype:'Data',label:'ID',parent:me.doctype},{fieldname:'modified',fieldtype:'Date',label:'Last Modified',parent:me.doctype},{fieldname:'owner',fieldtype:'Data',label:'Created By',parent:me.doctype},{fieldname:'creation',fieldtype:'Date',label:'Created On',parent:me.doctype},{fieldname:'_user_tags',fieldtype:'Data',label:'Tags',parent:me.doctype},{fieldname:'docstatus',fieldtype:'Int',label:'Doc Status',parent:me.doctype},];var doctype_obj=locals['DocType'][me.doctype];if(doctype_obj&&cint(doctype_obj.istable)){std_filters=std_filters.concat([{fieldname:'parent',fieldtype:'Data',label:'Parent',parent:me.doctype}]);}
 if(this.with_blank){this.$select.append($('<option>',{value:''}).text(''));}
 $.each(std_filters.concat(wn.meta.docfield_list[me.doctype]),function(i,df){me.add_field_option(df);});$.each(me.table_fields,function(i,table_df){if(table_df.options){$.each(wn.meta.docfield_list[table_df.options],function(i,df){me.add_field_option(df);});}});},add_field_option:function(df){var me=this;if(me.doctype&&df.parent==me.doctype){var label=df.label;var table=me.doctype;if(df.fieldtype=='Table')me.table_fields.push(df);}else{var label=df.label+' ('+df.parent+')';var table=df.parent;}
-if(wn.model.no_value_type.indexOf(df.fieldtype)==-1&&!me.fields_by_name[df.fieldname]){this.$select.append($('<option>',{value:df.fieldname,table:table}).text(label));me.fields_by_name[df.fieldname]=df;}}})
+if(df.fieldname=='description')console.log(me.fields_by_name[df.fieldname]);if(wn.model.no_value_type.indexOf(df.fieldtype)==-1&&!(me.fields_by_name[df.fieldname]&&me.fields_by_name[df.fieldname]['parent']==df.parent)){this.$select.append($('<option>',{value:df.fieldname,table:table}).text(label));me.fields_by_name[df.fieldname]=df;}}})
 /*
  *	lib/js/wn/views/container.js
  */

From 7839ea96878f54a1dc2bacecc59a5cbffc7320ee Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Mon, 23 Jul 2012 16:05:16 +0530
Subject: [PATCH 04/10] fixes in new report: same fieldname in multiple table

---
 public/js/all-app.js | 2 +-
 public/js/all-web.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/all-app.js b/public/js/all-app.js
index 24df70f3c8..68dca2f921 100644
--- a/public/js/all-app.js
+++ b/public/js/all-app.js
@@ -352,7 +352,7 @@ return[me.fieldselect.$select.find('option:selected').attr('table'),me.field.df.
 this.add_field_option(this.filter_fields[i])}else{this.build_options();}},build_options:function(){var me=this;me.table_fields=[];var std_filters=[{fieldname:'name',fieldtype:'Data',label:'ID',parent:me.doctype},{fieldname:'modified',fieldtype:'Date',label:'Last Modified',parent:me.doctype},{fieldname:'owner',fieldtype:'Data',label:'Created By',parent:me.doctype},{fieldname:'creation',fieldtype:'Date',label:'Created On',parent:me.doctype},{fieldname:'_user_tags',fieldtype:'Data',label:'Tags',parent:me.doctype},{fieldname:'docstatus',fieldtype:'Int',label:'Doc Status',parent:me.doctype},];var doctype_obj=locals['DocType'][me.doctype];if(doctype_obj&&cint(doctype_obj.istable)){std_filters=std_filters.concat([{fieldname:'parent',fieldtype:'Data',label:'Parent',parent:me.doctype}]);}
 if(this.with_blank){this.$select.append($('<option>',{value:''}).text(''));}
 $.each(std_filters.concat(wn.meta.docfield_list[me.doctype]),function(i,df){me.add_field_option(df);});$.each(me.table_fields,function(i,table_df){if(table_df.options){$.each(wn.meta.docfield_list[table_df.options],function(i,df){me.add_field_option(df);});}});},add_field_option:function(df){var me=this;if(me.doctype&&df.parent==me.doctype){var label=df.label;var table=me.doctype;if(df.fieldtype=='Table')me.table_fields.push(df);}else{var label=df.label+' ('+df.parent+')';var table=df.parent;}
-if(df.fieldname=='description')console.log(me.fields_by_name[df.fieldname]);if(wn.model.no_value_type.indexOf(df.fieldtype)==-1&&!(me.fields_by_name[df.fieldname]&&me.fields_by_name[df.fieldname]['parent']==df.parent)){this.$select.append($('<option>',{value:df.fieldname,table:table}).text(label));me.fields_by_name[df.fieldname]=df;}}})
+if(wn.model.no_value_type.indexOf(df.fieldtype)==-1&&!(me.fields_by_name[df.fieldname]&&me.fields_by_name[df.fieldname]['parent']==df.parent)){this.$select.append($('<option>',{value:df.fieldname,table:table}).text(label));me.fields_by_name[df.fieldname]=df;}}})
 /*
  *	lib/js/wn/views/container.js
  */
diff --git a/public/js/all-web.js b/public/js/all-web.js
index 1a17a13daf..a921819368 100644
--- a/public/js/all-web.js
+++ b/public/js/all-web.js
@@ -239,7 +239,7 @@ return[me.fieldselect.$select.find('option:selected').attr('table'),me.field.df.
 this.add_field_option(this.filter_fields[i])}else{this.build_options();}},build_options:function(){var me=this;me.table_fields=[];var std_filters=[{fieldname:'name',fieldtype:'Data',label:'ID',parent:me.doctype},{fieldname:'modified',fieldtype:'Date',label:'Last Modified',parent:me.doctype},{fieldname:'owner',fieldtype:'Data',label:'Created By',parent:me.doctype},{fieldname:'creation',fieldtype:'Date',label:'Created On',parent:me.doctype},{fieldname:'_user_tags',fieldtype:'Data',label:'Tags',parent:me.doctype},{fieldname:'docstatus',fieldtype:'Int',label:'Doc Status',parent:me.doctype},];var doctype_obj=locals['DocType'][me.doctype];if(doctype_obj&&cint(doctype_obj.istable)){std_filters=std_filters.concat([{fieldname:'parent',fieldtype:'Data',label:'Parent',parent:me.doctype}]);}
 if(this.with_blank){this.$select.append($('<option>',{value:''}).text(''));}
 $.each(std_filters.concat(wn.meta.docfield_list[me.doctype]),function(i,df){me.add_field_option(df);});$.each(me.table_fields,function(i,table_df){if(table_df.options){$.each(wn.meta.docfield_list[table_df.options],function(i,df){me.add_field_option(df);});}});},add_field_option:function(df){var me=this;if(me.doctype&&df.parent==me.doctype){var label=df.label;var table=me.doctype;if(df.fieldtype=='Table')me.table_fields.push(df);}else{var label=df.label+' ('+df.parent+')';var table=df.parent;}
-if(df.fieldname=='description')console.log(me.fields_by_name[df.fieldname]);if(wn.model.no_value_type.indexOf(df.fieldtype)==-1&&!(me.fields_by_name[df.fieldname]&&me.fields_by_name[df.fieldname]['parent']==df.parent)){this.$select.append($('<option>',{value:df.fieldname,table:table}).text(label));me.fields_by_name[df.fieldname]=df;}}})
+if(wn.model.no_value_type.indexOf(df.fieldtype)==-1&&!(me.fields_by_name[df.fieldname]&&me.fields_by_name[df.fieldname]['parent']==df.parent)){this.$select.append($('<option>',{value:df.fieldname,table:table}).text(label));me.fields_by_name[df.fieldname]=df;}}})
 /*
  *	lib/js/wn/views/container.js
  */

From e8ff96565cc3fcddb0bd4f0cbed4678932c6cc71 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Tue, 24 Jul 2012 10:59:31 +0530
Subject: [PATCH 05/10] validate notification_email_ids in recurring invoice
 and if user is administrator set email id from profile

---
 .../accounts/doctype/gl_control/gl_control.py |  3 +++
 .../doctype/sales_invoice/sales_invoice.js    |  9 +++-----
 .../doctype/sales_invoice/sales_invoice.py    | 23 ++++++++++++++++++-
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/erpnext/accounts/doctype/gl_control/gl_control.py b/erpnext/accounts/doctype/gl_control/gl_control.py
index 78bfeec346..5853132edc 100644
--- a/erpnext/accounts/doctype/gl_control/gl_control.py
+++ b/erpnext/accounts/doctype/gl_control/gl_control.py
@@ -553,6 +553,9 @@ def notify_errors(inv, owner):
 
 def assign_task_to_owner(inv, msg, users):
 	for d in users:
+		if d.lower() == 'administrator':
+			d = webnotes.conn.sql("select ifnull(email_id, '') \
+				from `tabProfile` where name = 'Administrator'")[0][0]
 		from webnotes.widgets.form import assign_to
 		args = {
 			'assign_to' 	:	d,
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index c69c5f8b80..4df061ed5c 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -499,12 +499,9 @@ cur_frm.cscript.view_ledger_entry = function(){
 }
 
 // Default values for recurring invoices
-cur_frm.cscript.convert_into_recurring_invoice = function(doc) {
-	if (doc.convert_into_recurring_invoice) {
-		doc.repeat_on_day_of_month = doc.posting_date.split('-')[2];
-		doc.notification_email_address = [doc.owner, doc.contact_email].join(', ');
-		refresh_field(['repeat_on_day_of_month', 'notification_email_address']);
-	}		
+cur_frm.cscript.convert_into_recurring_invoice = function(doc, dt, dn) {
+	if (doc.convert_into_recurring_invoice)
+		get_server_fields('set_default_recurring_values','','',doc, dt, dn, 0);
 }
 
 cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 82314ca133..2d0a9f270b 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -679,10 +679,31 @@ class DocType(TransactionBase):
 		webnotes.conn.set(self.doc,'outstanding_amount',flt(self.doc.grand_total) - flt(self.doc.total_advance) - flt(self.doc.paid_amount) - flt(self.doc.write_off_amount))
 
 	#-------------------------------------------------------------------------------------
+
+	def set_default_recurring_values(self):
+		owner_email = self.doc.owner
+		if owner_email.lower() == 'administrator':
+			owner_email = webnotes.conn.sql("select ifnull(email, '') \
+				from `tabProfile` where name = 'Administrator'")[0][0]
+		ret = {
+			'repeat_on_day_of_month' : getdate(self.doc.posting_date).day,
+			'notification_email_address' : ', '.join([cstr(owner_email), self.doc.contact_email])
+		}
+		return ret
+		
+	def validate_notification_email_id(self):
+		from webnotes.utils import validate_email_add
+		email_ids = self.doc.notification_email_address.replace('\n', '').replace(' ', '').split(",")
+		for add in email_ids:
+			if add and not validate_email_add(add):
+				msgprint("%s is not a valid email address" % add, raise_exception=1)
+		
+		
 	def on_update_after_submit(self):
+		self.validate_notification_email_id()
 		self.convert_into_recurring()
 		
-
+		
 	def convert_into_recurring(self):
 		if self.doc.convert_into_recurring_invoice:
 			if not self.doc.recurring_type:

From 74b30c15ea9ab119404e699e61a96506a6e28d18 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Wed, 25 Jul 2012 18:14:46 +0530
Subject: [PATCH 06/10] Update
 erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py

---
 .../stock/doctype/stock_reconciliation/stock_reconciliation.py  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
index 0cc81ffa79..06b0cc493b 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
@@ -227,5 +227,7 @@ class DocType:
 			
 
 	def on_cancel(self):
+		msgprint("Cancellation of stock reconciliation is temporarily suspended. The feature will come back within 2-3 days.")
+		raise Exception
 		self.get_reconciliation_data(submit = 0)
 		self.do_stock_reco(is_submit = -1)
\ No newline at end of file

From 39c0aa70bafea63baedaca0bc85a8231ec425478 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 26 Jul 2012 12:39:07 +0530
Subject: [PATCH 07/10] Redirect to new manual page

---
 erpnext/startup/js/toolbar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/startup/js/toolbar.js b/erpnext/startup/js/toolbar.js
index 7ce9942307..d0b2d885a6 100644
--- a/erpnext/startup/js/toolbar.js
+++ b/erpnext/startup/js/toolbar.js
@@ -34,7 +34,7 @@ erpnext.toolbar.setup = function() {
 		<ul class="dropdown-menu" id="toolbar-help">\
 		</ul></li>')
 
-	$('#toolbar-help').append('<li><a href="http://erpnext.blogspot.com/2011/03/erpnext-help.html" target="_blank">\
+	$('#toolbar-help').append('<li><a href="https://erpnext.com/manual" target="_blank">\
 		Documentation</a></li>')
 
 	$('#toolbar-help').append('<li><a href="http://groups.google.com/group/erpnext-user-forum" target="_blank">\

From e87482ac86e0b37d51b4f123f5864bb4c3391f16 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@iwebnotes.com>
Date: Thu, 26 Jul 2012 12:48:26 +0530
Subject: [PATCH 08/10] Fixed: Lead Lost Reason message

---
 erpnext/selling/doctype/lead/lead.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/selling/doctype/lead/lead.py b/erpnext/selling/doctype/lead/lead.py
index ba15624fca..166e4fa706 100644
--- a/erpnext/selling/doctype/lead/lead.py
+++ b/erpnext/selling/doctype/lead/lead.py
@@ -68,7 +68,7 @@ class DocType:
 	def validate(self):
 		import string		
 		if self.doc.status == 'Lead Lost' and not self.doc.order_lost_reason:
-			msgprint("Please Enter Quotation Lost Reason")
+			msgprint("Please Enter Lost Reason under More Info section")
 			raise Exception	
 		
 		if self.doc.source == 'Campaign' and not self.doc.campaign_name and session['user'] != 'Guest':

From 80b8393338c17c6c5c3831cb994b1f62f681b719 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@iwebnotes.com>
Date: Thu, 26 Jul 2012 19:01:16 +0530
Subject: [PATCH 09/10] fixes in email validation for recurring invoice

---
 .../doctype/sales_invoice/sales_invoice.js    | 14 +++++++++++
 .../doctype/sales_invoice/sales_invoice.py    | 24 ++++++++++++-------
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index 4df061ed5c..4563532aa5 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -511,3 +511,17 @@ cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
 	}
 	cur_frm.cscript.notify(doc, args);
 }
+
+cur_frm.cscript.invoice_period_from_date = function(doc, dt, dn) {
+	if(doc.invoice_period_from_date) {
+		var recurring_type_map = { 'Monthly': 1, 'Quarterly': 3, 'Half-yearly': 6, 'Yearly': 12 };
+
+		var months = $(recurring_type_map).attr(doc.recurring_type);
+		if(months) {
+			var to_date = wn.datetime.add_months(doc.invoice_period_from_date,
+				months);
+			doc.invoice_period_to_date = wn.datetime.add_days(to_date, -1);
+			refresh_field('invoice_period_to_date');
+		}
+	}
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 2d0a9f270b..9139c95966 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -681,31 +681,37 @@ class DocType(TransactionBase):
 	#-------------------------------------------------------------------------------------
 
 	def set_default_recurring_values(self):
+		from webnotes.utils import cstr
+
 		owner_email = self.doc.owner
 		if owner_email.lower() == 'administrator':
-			owner_email = webnotes.conn.sql("select ifnull(email, '') \
-				from `tabProfile` where name = 'Administrator'")[0][0]
+			owner_email = cstr(webnotes.conn.get_value("Profile", "Administrator", "email"))
+		
 		ret = {
 			'repeat_on_day_of_month' : getdate(self.doc.posting_date).day,
-			'notification_email_address' : ', '.join([cstr(owner_email), self.doc.contact_email])
+			'notification_email_address' : ', '.join([owner_email, cstr(self.doc.contact_email)]),
 		}
 		return ret
 		
 	def validate_notification_email_id(self):
-		from webnotes.utils import validate_email_add
-		email_ids = self.doc.notification_email_address.replace('\n', '').replace(' ', '').split(",")
-		for add in email_ids:
-			if add and not validate_email_add(add):
-				msgprint("%s is not a valid email address" % add, raise_exception=1)
+		if self.doc.notification_email_address:
+			from webnotes.utils import validate_email_add
+			for add in self.doc.notification_email_address.replace('\n', '').replace(' ', '').split(","):
+				if add and not validate_email_add(add):
+					msgprint("%s is not a valid email address" % add, raise_exception=1)
+		else:
+			msgprint("Notification Email Addresses not specified for recurring invoice",
+				raise_exception=1)
 		
 		
 	def on_update_after_submit(self):
-		self.validate_notification_email_id()
 		self.convert_into_recurring()
 		
 		
 	def convert_into_recurring(self):
 		if self.doc.convert_into_recurring_invoice:
+			self.validate_notification_email_id()
+			
 			if not self.doc.recurring_type:
 				msgprint("Please select recurring type", raise_exception=1)
 			elif not self.doc.invoice_period_from_date or not self.doc.invoice_period_to_date:

From adc6c7c02b36d49058ce2c87569d354f1a4daa9f Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@iwebnotes.com>
Date: Thu, 26 Jul 2012 19:11:44 +0530
Subject: [PATCH 10/10] moved add comment button outside comments div

---
 erpnext/website/templates/html/blog_page.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/erpnext/website/templates/html/blog_page.html b/erpnext/website/templates/html/blog_page.html
index e9c1646174..3b8348d8a7 100644
--- a/erpnext/website/templates/html/blog_page.html
+++ b/erpnext/website/templates/html/blog_page.html
@@ -34,9 +34,8 @@
 					{% endif %}
 					
 					{% include 'html/comment.html' %}
-					
-					<button class="btn add-comment">Add Comment</button>
 				</div>
+				<button class="btn add-comment">Add Comment</button>
 			</div>
 
 			<div class="layout-side-section">