]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
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'
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
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'
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'
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'
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'
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'
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'
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'
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'
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'
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
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'
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'
Vladimir Fomichev [Fri, 28 Nov 2025 06:56:32 +0000 (09:56 +0300)]
Брак по умолчанию
Vladimir Fomichev [Thu, 27 Nov 2025 07:05:52 +0000 (10:05 +0300)]
Merge remote-tracking branch 'origin/feature_fomichev_erp-2025-11-07_documentation' into feature_fomichev_erp-2025-11-07_documentation
fomichev [Wed, 26 Nov 2025 14:05:50 +0000 (17:05 +0300)]
Контроллеры фаза3
fomichev [Wed, 26 Nov 2025 14:04:22 +0000 (17:04 +0300)]
Контроллеры продолжение
fomichev [Wed, 26 Nov 2025 07:41:28 +0000 (10:41 +0300)]
Контроллеры продолжение
Aleksey Filippov [Wed, 26 Nov 2025 07:08:38 +0000 (07:08 +0000)]
Merge branch 'feature_fomichev_erp-490_link_salary_to_employee_position' into 'develop'
fomichev [Tue, 25 Nov 2025 14:51:35 +0000 (17:51 +0300)]
Контроллеры
Vladimir Fomichev [Tue, 25 Nov 2025 10:43:12 +0000 (13:43 +0300)]
Merge remote-tracking branch 'origin/feature_fomichev_erp-2025-11-07_documentation' into feature_fomichev_erp-2025-11-07_documentation
fomichev [Tue, 25 Nov 2025 10:42:41 +0000 (13:42 +0300)]
Добавлена документация для контроллеров ERP24, включая обзор, классификацию и детальные описания стандартных и нестандартных контроллеров. Созданы файлы README.md и CATALOG.md для структурирования информации о контроллерах и их функциональности.
fomichev [Tue, 25 Nov 2025 09:17:48 +0000 (12:17 +0300)]
Консольные команды
Vladimir Fomichev [Tue, 25 Nov 2025 07:47:36 +0000 (10:47 +0300)]
Заменяем логику команды очистки со сложной на простую
Vladimir Fomichev [Tue, 25 Nov 2025 07:05:01 +0000 (10:05 +0300)]
Правки
Vladimir Fomichev [Tue, 25 Nov 2025 07:00:07 +0000 (10:00 +0300)]
Грейды
Aleksey Filippov [Mon, 24 Nov 2025 19:10:29 +0000 (19:10 +0000)]
Merge branch 'feature_filippov_20251124_add_gitignore' into 'develop'
Aleksey Filippov [Mon, 24 Nov 2025 19:06:37 +0000 (22:06 +0300)]
add gitignore
Vladimir Fomichev [Mon, 24 Nov 2025 09:59:19 +0000 (12:59 +0300)]
Merge remote-tracking branch 'origin/feature_fomichev_erp-2025-11-07_documentation' into feature_fomichev_erp-2025-11-07_documentation
Aleksey Filippov [Mon, 24 Nov 2025 08:14:03 +0000 (08:14 +0000)]
Merge branch 'feature_fomichev_erp-2025-11-07_documentation' into 'develop'
fomichev [Mon, 24 Nov 2025 08:05:24 +0000 (11:05 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-2025-11-07_documentation
fomichev [Mon, 24 Nov 2025 08:05:04 +0000 (11:05 +0300)]
Очистка документации
fomichev [Mon, 24 Nov 2025 08:04:13 +0000 (11:04 +0300)]
Документация модулей
Vladimir Fomichev [Fri, 21 Nov 2025 15:04:46 +0000 (18:04 +0300)]
Перенос стилей и скриптов
Vladimir Fomichev [Fri, 21 Nov 2025 14:57:51 +0000 (17:57 +0300)]
Установка group_name и вывод смены по группе
Vladimir Fomichev [Fri, 21 Nov 2025 06:37:24 +0000 (09:37 +0300)]
Обработка ошибок
Vladimir Fomichev [Thu, 20 Nov 2025 14:26:02 +0000 (17:26 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-490_link_salary_to_employee_position
Vladimir Fomichev [Thu, 20 Nov 2025 07:29:48 +0000 (10:29 +0300)]
Скрипт по датам окладов
Vladimir Fomichev [Thu, 20 Nov 2025 06:39:08 +0000 (09:39 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-492_add_staffing_table_for_grades
Aleksey Filippov [Wed, 19 Nov 2025 16:00:22 +0000 (16:00 +0000)]
Merge branch 'feature_filippov_erp-494_add_group_in_list' into 'develop'
Aleksey Filippov [Wed, 19 Nov 2025 15:59:40 +0000 (18:59 +0300)]
ERP-494 Расширение списка ответственных
Vladimir Fomichev [Wed, 19 Nov 2025 15:12:23 +0000 (18:12 +0300)]
Правки по грейдам и группам
Aleksey Filippov [Wed, 19 Nov 2025 12:09:33 +0000 (12:09 +0000)]
Merge branch 'feature_filippov_erp-493_api_logs_clear_scheduler' into 'develop'
Aleksey Filippov [Wed, 19 Nov 2025 12:07:27 +0000 (15:07 +0300)]
ERP-493 Команда для очистки логов
fomichev [Tue, 18 Nov 2025 11:03:08 +0000 (14:03 +0300)]
p3 service complete
Vladimir Fomichev [Tue, 18 Nov 2025 09:46:33 +0000 (12:46 +0300)]
Merge remote-tracking branch 'origin/feature_fomichev_erp-2025-11-07_documentation' into feature_fomichev_erp-2025-11-07_documentation
Vladimir Fomichev [Tue, 18 Nov 2025 09:45:53 +0000 (12:45 +0300)]
Удаляем магазины
fomichev [Tue, 18 Nov 2025 09:43:51 +0000 (12:43 +0300)]
p3 services
fomichev [Tue, 18 Nov 2025 09:08:26 +0000 (12:08 +0300)]
phase 3
Aleksey Filippov [Tue, 18 Nov 2025 07:04:02 +0000 (07:04 +0000)]
Merge branch 'BC-453' into 'develop'
fomichev [Mon, 17 Nov 2025 15:13:41 +0000 (18:13 +0300)]
phase 2
Vladimir Fomichev [Mon, 17 Nov 2025 14:37:54 +0000 (17:37 +0300)]
добавление алиаса
Vladimir Fomichev [Mon, 17 Nov 2025 14:12:33 +0000 (17:12 +0300)]
добавление алиаса
Vladimir Fomichev [Mon, 17 Nov 2025 14:00:53 +0000 (17:00 +0300)]
Убираем дублирование
Vladimir Fomichev [Mon, 17 Nov 2025 13:18:09 +0000 (16:18 +0300)]
Merge remote-tracking branch 'origin/feature_fomichev_erp-2025-11-07_documentation' into feature_fomichev_erp-2025-11-07_documentation
Vladimir Fomichev [Mon, 17 Nov 2025 13:16:05 +0000 (16:16 +0300)]
Документация CLAUDE.md
fomichev [Mon, 17 Nov 2025 09:44:24 +0000 (12:44 +0300)]
phase 2 beginning
fomichev [Mon, 17 Nov 2025 09:26:55 +0000 (12:26 +0300)]
claude
fomichev [Mon, 17 Nov 2025 09:26:33 +0000 (12:26 +0300)]
docs phase 1
marina [Mon, 17 Nov 2025 08:51:55 +0000 (11:51 +0300)]
ERP-453 эндпоинты для отзывов
marina [Mon, 17 Nov 2025 07:33:34 +0000 (10:33 +0300)]
ERP-453 эндпоинты для отзывов
fomichev [Mon, 17 Nov 2025 06:41:00 +0000 (09:41 +0300)]
Документация
Vladimir Fomichev [Fri, 14 Nov 2025 15:08:39 +0000 (18:08 +0300)]
Документация
Vladimir Fomichev [Fri, 14 Nov 2025 09:28:38 +0000 (12:28 +0300)]
Документация
Vladimir Fomichev [Fri, 14 Nov 2025 08:03:43 +0000 (08:03 +0000)]
Merge branch 'feature_fomichev_erp-492_add_staffing_table_for_grades' into 'develop'
Vladimir Fomichev [Fri, 14 Nov 2025 07:36:27 +0000 (10:36 +0300)]
перенос js
Vladimir Fomichev [Thu, 13 Nov 2025 14:49:59 +0000 (17:49 +0300)]
перенос js
Vladimir Fomichev [Thu, 13 Nov 2025 14:42:57 +0000 (17:42 +0300)]
Исправление ошибок
Vladimir Fomichev [Thu, 13 Nov 2025 14:37:51 +0000 (17:37 +0300)]
Штатное расписание миграция
Vladimir Fomichev [Thu, 13 Nov 2025 14:32:57 +0000 (17:32 +0300)]
Штатное расписание
Vladimir Fomichev [Wed, 12 Nov 2025 15:06:08 +0000 (15:06 +0000)]
Merge branch 'feature_fomichev_erp-491_add_articule_to_YM_balance' into 'develop'
Vladimir Fomichev [Wed, 12 Nov 2025 14:53:15 +0000 (17:53 +0300)]
Проверка на пустоту id
Vladimir Fomichev [Wed, 12 Nov 2025 14:28:47 +0000 (17:28 +0300)]
Добавление артикула
Vladimir Fomichev [Tue, 11 Nov 2025 14:06:23 +0000 (14:06 +0000)]
Merge branch 'feature_fomichev_erp-490_link_salary_to_employee_position' into 'develop'
Vladimir Fomichev [Tue, 11 Nov 2025 13:09:50 +0000 (16:09 +0300)]
Изменение group_name
Vladimir Fomichev [Tue, 11 Nov 2025 10:56:08 +0000 (13:56 +0300)]
Добавление позиции в грейдах и синхронизация со статусом
Vladimir Fomichev [Tue, 11 Nov 2025 08:36:28 +0000 (11:36 +0300)]
Добавление позиции в грейдах и синхронизация со статусом
Vladimir Fomichev [Tue, 11 Nov 2025 06:22:46 +0000 (09:22 +0300)]
Добавление позиции
Vladimir Fomichev [Mon, 10 Nov 2025 15:15:40 +0000 (18:15 +0300)]
Правки ревью
Vladimir Fomichev [Mon, 10 Nov 2025 14:56:56 +0000 (17:56 +0300)]
Синхронизация окладов
projects / erp24_rep / yii-erp24 / .git / log