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

[Fix] Patch fixes (#15350)

Browse Source 
* fix typo in fieldname

* fallback for work_order/production_order in timesheet
This commit is contained in:
Zarrar 2018-09-09 19:18:41 +05:30 committed by Nabin Hait
parent 8b7fea5a8a
commit 8448d9014d
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/patches/v10_0/remove_and_copy_fields_in_physician.py
View File

@ -5,7 +5,7 @@ def execute():
frappe.reload_doc("healthcare", "doctype", "physician")
frappe.reload_doc("healthcare", "doctype", "physician_service_unit_schedule")
if frappe.db.has_column('Physician', 'physician_schedule'):
if frappe.db.has_column('Physician', 'physician_schedules'):
for doc in frappe.get_all('Physician'):
_doc = frappe.get_doc('Physician', doc.name)
if _doc.physician_schedule:

16
erpnext/patches/v11_0/make_job_card.py
View File

@ -11,10 +11,16 @@ def execute():
frappe.reload_doc('manufacturing', 'doctype', 'job_card')
frappe.reload_doc('manufacturing', 'doctype', 'job_card_item')
for d in frappe.db.sql("""select work_order, name from tabTimesheet
where (work_order is not null and work_order != '') and docstatus = 0""", as_dict=1):
if d.work_order:
doc = frappe.get_doc('Work Order', d.work_order)
fieldname = frappe.db.get_value('DocField', {'fieldname': 'work_order', 'parent': 'Timesheet'}, 'fieldname')
if not fieldname:
fieldname = frappe.db.get_value('DocField', {'fieldname': 'production_order', 'parent': 'Timesheet'}, 'fieldname')
if not fieldname: return
for d in frappe.db.sql("""select %(fieldname)s, name from tabTimesheet
where (%(fieldname)s is not null and %(fieldname)s != '') and docstatus = 0""",
{'fieldname': fieldname}, as_dict=1):
if d[fieldname]:
doc = frappe.get_doc('Work Order', d[fieldname])
for row in doc.operations:
create_job_card(doc, row, auto_create=True)
frappe.delete_doc('Timesheet', d.name)
frappe.delete_doc('Timesheet', d.name)