nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 12:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

actual start and end date calculation - call moved to submit and cancel of Time Log

Browse Source
This commit is contained in:
Neil Trini Lasrado
2015-02-04 11:35:10 +05:30
parent 2017796de7
commit de164c91e0
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/manufacturing/doctype/production_order/production_order.js
View File

@@ -7,11 +7,6 @@ $.extend(cur_frm.cscript, {
cfn_set_fields(doc, dt, dn); cfn_set_fields(doc, dt, dn);
this.frm.add_fetch("sales_order", "delivery_date", "expected_delivery_date"); this.frm.add_fetch("sales_order", "delivery_date", "expected_delivery_date");
return this.frm.call({
doc: this.frm.doc,
method: "set_actual_dates"
});
}, },
before_submit: function() { before_submit: function() {

1
erpnext/projects/doctype/time_log/time_log.py
View File

@@ -111,6 +111,7 @@ class TimeLog(Document):
pro_order.ignore_validate_update_after_submit = True pro_order.ignore_validate_update_after_submit = True
pro_order.update_operation_status() pro_order.update_operation_status()
pro_order.calculate_operating_cost() pro_order.calculate_operating_cost()
pro_order.set_actual_dates()
pro_order.save() pro_order.save()
def get_operation_start_end_time(self): def get_operation_start_end_time(self):