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

Revert "Ignore validating mandatory fields on converting timelogs to timesheets"

Browse Source
This commit is contained in:
Nabin Hait 2016-08-22 14:36:33 +05:30 committed by GitHub
parent 1b9f8006c2
commit 5c9a2b39bc
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/patches/v7_0/convert_timelog_to_timesheet.py
View File

@ -16,6 +16,7 @@ def execute():
time_sheet = make_timesheet(data.production_order) time_sheet = make_timesheet(data.production_order)
args = get_timelog_data(data) args = get_timelog_data(data)
add_timesheet_detail(time_sheet, args) add_timesheet_detail(time_sheet, args)
time_sheet.docstatus = data.docstatus
time_sheet.note = data.note time_sheet.note = data.note
time_sheet.company = company time_sheet.company = company
@ -24,15 +25,6 @@ def execute():
time_sheet.calculate_total_amounts() time_sheet.calculate_total_amounts()
time_sheet.flags.ignore_validate = True time_sheet.flags.ignore_validate = True
time_sheet.save(ignore_permissions=True) time_sheet.save(ignore_permissions=True)
# To ignore validate_mandatory_fields function
if data.docstatus == 1:
time_sheet.db_set("docstatus", 1)
for d in time_sheet.get("time_logs"):
d.db_set("docstatus", 1)
time_sheet.update_production_order(time_sheet.name)
time_sheet.update_task_and_project()
def get_timelog_data(data): def get_timelog_data(data):
return { return {

5
erpnext/patches/v7_0/migrate_schools_to_erpnext.py
View File

@ -9,13 +9,12 @@ def execute():
frappe.reload_doc('website', 'doctype', 'portal_menu_item') frappe.reload_doc('website', 'doctype', 'portal_menu_item')
frappe.reload_doc('buying', 'doctype', 'request_for_quotation') frappe.reload_doc('buying', 'doctype', 'request_for_quotation')
if frappe.db.exists("Module Def", "Academics") \ if 'schools' in frappe.get_installed_apps():
and frappe.db.get_value("Module Def", "Academics", "app_name") == "schools":
frappe.db.sql("""delete from `tabDesktop Icon`""") frappe.db.sql("""delete from `tabDesktop Icon`""")
if not frappe.db.exists('Module Def', 'Schools') and frappe.db.exists('Module Def', 'Academics'): if not frappe.db.exists('Module Def', 'Schools') and frappe.db.exists('Module Def', 'Academics'):
frappe.rename_doc("Module Def", "Academics", "Schools") frappe.rename_doc("Module Def", "Academics", "Schools")
remove_from_installed_apps("schools") remove_from_installed_apps("schools")
def reload_doctypes_for_schools_icons(): def reload_doctypes_for_schools_icons():