From e3ac5ff9e3924e1735f5958f463e980f5c348634 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Tue, 28 Aug 2018 14:11:58 +0530 Subject: [PATCH] erpnext: refactor async to is_async (#15231) --- erpnext/accounts/doctype/payment_request/payment_request.py | 2 +- .../erpnext_integrations/doctype/shopify_log/shopify_log.py | 4 ++-- erpnext/hr/doctype/salary_slip/salary_slip.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index e7371bdd711..24076a53e9a 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -186,7 +186,7 @@ class PaymentRequest(Document): "now": True, "attachments": [frappe.attach_print(self.reference_doctype, self.reference_name, file_name=self.reference_name, print_format=self.print_format)]} - enqueue(method=frappe.sendmail, queue='short', timeout=300, async=True, **email_args) + enqueue(method=frappe.sendmail, queue='short', timeout=300, is_async=True, **email_args) def get_message(self): """return message with payment gateway link""" diff --git a/erpnext/erpnext_integrations/doctype/shopify_log/shopify_log.py b/erpnext/erpnext_integrations/doctype/shopify_log/shopify_log.py index e6e6579084c..0c821e031d9 100644 --- a/erpnext/erpnext_integrations/doctype/shopify_log/shopify_log.py +++ b/erpnext/erpnext_integrations/doctype/shopify_log/shopify_log.py @@ -43,11 +43,11 @@ def dump_request_data(data, event="create/order"): }).insert(ignore_permissions=True) frappe.db.commit() - frappe.enqueue(method=event_mapper[event], queue='short', timeout=300, async=True, + frappe.enqueue(method=event_mapper[event], queue='short', timeout=300, is_async=True, **{"order": data, "request_id": log.name}) @frappe.whitelist() def resync(method, name, request_data): frappe.db.set_value("Shopify Log", name, "status", "Queued", update_modified=False) - frappe.enqueue(method=method, queue='short', timeout=300, async=True, + frappe.enqueue(method=method, queue='short', timeout=300, is_async=True, **{"order": json.loads(request_data), "request_id": name}) diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py index a009fb07182..19233ba50a5 100644 --- a/erpnext/hr/doctype/salary_slip/salary_slip.py +++ b/erpnext/hr/doctype/salary_slip/salary_slip.py @@ -526,7 +526,7 @@ class SalarySlip(TransactionBase): "reference_name": self.name } if not frappe.flags.in_test: - enqueue(method=frappe.sendmail, queue='short', timeout=300, async=True, **email_args) + enqueue(method=frappe.sendmail, queue='short', timeout=300, is_async=True, **email_args) else: frappe.sendmail(**email_args) else: