From de164c91e0f6fb8d5185ad6c80ba6638300b204f Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Wed, 4 Feb 2015 11:35:10 +0530 Subject: [PATCH] actual start and end date calculation - call moved to submit and cancel of Time Log --- .../doctype/production_order/production_order.js | 5 ----- erpnext/projects/doctype/time_log/time_log.py | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/manufacturing/doctype/production_order/production_order.js b/erpnext/manufacturing/doctype/production_order/production_order.js index f8bb99ebdb..d7dc79a953 100644 --- a/erpnext/manufacturing/doctype/production_order/production_order.js +++ b/erpnext/manufacturing/doctype/production_order/production_order.js @@ -7,11 +7,6 @@ $.extend(cur_frm.cscript, { cfn_set_fields(doc, dt, dn); 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() { diff --git a/erpnext/projects/doctype/time_log/time_log.py b/erpnext/projects/doctype/time_log/time_log.py index 52257437b3..f4cb89e74e 100644 --- a/erpnext/projects/doctype/time_log/time_log.py +++ b/erpnext/projects/doctype/time_log/time_log.py @@ -111,6 +111,7 @@ class TimeLog(Document): pro_order.ignore_validate_update_after_submit = True pro_order.update_operation_status() pro_order.calculate_operating_cost() + pro_order.set_actual_dates() pro_order.save() def get_operation_start_end_time(self):