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

[Fix] Updated timesheet status

Browse Source
This commit is contained in:
Rohit Waghchaure 2016-09-02 12:24:54 +05:30
parent 94dbc14f8a
commit d07557eaf6
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/patches.txt
View File

@ -313,4 +313,5 @@ erpnext.patches.v7_0.set_portal_settings
erpnext.patches.v7_0.repost_future_gle_for_purchase_invoice erpnext.patches.v7_0.repost_future_gle_for_purchase_invoice
erpnext.patches.v7_0.fix_duplicate_icons erpnext.patches.v7_0.fix_duplicate_icons
erpnext.patches.v7_0.repost_gle_for_pos_sales_return erpnext.patches.v7_0.repost_gle_for_pos_sales_return
erpnext.patches.v7_0.update_missing_employee_in_timesheet erpnext.patches.v7_0.update_missing_employee_in_timesheet
erpnext.patches.v7_0.update_status_for_timesheet

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

@ -19,13 +19,14 @@ def execute():
time_sheet.employee = data.employee time_sheet.employee = data.employee
time_sheet.note = data.note time_sheet.note = data.note
time_sheet.company = company time_sheet.company = company
time_sheet.set_status() time_sheet.set_status()
time_sheet.set_dates()
time_sheet.update_cost() time_sheet.update_cost()
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 # To ignore validate_mandatory_fields function
if data.docstatus == 1: if data.docstatus == 1:
time_sheet.db_set("docstatus", 1) time_sheet.db_set("docstatus", 1)
@ -33,7 +34,6 @@ def execute():
d.db_set("docstatus", 1) d.db_set("docstatus", 1)
time_sheet.update_production_order(time_sheet.name) time_sheet.update_production_order(time_sheet.name)
time_sheet.update_task_and_project() time_sheet.update_task_and_project()
def get_timelog_data(data): def get_timelog_data(data):
return { return {

11
erpnext/patches/v7_0/update_status_for_timesheet.py Normal file
View File

@ -0,0 +1,11 @@
from __future__ import unicode_literals
import frappe
def execute():
frappe.db.sql("""update
`tabTimesheet` as ts,
(
select min(from_time)as from_time, max(to_time) as to_time, parent from `tabTimesheet Detail` group by parent
) as tsd
set ts.status = 'Submitted', ts.start_date = tsd.from_time, ts.end_date = tsd.to_time
where tsd.parent = ts.name and ts.status = 'Draft' and ts.docstatus =1""")