From: marina Date: Thu, 4 Jul 2024 09:59:02 +0000 (+0300) Subject: ERP-65 X-Git-Tag: 1.3~23^2 X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=c493db6d1fba547bffcccbcfb7d158becfbd794a;p=erp24_rep%2Fyii-erp24%2F.git ERP-65 Перенести в новый фактический табель все смены сотрудников, которые были до 13.06 --- diff --git a/erp24/records/TimetableFactModel.php b/erp24/records/TimetableFactModel.php index d094f203..e18bcc64 100644 --- a/erp24/records/TimetableFactModel.php +++ b/erp24/records/TimetableFactModel.php @@ -158,8 +158,6 @@ class TimetableFactModel extends ActiveRecord $model->d_id = $adminCheckin->d_id; $model->store_id = $adminCheckin->store_id; $model->date_shift = $adminCheckin->date; - $model->salary_shift = !empty($salary = EmployeePayment::findOne(['admin_id' => $adminCheckin->admin_id])) ? $salary->daily_payment : null; - $model->price_hour = $model->salary_shift / ($model->d_id == AdminGroup::GROUP_ADMINISTRATORS ? 8 : 12); } $model->is_opening = $is_start;