diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php index 370038044a..e60c453b75 100644 --- a/module/execution/lang/de.php +++ b/module/execution/lang/de.php @@ -31,6 +31,8 @@ $lang->execution->canceledDate = 'CanceledDate'; $lang->execution->begin = 'Start'; $lang->execution->end = 'Ende'; $lang->execution->dateRange = 'Dauer'; +$lang->execution->realBegan = 'Tatsächlicher Start'; +$lang->execution->realEnd = 'Tatsächliches Ende'; $lang->execution->to = 'An'; $lang->execution->days = 'Manntage'; $lang->execution->day = 'Tag'; diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index a832a07115..a23ea71dc4 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -31,6 +31,8 @@ $lang->execution->canceledDate = 'CanceledDate'; $lang->execution->begin = 'Begin'; $lang->execution->end = 'End'; $lang->execution->dateRange = 'Duration'; +$lang->execution->realBegan = 'Actual start'; +$lang->execution->realEnd = 'Actual end'; $lang->execution->to = 'To'; $lang->execution->days = 'Available Days'; $lang->execution->day = ' Days'; diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php index 1a603690f9..9661e754aa 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -31,6 +31,8 @@ $lang->execution->canceledDate = "Date d'annulation"; $lang->execution->begin = 'Début'; $lang->execution->end = 'Fin'; $lang->execution->dateRange = 'Durée'; +$lang->execution->realBegan = 'Début effectif'; +$lang->execution->realEnd = 'Clôture effective'; $lang->execution->to = 'à'; $lang->execution->days = 'Budget Jours'; $lang->execution->day = ' Jours'; diff --git a/module/execution/lang/vi.php b/module/execution/lang/vi.php index e4d40b2903..41f8a9507b 100644 --- a/module/execution/lang/vi.php +++ b/module/execution/lang/vi.php @@ -31,6 +31,8 @@ $lang->execution->canceledDate = 'Ngày hủy'; $lang->execution->begin = 'Bắt đầu'; $lang->execution->end = 'Kết thúc'; $lang->execution->dateRange = 'Thời gian'; +$lang->execution->realBegan = 'Khởi đầu thật'; +$lang->execution->realEnd = 'Kết thúc thật'; $lang->execution->to = 'Tới'; $lang->execution->days = 'Ngày khả dụng'; $lang->execution->day = ' ngày'; diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index 5174984a73..f1ca6205ec 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -31,6 +31,8 @@ $lang->execution->canceledDate = '取消日期'; $lang->execution->begin = '开始日期'; $lang->execution->end = '结束日期'; $lang->execution->dateRange = '起始日期'; +$lang->execution->realBegan = '实际开始'; +$lang->execution->realEnd = '实际结束'; $lang->execution->to = '至'; $lang->execution->days = '可用工作日'; $lang->execution->day = '天'; diff --git a/module/execution/lang/zh-tw.php b/module/execution/lang/zh-tw.php index 9434a8adf2..640c801158 100644 --- a/module/execution/lang/zh-tw.php +++ b/module/execution/lang/zh-tw.php @@ -31,6 +31,8 @@ $lang->execution->canceledDate = '取消日期'; $lang->execution->begin = '開始日期'; $lang->execution->end = '結束日期'; $lang->execution->dateRange = '起始日期'; +$lang->execution->realBegan = '實際開始'; +$lang->execution->realEnd = '實際結束'; $lang->execution->to = '至'; $lang->execution->days = '可用工作日'; $lang->execution->day = '天'; diff --git a/module/execution/model.php b/module/execution/model.php index 0a42ee55e8..1ac73b68ec 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -810,6 +810,7 @@ class executionModel extends model $now = helper::now(); $execution = fixer::input('post') ->setDefault('status', 'closed') + ->setDefault('realEnd', $now) ->setDefault('closedBy', $this->app->user->account) ->setDefault('closedDate', $now) ->setDefault('lastEditedBy', $this->app->user->account)