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

fix: timeout error in the repost item valuation

Browse Source
This commit is contained in:
Rohit Waghchaure 2021-05-27 17:05:36 +05:30
parent 04df567973
commit b103b24ae1
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/hooks.py
View File

@ -333,7 +333,9 @@ scheduler_events = {
"erpnext.projects.doctype.project.project.collect_project_status", "erpnext.projects.doctype.project.project.collect_project_status",
"erpnext.hr.doctype.shift_type.shift_type.process_auto_attendance_for_all_shifts", "erpnext.hr.doctype.shift_type.shift_type.process_auto_attendance_for_all_shifts",
"erpnext.support.doctype.issue.issue.set_service_level_agreement_variance", "erpnext.support.doctype.issue.issue.set_service_level_agreement_variance",
"erpnext.erpnext_integrations.connectors.shopify_connection.sync_old_orders", "erpnext.erpnext_integrations.connectors.shopify_connection.sync_old_orders"
],
"hourly_long": [
"erpnext.stock.doctype.repost_item_valuation.repost_item_valuation.repost_entries" "erpnext.stock.doctype.repost_item_valuation.repost_item_valuation.repost_entries"
], ],
"daily": [ "daily": [

13
erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
View File

@ -37,6 +37,9 @@ class RepostItemValuation(Document):
self.db_set('status', status) self.db_set('status', status)
def on_submit(self): def on_submit(self):
if not frappe.flags.in_test:
return
frappe.enqueue(repost, timeout=1800, queue='long', frappe.enqueue(repost, timeout=1800, queue='long',
job_name='repost_sle', now=frappe.flags.in_test, doc=self) job_name='repost_sle', now=frappe.flags.in_test, doc=self)
@ -115,12 +118,6 @@ def notify_error_to_stock_managers(doc, traceback):
frappe.sendmail(recipients=recipients, subject=subject, message=message) frappe.sendmail(recipients=recipients, subject=subject, message=message)
def repost_entries(): def repost_entries():
job_log = frappe.get_all('Scheduled Job Log', fields = ['status', 'creation'],
filters = {'scheduled_job_type': 'repost_item_valuation.repost_entries'}, order_by='creation desc', limit=1)
if job_log and job_log[0]['status'] == 'Start' and time_diff_in_hours(now(), job_log[0]['creation']) < 2:
return
riv_entries = get_repost_item_valuation_entries() riv_entries = get_repost_item_valuation_entries()
for row in riv_entries: for row in riv_entries:
@ -135,9 +132,7 @@ def repost_entries():
check_if_stock_and_account_balance_synced(today(), d.name) check_if_stock_and_account_balance_synced(today(), d.name)
def get_repost_item_valuation_entries(): def get_repost_item_valuation_entries():
date = add_to_date(now(), hours=-3)
return frappe.db.sql(""" SELECT name from `tabRepost Item Valuation` return frappe.db.sql(""" SELECT name from `tabRepost Item Valuation`
WHERE status != 'Completed' and creation <= %s and docstatus = 1 WHERE status != 'Completed' and creation <= %s and docstatus = 1
ORDER BY timestamp(posting_date, posting_time) asc, creation asc ORDER BY timestamp(posting_date, posting_time) asc, creation asc
""", date, as_dict=1) """, now(), as_dict=1)