diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 69a7def..fc72562 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -103,7 +103,7 @@
 
 		self.update_c_form()
 		self.update_time_log_batch(self.name)
-		self.convert_to_recurring("RECINV.#####", self.transaction_date)
+		self.convert_to_recurring("RECINV.#####", self.posting_date)
 
 	def before_cancel(self):
 		self.update_time_log_batch(None)
@@ -145,7 +145,7 @@
 
 	def on_update_after_submit(self):
 		self.validate_recurring_document()
-		self.convert_to_recurring("RECINV.#####", self.transaction_date)
+		self.convert_to_recurring("RECINV.#####", self.posting_date)
 
 	def get_portal_page(self):
 		return "invoice" if self.docstatus==1 else None
@@ -592,172 +592,6 @@
 				grand_total = %s where invoice_no = %s and parent = %s""",
 				(self.name, self.amended_from, self.c_form_no))
 
-# 	def validate_recurring_invoice(self):
-# 		if self.convert_into_recurring_invoice:
-# 			self.validate_notification_email_id()
-
-# 			if not self.recurring_type:
-# 				msgprint(_("Please select {0}").format(self.meta.get_label("recurring_type")),
-# 				raise_exception=1)
-
-# 			elif not (self.period_from and \
-# 					self.period_to):
-# 				throw(_("Invoice Period From and Invoice Period To dates mandatory for recurring invoice"))
-
-# 	def convert_to_recurring(self):
-# 		if self.convert_into_recurring_invoice:
-# 			if not self.recurring_id:
-# 				frappe.db.set(self, "recurring_id",
-# 					make_autoname("RECINV/.#####"))
-
-# 			self.set_next_date()
-
-# 		elif self.recurring_id:
-# 			frappe.db.sql("""update `tabSales Invoice`
-# 				set convert_into_recurring_invoice = 0
-# 				where recurring_id = %s""", (self.recurring_id,))
-
-# 	def validate_notification_email_id(self):
-# 		if self.notification_email_address:
-# 			email_list = filter(None, [cstr(email).strip() for email in
-# 				self.notification_email_address.replace("\n", "").split(",")])
-
-# 			from frappe.utils import validate_email_add
-# 			for email in email_list:
-# 				if not validate_email_add(email):
-# 					throw(_("{0} is an invalid email address in 'Notification Email Address'").format(email))
-
-# 		else:
-# 			throw(_("'Notification Email Addresses' not specified for recurring invoice"))
-
-# 	def set_next_date(self):
-# 		""" Set next date on which auto invoice will be created"""
-# 		if not self.repeat_on_day_of_month:
-# 			msgprint(_("Please enter 'Repeat on Day of Month' field value"), raise_exception=1)
-
-# 		next_date = get_next_date(self.posting_date,
-# 			month_map[self.recurring_type], cint(self.repeat_on_day_of_month))
-
-# 		frappe.db.set(self, 'next_date', next_date)
-
-# def get_next_date(dt, mcount, day=None):
-# 	dt = getdate(dt)
-
-# 	from dateutil.relativedelta import relativedelta
-# 	dt += relativedelta(months=mcount, day=day)
-
-# 	return dt
-
-# def manage_recurring_invoices(next_date=None, commit=True):
-# 	"""
-# 		Create recurring invoices on specific date by copying the original one
-# 		and notify the concerned people
-# 	"""
-# 	next_date = next_date or nowdate()
-# 	recurring_invoices = frappe.db.sql("""select name, recurring_id
-# 		from `tabSales Invoice` where ifnull(convert_into_recurring_invoice, 0)=1
-# 		and docstatus=1 and next_date=%s
-# 		and next_date <= ifnull(end_date, '2199-12-31')""", next_date)
-
-# 	exception_list = []
-# 	for ref_invoice, recurring_id in recurring_invoices:
-# 		if not frappe.db.sql("""select name from `tabSales Invoice`
-# 				where posting_date=%s and recurring_id=%s and docstatus=1""",
-# 				(next_date, recurring_id)):
-# 			try:
-# 				ref_wrapper = frappe.get_doc('Sales Invoice', ref_invoice)
-# 				new_invoice_wrapper = make_new_invoice(ref_wrapper, next_date)
-# 				send_notification(new_invoice_wrapper)
-# 				if commit:
-# 					frappe.db.commit()
-# 			except:
-# 				if commit:
-# 					frappe.db.rollback()
-
-# 					frappe.db.begin()
-# 					frappe.db.sql("update `tabSales Invoice` set \
-# 						convert_into_recurring_invoice = 0 where name = %s", ref_invoice)
-# 					notify_errors(ref_invoice, ref_wrapper.customer, ref_wrapper.owner)
-# 					frappe.db.commit()
-
-# 				exception_list.append(frappe.get_traceback())
-# 			finally:
-# 				if commit:
-# 					frappe.db.begin()
-
-# 	if exception_list:
-# 		exception_message = "\n\n".join([cstr(d) for d in exception_list])
-# 		frappe.throw(exception_message)
-
-# def make_new_invoice(ref_wrapper, posting_date):
-# 	from erpnext.accounts.utils import get_fiscal_year
-# 	new_invoice = frappe.copy_doc(ref_wrapper)
-
-# 	mcount = month_map[ref_wrapper.recurring_type]
-
-# 	period_from = get_next_date(ref_wrapper.period_from, mcount)
-
-# 	# get last day of the month to maintain period if the from date is first day of its own month
-# 	# and to date is the last day of its own month
-# 	if (cstr(get_first_day(ref_wrapper.period_from)) == \
-# 			cstr(ref_wrapper.period_from)) and \
-# 		(cstr(get_last_day(ref_wrapper.period_to)) == \
-# 			cstr(ref_wrapper.period_to)):
-# 		period_to = get_last_day(get_next_date(ref_wrapper.period_to,
-# 			mcount))
-# 	else:
-# 		period_to = get_next_date(ref_wrapper.period_to, mcount)
-
-# 	new_invoice.update({
-# 		"posting_date": posting_date,
-# 		"aging_date": posting_date,
-# 		"due_date": add_days(posting_date, cint(date_diff(ref_wrapper.due_date,
-# 			ref_wrapper.posting_date))),
-# 		"period_from": period_from,
-# 		"period_to": period_to,
-# 		"fiscal_year": get_fiscal_year(posting_date)[0],
-# 		"owner": ref_wrapper.owner,
-# 	})
-
-# 	new_invoice.submit()
-
-# 	return new_invoice
-
-# def send_notification(new_rv):
-# 	"""Notify concerned persons about recurring invoice generation"""
-# 	frappe.sendmail(new_rv.notification_email_address,
-# 		subject="New Invoice : " + new_rv.name,
-# 		message = _("Please find attached Sales Invoice #{0}").format(new_rv.name),
-# 		attachments = [{
-# 			"fname": new_rv.name + ".pdf",
-# 			"fcontent": frappe.get_print_format(new_rv.doctype, new_rv.name, as_pdf=True)
-# 		}])
-
-# def notify_errors(inv, customer, owner):
-# 	from frappe.utils.user import get_system_managers
-# 	recipients=get_system_managers(only_name=True)
-
-# 	frappe.sendmail(recipients + [frappe.db.get_value("User", owner, "email")],
-# 		subject="[Urgent] Error while creating recurring invoice for %s" % inv,
-# 		message = frappe.get_template("templates/emails/recurring_invoice_failed.html").render({
-# 			"name": inv,
-# 			"customer": customer
-# 		}))
-
-	assign_task_to_owner(inv, "Recurring Invoice Failed", recipients)
-
-def assign_task_to_owner(inv, msg, users):
-	for d in users:
-		from frappe.widgets.form import assign_to
-		args = {
-			'assign_to' 	:	d,
-			'doctype'		:	'Sales Invoice',
-			'name'			:	inv,
-			'description'	:	msg,
-			'priority'		:	'High'
-		}
-		assign_to.add(args)
-
 @frappe.whitelist()
 def get_bank_cash_account(mode_of_payment):
 	val = frappe.db.get_value("Mode of Payment", mode_of_payment, "default_account")
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 9aa93ac..d9705c2 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -464,9 +464,9 @@
 			self.set_next_date(posting_date)
 
 		elif self.recurring_id:
-			frappe.db.sql("""update `tab%s` \
-				set convert_into_recurring = 0 \
-				where recurring_id = %s""", % (self.doctype, '%s'), (self.recurring_id))
+			frappe.db.sql("""update `tab%s`
+				set convert_into_recurring = 0
+				where recurring_id = %s""" % (self.doctype, '%s'), (self.recurring_id))
 
 	def validate_notification_email_id(self):
 		if self.notification_email_address:
diff --git a/erpnext/controllers/recurring_document.py b/erpnext/controllers/recurring_document.py
index ad32371..24e3845 100644
--- a/erpnext/controllers/recurring_document.py
+++ b/erpnext/controllers/recurring_document.py
@@ -118,4 +118,18 @@
 			"type": doctype,
 			"name": doc,
 			"customer": customer
-		}))
\ No newline at end of file
+		}))
+
+	assign_task_to_owner(doc, doctype, "Recurring Invoice Failed", recipients)
+
+def assign_task_to_owner(doc, doctype, msg, users):
+	for d in users:
+		from frappe.widgets.form import assign_to
+		args = {
+			'assign_to' 	:	d,
+			'doctype'		:	doctype,
+			'name'			:	doc,
+			'description'	:	msg,
+			'priority'		:	'High'
+		}
+		assign_to.add(args)
\ No newline at end of file
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index df15916..5466f2a 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -64,7 +64,7 @@
 		"erpnext.selling.doctype.lead.get_leads.get_leads"
 	],
 	"daily": [
-		"erpnext.accounts.doctype.sales_invoice.sales_invoice.manage_recurring_invoices",
+		"erpnext.controllers.recurring_document.manage_recurring_documents"
 		"erpnext.stock.utils.reorder_item",
 		"erpnext.setup.doctype.email_digest.email_digest.send",
 		"erpnext.support.doctype.support_ticket.support_ticket.auto_close_tickets"