]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
Vladimir Fomichev [Tue, 23 Dec 2025 10:09:24 +0000 (13:09 +0300)]
Правки по доставкам - сохранение очистка и обмен
Aleksey Filippov [Fri, 19 Dec 2025 09:51:23 +0000 (09:51 +0000)]
Merge branch 'fix_fomichev_erp-2025-12-18_delivery_string_parsing_marketplace_orders' into 'develop'
Фикс создания доставок и элементов заказа у заказа с ЯМ
See merge request gitlab-instance/yii-erp24!1043
Vladimir Fomichev [Fri, 19 Dec 2025 07:06:02 +0000 (10:06 +0300)]
Добавка связи
Vladimir Fomichev [Thu, 18 Dec 2025 16:38:10 +0000 (19:38 +0300)]
ошибки создания товаров заказа и доставки
Vladimir Fomichev [Thu, 18 Dec 2025 14:40:42 +0000 (17:40 +0300)]
ошибка
Vladimir Fomichev [Thu, 18 Dec 2025 14:34:17 +0000 (17:34 +0300)]
ошибка
Vladimir Fomichev [Thu, 18 Dec 2025 14:28:07 +0000 (17:28 +0300)]
правки
Aleksey Filippov [Thu, 18 Dec 2025 08:51:52 +0000 (08:51 +0000)]
Merge branch 'fix_fomichev_erp-2025-12-18_delivery_string_parsing_marketplace_orders' into 'develop'
Правки по доставке самовывозу - парсинг письма флаувау - МП
See merge request gitlab-instance/yii-erp24!1042
Vladimir Fomichev [Thu, 18 Dec 2025 08:50:15 +0000 (11:50 +0300)]
Merge branch 'refs/heads/develop' into fix_fomichev_erp-2025-12-18_delivery_string_parsing_marketplace_orders
Vladimir Fomichev [Thu, 18 Dec 2025 08:49:39 +0000 (11:49 +0300)]
Обработка письма - доставка/самовывоз
Aleksey Filippov [Wed, 17 Dec 2025 16:15:02 +0000 (16:15 +0000)]
Merge branch 'fix_fomichev_2025-12-17_marketplace_order_id' into 'develop'
Замена marketplace_id тестового заказа
See merge request gitlab-instance/yii-erp24!1041
Vladimir Fomichev [Wed, 17 Dec 2025 16:07:09 +0000 (19:07 +0300)]
Замена marketplace_id тестового заказа
Aleksey Filippov [Wed, 17 Dec 2025 14:15:01 +0000 (14:15 +0000)]
Merge branch 'fix_fomichev_erp-497_remove_salary_sync' into 'develop'
[ERP-497] Доработка отчёта для HR - убираем автонастройку окладов
See merge request gitlab-instance/yii-erp24!1040
Vladimir Fomichev [Wed, 17 Dec 2025 10:22:27 +0000 (13:22 +0300)]
Удаляем afterSave из Admin.php и переносим логику истории грейда в метод
Vladimir Fomichev [Wed, 17 Dec 2025 09:12:06 +0000 (12:12 +0300)]
Удаляем уведомления
Vladimir Fomichev [Wed, 17 Dec 2025 08:52:59 +0000 (11:52 +0300)]
Удаляем синхронизацию зарплат
Aleksey Filippov [Wed, 17 Dec 2025 08:00:14 +0000 (08:00 +0000)]
Merge branch 'feature_fomichev_erp-2025-12-15_shift_transfer_remove_without_selfcost_' into 'develop'
[ERP-498] Проверка отправки документов при передачи смен
See merge request gitlab-instance/yii-erp24!1039
Aleksey Filippov [Wed, 17 Dec 2025 07:59:36 +0000 (07:59 +0000)]
Merge branch 'feature_fomichev_erp-497_add_count_on_shift_to_report' into 'develop'
[ERP-497] Доработка отчёта для HR
See merge request gitlab-instance/yii-erp24!1032
Vladimir Fomichev [Wed, 17 Dec 2025 07:07:57 +0000 (10:07 +0300)]
Сортировки документов и статус
Aleksey Filippov [Tue, 16 Dec 2025 09:53:59 +0000 (09:53 +0000)]
Merge branch 'feature_fomichev_erp-2025-12-15_shift_transfer_remove_without_selfcost_' into 'develop'
[ERP-498] Проверка отправки документов при передачи смен
See merge request gitlab-instance/yii-erp24!1038
Vladimir Fomichev [Tue, 16 Dec 2025 09:02:26 +0000 (12:02 +0300)]
Останавливаем обмен с 1С на дев с 5 до 6
Vladimir Fomichev [Tue, 16 Dec 2025 07:26:05 +0000 (10:26 +0300)]
Останавливаем обмен с 1С на дев с 10 до 12
Vladimir Fomichev [Mon, 15 Dec 2025 14:51:37 +0000 (17:51 +0300)]
Убираем createdByAttribute
Vladimir Fomichev [Mon, 15 Dec 2025 14:40:10 +0000 (17:40 +0300)]
Убираем createdByAttribute
Vladimir Fomichev [Mon, 15 Dec 2025 12:38:51 +0000 (15:38 +0300)]
Формирование имени документа передачи смен
Vladimir Fomichev [Mon, 15 Dec 2025 12:09:04 +0000 (15:09 +0300)]
Скрытие без себестоимости
Vladimir Fomichev [Mon, 15 Dec 2025 08:51:11 +0000 (11:51 +0300)]
Изменение даты на дату следующего месяца
Vladimir Fomichev [Mon, 15 Dec 2025 07:57:42 +0000 (10:57 +0300)]
Изменение Подписей данных
Aleksey Filippov [Fri, 12 Dec 2025 15:07:32 +0000 (15:07 +0000)]
Merge branch 'feature_filippov_20251211_add_schema_db_docs' into 'develop'
Доработка документации добавление схемы БД
See merge request gitlab-instance/yii-erp24!1037
Aleksey Filippov [Fri, 12 Dec 2025 14:01:27 +0000 (17:01 +0300)]
Доработка документации добавление схемы БД
Aleksey Filippov [Thu, 11 Dec 2025 21:17:33 +0000 (21:17 +0000)]
Merge branch 'feature_filippov_20251211_add_schema_db_docs' into 'develop'
Доработка документации добавление схемы БД
See merge request gitlab-instance/yii-erp24!1036
Aleksey Filippov [Thu, 11 Dec 2025 21:15:08 +0000 (00:15 +0300)]
Доработка документации добавление схемы БД
Aleksey Filippov [Thu, 11 Dec 2025 11:13:52 +0000 (11:13 +0000)]
Merge branch 'feature_filippov_20251211_add_schema_db_docs' into 'develop'
Доработка документации
See merge request gitlab-instance/yii-erp24!1035
Aleksey Filippov [Thu, 11 Dec 2025 10:32:23 +0000 (13:32 +0300)]
Доработка документации
Vladimir Fomichev [Wed, 10 Dec 2025 09:02:59 +0000 (12:02 +0300)]
заменил константу
Vladimir Fomichev [Wed, 10 Dec 2025 08:54:36 +0000 (11:54 +0300)]
заменил на метод
Vladimir Fomichev [Wed, 10 Dec 2025 08:33:20 +0000 (11:33 +0300)]
правки
Vladimir Fomichev [Wed, 10 Dec 2025 08:22:58 +0000 (11:22 +0300)]
форматирование и типизация
Vladimir Fomichev [Wed, 10 Dec 2025 08:20:27 +0000 (11:20 +0300)]
Перенос строки в Shift.php
Vladimir Fomichev [Wed, 10 Dec 2025 08:13:47 +0000 (11:13 +0300)]
Замена на константы
Vladimir Fomichev [Wed, 10 Dec 2025 08:08:24 +0000 (11:08 +0300)]
Замена на константы
Vladimir Fomichev [Wed, 10 Dec 2025 08:01:50 +0000 (11:01 +0300)]
Добавил константы для смен админитстраторов
Vladimir Fomichev [Wed, 10 Dec 2025 07:56:10 +0000 (10:56 +0300)]
Убрал вложенный цикл
Vladimir Fomichev [Wed, 10 Dec 2025 07:14:00 +0000 (10:14 +0300)]
Убрал дистинкты
Vladimir Fomichev [Wed, 10 Dec 2025 07:11:44 +0000 (10:11 +0300)]
Правки с ключами массива
Aleksey Filippov [Tue, 9 Dec 2025 10:13:29 +0000 (10:13 +0000)]
Merge branch 'feature_filippov_erp-499_add_cluster_filter' into 'develop'
Feature filippov erp 499 add cluster filter
See merge request gitlab-instance/yii-erp24!1034
Aleksey Filippov [Tue, 9 Dec 2025 10:12:36 +0000 (13:12 +0300)]
ERP-499 Доработка системы оцистки вложений в док списания
Aleksey Filippov [Tue, 9 Dec 2025 09:34:12 +0000 (12:34 +0300)]
ERP-499 Доработка системы оцистки вложений в док списания
Aleksey Filippov [Tue, 9 Dec 2025 09:33:06 +0000 (12:33 +0300)]
ERP-499 Доработка системы оцистки вложений в док списания
Vladimir Fomichev [Tue, 9 Dec 2025 08:09:18 +0000 (11:09 +0300)]
Добавляем метод определение списка смен
Aleksey Filippov [Mon, 8 Dec 2025 10:42:03 +0000 (10:42 +0000)]
Merge branch 'feature_filippov_erp-499_add_cluster_filter' into 'develop'
ERP-499 Добавил фильтр в вывод кустов
See merge request gitlab-instance/yii-erp24!1033
Aleksey Filippov [Mon, 8 Dec 2025 10:38:40 +0000 (13:38 +0300)]
ERP-499 Добавил фильтр в вывод кустов
Vladimir Fomichev [Mon, 8 Dec 2025 08:43:21 +0000 (11:43 +0300)]
Корректировка недельного отчета
Vladimir Fomichev [Mon, 8 Dec 2025 08:39:22 +0000 (11:39 +0300)]
Корректировка дневного отчета
Vladimir Fomichev [Mon, 8 Dec 2025 07:33:30 +0000 (10:33 +0300)]
Корректировка общего отчета и подсчтета недель
Vladimir Fomichev [Mon, 8 Dec 2025 06:56:58 +0000 (09:56 +0300)]
Корректировка общего отчета и подсчтета недель
Vladimir Fomichev [Fri, 5 Dec 2025 12:39:27 +0000 (15:39 +0300)]
корректировка недель
Vladimir Fomichev [Fri, 5 Dec 2025 12:33:22 +0000 (15:33 +0300)]
корректировка дней
Vladimir Fomichev [Fri, 5 Dec 2025 12:24:36 +0000 (15:24 +0300)]
корректировка дней
Vladimir Fomichev [Fri, 5 Dec 2025 11:33:11 +0000 (14:33 +0300)]
корректировка дней
Aleksey Filippov [Thu, 4 Dec 2025 14:29:50 +0000 (14:29 +0000)]
Merge branch 'feature_fomichev_erp-497_add_count_on_shift_to_report' into 'develop'
[ERP-497] Доработка отчёта для HR
See merge request gitlab-instance/yii-erp24!1031
Vladimir Fomichev [Thu, 4 Dec 2025 14:09:56 +0000 (17:09 +0300)]
Порядок для посещения
Vladimir Fomichev [Thu, 4 Dec 2025 14:00:28 +0000 (17:00 +0300)]
Убираем создание новых групп и их уникальность по имени
сортировка списка
Vladimir Fomichev [Thu, 4 Dec 2025 13:10:49 +0000 (16:10 +0300)]
Убрал старую константу
Vladimir Fomichev [Thu, 4 Dec 2025 12:59:13 +0000 (15:59 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-497_add_count_on_shift_to_report
Vladimir Fomichev [Thu, 4 Dec 2025 12:59:07 +0000 (15:59 +0300)]
Убрал дублирование
Aleksey Filippov [Thu, 4 Dec 2025 12:50:02 +0000 (12:50 +0000)]
Merge branch 'feature_fomichev_erp-497_add_count_on_shift_to_report' into 'develop'
[ERP-497] Доработка отчёта для HR
See merge request gitlab-instance/yii-erp24!1027
Vladimir Fomichev [Thu, 4 Dec 2025 12:07:33 +0000 (15:07 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-497_add_count_on_shift_to_report
# Conflicts:
# erp24/actions/grade/AdminUpdateAction.php
# erp24/api3/core/services/ReportService.php
Aleksey Filippov [Thu, 4 Dec 2025 11:55:11 +0000 (11:55 +0000)]
Merge branch 'feature_fomichev_erp-492_add_staffing_table_for_grades' into 'develop'
[ERP-492] Штатное расписание - грейды на магазине
See merge request gitlab-instance/yii-erp24!1014
Vladimir Fomichev [Thu, 4 Dec 2025 08:56:41 +0000 (11:56 +0300)]
Изменяем правило проверки группы
Vladimir Fomichev [Wed, 3 Dec 2025 12:30:27 +0000 (15:30 +0300)]
Правки и оптимизации
Vladimir Fomichev [Wed, 3 Dec 2025 12:12:17 +0000 (15:12 +0300)]
Правки по MR
Vladimir Fomichev [Wed, 3 Dec 2025 11:10:25 +0000 (14:10 +0300)]
Корректировки
Aleksey Filippov [Wed, 3 Dec 2025 09:28:29 +0000 (09:28 +0000)]
Merge branch 'feature_filippov_20251203_token_remove_from_docs' into 'develop'
Удаление из документов токенов
See merge request gitlab-instance/yii-erp24!1030
Aleksey Filippov [Wed, 3 Dec 2025 09:25:51 +0000 (12:25 +0300)]
Удаление из документов токенов
Aleksey Filippov [Wed, 3 Dec 2025 07:51:51 +0000 (07:51 +0000)]
Merge branch 'feature_filippov_20251203_disable_balance' into 'develop'
Отключение избыточности запросов по остаткам
See merge request gitlab-instance/yii-erp24!1029
Aleksey Filippov [Wed, 3 Dec 2025 07:51:24 +0000 (10:51 +0300)]
Отключение избыточности запросов по остаткам
Aleksey Filippov [Wed, 3 Dec 2025 07:32:36 +0000 (07:32 +0000)]
Merge branch 'feature_filippov_erp-495_clear_log_open_page' into 'develop'
ERP-495 очистка логов открытия страниц
See merge request gitlab-instance/yii-erp24!1028
Aleksey Filippov [Wed, 3 Dec 2025 07:18:50 +0000 (10:18 +0300)]
ERP-495 очистка логов открытия страниц
Vladimir Fomichev [Tue, 2 Dec 2025 14:18:22 +0000 (17:18 +0300)]
Вывод employee_count_on_shift в отчете
Aleksey Filippov [Tue, 2 Dec 2025 12:37:24 +0000 (12:37 +0000)]
Merge branch 'BC-482' into 'develop'
BC-482 Разработка функционала резервного QR-кода
See merge request gitlab-instance/yii-erp24!1026
Aleksey Filippov [Tue, 2 Dec 2025 07:40:00 +0000 (07:40 +0000)]
Merge branch 'feature_fomichev_erp-490_link_salary_to_employee_position' into 'develop'
[ERP-490] Привязка окладов к должностям EmployeePosition
See merge request gitlab-instance/yii-erp24!1025
marina [Tue, 2 Dec 2025 07:35:33 +0000 (10:35 +0300)]
BC-482 Разработка функционала резервного QR-кода
Vladimir Fomichev [Tue, 2 Dec 2025 07:31:07 +0000 (10:31 +0300)]
Фикс creator_id
Aleksey Filippov [Tue, 2 Dec 2025 07:22:20 +0000 (07:22 +0000)]
Merge branch 'feature_fomichev_erp-490_link_salary_to_employee_position' into 'develop'
[ERP-490] Привязка окладов к должностям EmployeePosition
See merge request gitlab-instance/yii-erp24!1023
Vladimir Fomichev [Tue, 2 Dec 2025 07:14:47 +0000 (10:14 +0300)]
Дневной отчет
Vladimir Fomichev [Mon, 1 Dec 2025 15:09:43 +0000 (18:09 +0300)]
Убираем shift
Aleksey Filippov [Mon, 1 Dec 2025 09:17:49 +0000 (09:17 +0000)]
Merge branch 'feature_filippov_20251128_add_docs' into 'develop'
Добавление документации
See merge request gitlab-instance/yii-erp24!1024
Aleksey Filippov [Mon, 1 Dec 2025 09:16:46 +0000 (12:16 +0300)]
Добавление документации
Vladimir Fomichev [Mon, 1 Dec 2025 09:07:34 +0000 (12:07 +0300)]
Обновляем creator_id
Vladimir Fomichev [Mon, 1 Dec 2025 08:11:46 +0000 (11:11 +0300)]
Учитываем записи без employee_position_id и сливаем
Aleksey Filippov [Mon, 1 Dec 2025 07:19:49 +0000 (07:19 +0000)]
Merge branch 'feature_fomichev_erp-496_make_default_value_on_writeoffs_docs' into 'develop'
[ERP-496] В списании поставить Брак по умолчанию
See merge request gitlab-instance/yii-erp24!1021
Vladimir Fomichev [Mon, 1 Dec 2025 07:11:25 +0000 (10:11 +0300)]
Очистка
Vladimir Fomichev [Mon, 1 Dec 2025 06:57:46 +0000 (09:57 +0300)]
Перенос логики получения брака
Vladimir Fomichev [Mon, 1 Dec 2025 06:42:13 +0000 (09:42 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-492_add_staffing_table_for_grades
# Conflicts:
# erp24/commands/AdminController.php
Vladimir Fomichev [Mon, 1 Dec 2025 06:39:49 +0000 (09:39 +0300)]
Оптимизация установки грейда
Aleksey Filippov [Fri, 28 Nov 2025 08:40:25 +0000 (08:40 +0000)]
Merge branch 'feature_fomichev_erp-2025-11-07_documentation' into 'develop'
Обновление документации
See merge request gitlab-instance/yii-erp24!1022
Aleksey Filippov [Fri, 28 Nov 2025 08:39:54 +0000 (11:39 +0300)]
Обновление документации
Aleksey Filippov [Fri, 28 Nov 2025 07:07:46 +0000 (07:07 +0000)]
Merge branch 'feature_fomichev_erp-2025-11-07_documentation' into 'develop'
Добавлена документация для контроллеров ERP24, включая обзор, классификацию и...
See merge request gitlab-instance/yii-erp24!1020
Vladimir Fomichev [Fri, 28 Nov 2025 06:56:32 +0000 (09:56 +0300)]
Брак по умолчанию
projects / erp24_rep / yii-erp24 / .git / log