Fixes for recurring document

erpnext/controllers/accounts_controller.py

@@ -4,12 +4,11 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _, throw
-from frappe.utils import add_days, cint, cstr, today, date_diff, flt, getdate, nowdate, \
-	get_first_day, get_last_day
-from frappe.model.naming import make_autoname
+from frappe.utils import cint, today, flt
 from erpnext.setup.utils import get_company_currency, get_exchange_rate
 from erpnext.accounts.utils import get_fiscal_year, validate_fiscal_year
 from erpnext.utilities.transaction_base import TransactionBase
+from erpnext.controllers.recurring_document import convert_to_recurring, validate_recurring_document
 import json
 
 class AccountsController(TransactionBase):
@@ -24,6 +23,24 @@ class AccountsController(TransactionBase):
 
 		self.validate_for_freezed_account()
 
+		if self.meta.get_field("is_recurring"):
+			validate_recurring_document(self)
+
+	def on_submit(self):
+		if self.meta.get_field("is_recurring"):
+			convert_to_recurring(self, self.get("posting_date") or self.get("transaction_date"))
+
+	def on_update_after_submit(self):
+		if self.meta.get_field("is_recurring"):
+			validate_recurring_document(self)
+			convert_to_recurring(self, self.get("posting_date") or self.get("transaction_date"))
+
+	def before_recurring(self):
+		self.fiscal_year = None
+		for fieldname in ("due_date", "aging_date"):
+			if self.meta.get_field(fieldname):
+				self.set(fieldname, None)
+
 	def set_missing_values(self, for_validate=False):
 		for fieldname in ["posting_date", "transaction_date"]:
 			if not self.get(fieldname) and self.meta.get_field(fieldname):
@@ -421,7 +438,6 @@ class AccountsController(TransactionBase):
 					max_allowed_amt = flt(ref_amt * (100 + tolerance) / 100)
 
 					if total_billed_amt - max_allowed_amt > 0.01:
-						reduce_by = total_billed_amt - max_allowed_amt
 						frappe.throw(_("Cannot overbill for Item {0} in row {0} more than {1}. To allow overbilling, please set in Stock Settings").format(item.item_code, item.idx, max_allowed_amt))
 
 	def get_company_default(self, fieldname):

erpnext/controllers/buying_controller.py

@@ -4,10 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _, msgprint
-
-from frappe.utils import add_days, cint, cstr, today, date_diff, flt, rounded, getdate, nowdate, \
-	get_first_day, get_last_day
-from frappe.model.naming import make_autoname
+from frappe.utils import flt, rounded
 
 from erpnext.setup.utils import get_company_currency
 from erpnext.accounts.party import get_party_details

erpnext/controllers/recurring_document.py

@@ -12,6 +12,12 @@ from erpnext.accounts.party import get_party_account, get_due_date, get_party_de
 from frappe.model.mapper import get_mapped_doc
 
 month_map = {'Monthly': 1, 'Quarterly': 3, 'Half-yearly': 6, 'Yearly': 12}
+date_field_map = {
+	"Sales Order": "transaction_date",
+	"Sales Invoice": "posting_date",
+	"Purchase Order": "transaction_date",
+	"Purchase Invoice": "posting_date"
+}
 
 def create_recurring_documents():
 	manage_recurring_documents("Sales Order")
@@ -26,14 +32,7 @@ def manage_recurring_documents(doctype, next_date=None, commit=True):
 	"""
 	next_date = next_date or nowdate()
 
-	if doctype == "Sales Order":
-		date_field = "transaction_date"
-	elif doctype == "Sales Invoice":
-		date_field = "posting_date"
-	elif doctype == "Purchase Order":
-		date_field = "transaction_date"
-	elif doctype == "Purchase Invoice":
-		date_field = "posting_date"
+	date_field = date_field_map[doctype]
 
 	recurring_documents = frappe.db.sql("""select name, recurring_id
 		from `tab{}` where ifnull(is_recurring, 0)=1
@@ -60,9 +59,10 @@ def manage_recurring_documents(doctype, next_date=None, commit=True):
 
 					frappe.db.begin()
 					frappe.db.sql("update `tab%s` \
-						set is_recurring = 0 where name = %s" % (doctype, '%s'), 
+						set is_recurring = 0 where name = %s" % (doctype, '%s'),
 						(ref_document))
-					notify_errors(ref_document, doctype, ref_wrapper.customer, ref_wrapper.owner)
+					notify_errors(ref_document, doctype, ref_wrapper.get("customer") or ref_wrapper.get("supplier"),
+						ref_wrapper.owner)
 					frappe.db.commit()
 
 				exception_list.append(frappe.get_traceback())
@@ -129,7 +129,7 @@ def send_notification(new_rv):
 			"fcontent": frappe.get_print_format(new_rv.doctype, new_rv.name, as_pdf=True)
 		}])
 
-def notify_errors(doc, doctype, customer, owner):
+def notify_errors(doc, doctype, party, owner):
 	from frappe.utils.user import get_system_managers
 	recipients = get_system_managers(only_name=True)
 
@@ -138,7 +138,7 @@ def notify_errors(doc, doctype, customer, owner):
 		message = frappe.get_template("templates/emails/recurring_document_failed.html").render({
 			"type": doctype,
 			"name": doc,
-			"customer": customer
+			"party": party
 		}))
 
 	assign_task_to_owner(doc, doctype, "Recurring Invoice Failed", recipients)

erpnext/controllers/tests/test_recurring_document.py

@@ -2,12 +2,8 @@
 # License: GNU General Public License v3. See license.txt
 
 import frappe
-import unittest, json, copy
-from frappe.utils import flt
 import frappe.permissions
-from erpnext.accounts.utils import get_stock_and_account_difference
-from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory
-from erpnext.projects.doctype.time_log_batch.test_time_log_batch import *
+from erpnext.controllers.recurring_document import date_field_map
 
 def test_recurring_document(obj, test_records):
 	from frappe.utils import get_first_day, get_last_day, add_to_date, nowdate, getdate, add_days
@@ -27,34 +23,11 @@ def test_recurring_document(obj, test_records):
 		"to_date": get_last_day(today)
 	})
 
-	if base_doc.doctype == "Sales Order":
-		base_doc.update({
-			"transaction_date": today,
-			"delivery_date": add_days(today, 15)
-		})
-	elif base_doc.doctype == "Sales Invoice":
-		base_doc.update({
-			"posting_date": today
-		})
+	date_field = date_field_map[base_doc.doctype]
+	base_doc.set(date_field, today)
 
 	if base_doc.doctype == "Sales Order":
-		date_field = "transaction_date"
-	elif base_doc.doctype == "Sales Invoice":
-		date_field = "posting_date"
-	#for Purchase order/purchase invoice
-	if base_doc.doctype == "Purchase Order":
-		base_doc.update({
-			"transaction_date": today
-		})
-	elif base_doc.doctype == "Purchase Invoice":
-		base_doc.update({
-			"posting_date": today
-		})
-
-	if base_doc.doctype == "Purchase Order":
-		date_field = "transaction_date"
-	elif base_doc.doctype == "Purchase Invoice":
-		date_field = "posting_date"
+		base_doc.set("delivery_date", add_days(today, 15))
 
 	# monthly
 	doc1 = frappe.copy_doc(base_doc)
@@ -142,7 +115,7 @@ def _test_recurring_document(obj, base_doc, date_field, first_and_last_day):
 
 		next_date = get_next_date(base_doc.get(date_field), no_of_months,
 			base_doc.repeat_on_day_of_month)
-		
+
 		manage_recurring_documents(base_doc.doctype, next_date=next_date, commit=False)
 
 		recurred_documents = frappe.db.sql("""select name from `tab%s`