schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fixes] usability cleanup of recurring document and added explicit submit_on_creation

Browse Source
This commit is contained in:
Rushabh Mehta
2016-03-02 17:51:24 +05:30
parent f1ad694356
commit 5839a8d7f0
8 changed files with 698 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/controllers/recurring_document.py
View File

@@ -101,7 +101,7 @@ def make_new_document(reference_doc, date_field, posting_date):
for fieldname in ("owner", "recurring_type", "repeat_on_day_of_month",
"recurring_id", "notification_email_address", "is_recurring", "end_date",
"title", "naming_series", "select_print_heading", "ignore_pricing_rule",
"posting_time", "remarks"):
"posting_time", "remarks", 'submit_on_creation'):
if new_document.meta.get_field(fieldname):
new_document.set(fieldname, reference_doc.get(fieldname))
@@ -112,11 +112,11 @@ def make_new_document(reference_doc, date_field, posting_date):
new_document.run_method("on_recurring", reference_doc=reference_doc)
if not reference_doc.notify_by_email:
if reference_doc.submit_on_creation:
new_document.submit()
else:
new_document.docstatus=0
new_document.insert()
else:
new_document.submit()
return new_document
@@ -190,7 +190,7 @@ def validate_notification_email_id(doc):
if doc.notify_by_email:
if doc.notification_email_address:
email_list = split_emails(doc.notification_email_address.replace("\n", ""))
from frappe.utils import validate_email_add
for email in email_list:
if not validate_email_add(email):