Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10841 from rohitwaghchaure/subscription_patch_fix_docststus

Browse Source 
[fix] Subscription patch broken if reference document has been cancelled
This commit is contained in:
rohitwaghchaure 2017-09-19 13:24:04 +05:30 committed by GitHub
commit f551b43a94
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/patches/v8_7/make_subscription_from_recurring_data.py
View File

@ -20,8 +20,8 @@ def execute():
def get_data(doctype): def get_data(doctype):
return frappe.db.sql(""" select name, from_date, end_date, recurring_type,recurring_id, return frappe.db.sql(""" select name, from_date, end_date, recurring_type,recurring_id,
next_date, notify_by_email, notification_email_address, recurring_print_format, next_date, notify_by_email, notification_email_address, recurring_print_format,
repeat_on_day_of_month, submit_on_creation repeat_on_day_of_month, submit_on_creation, docstatus
from `tab{0}` where is_recurring = 1 and next_date >= %s from `tab{0}` where is_recurring = 1 and next_date >= %s and docstatus < 2
""".format(doctype), today(), as_dict=1) """.format(doctype), today(), as_dict=1)
def make_subscription(doctype, data): def make_subscription(doctype, data):
@ -39,4 +39,5 @@ def make_subscription(doctype, data):
'submit_on_creation': data.submit_on_creation 'submit_on_creation': data.submit_on_creation
}).insert(ignore_permissions=True) }).insert(ignore_permissions=True)
if data.docstatus == 1:
doc.submit() doc.submit()