]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
marina [Tue, 27 May 2025 06:20:09 +0000 (09:20 +0300)]
ERP-417
marina [Tue, 27 May 2025 06:17:54 +0000 (09:17 +0300)]
ERP-417
marina [Tue, 27 May 2025 06:15:32 +0000 (09:15 +0300)]
ERP-417
marina [Tue, 27 May 2025 06:10:36 +0000 (09:10 +0300)]
ERP-417
fomichev [Mon, 26 May 2025 15:12:23 +0000 (18:12 +0300)]
Прогноз товаров без истории
fomichev [Mon, 26 May 2025 13:34:19 +0000 (16:34 +0300)]
Merge branch 'refs/heads/feature_fomichev_erp-419_month_clear_goal' into feature_fomichev_erp-419_calculate_cleared_species_month_goal
# Conflicts:
# erp24/services/AutoPlannogrammaService.php
fomichev [Mon, 26 May 2025 12:55:19 +0000 (15:55 +0300)]
Вывод 1 этапа по категориям
Aleksey Filippov [Mon, 26 May 2025 11:49:42 +0000 (11:49 +0000)]
Merge branch 'summ_only_sales' into 'develop'
суммирование возвратов и вычитание продаж
See merge request gitlab-instance/yii-erp24!845
fomichev [Mon, 26 May 2025 11:48:13 +0000 (14:48 +0300)]
Немаркированные товары пересчет по списаниям
marina [Mon, 26 May 2025 10:12:23 +0000 (13:12 +0300)]
суммирование возвратов и вычитание продаж
marina [Mon, 26 May 2025 10:02:05 +0000 (13:02 +0300)]
суммирование возвратов и вычитание продаж
marina [Mon, 26 May 2025 09:37:18 +0000 (12:37 +0300)]
ERP-417
marina [Mon, 26 May 2025 09:19:06 +0000 (12:19 +0300)]
ERP-417
fomichev [Mon, 26 May 2025 08:55:33 +0000 (11:55 +0300)]
Немаркированные товары
marina [Mon, 26 May 2025 08:17:16 +0000 (11:17 +0300)]
ERP-417
marina [Mon, 26 May 2025 08:14:43 +0000 (11:14 +0300)]
ERP-417
marina [Mon, 26 May 2025 08:14:04 +0000 (11:14 +0300)]
ERP-417
marina [Mon, 26 May 2025 08:10:54 +0000 (11:10 +0300)]
ERP-417
marina [Mon, 26 May 2025 08:04:11 +0000 (11:04 +0300)]
ERP-417
marina [Mon, 26 May 2025 07:52:42 +0000 (10:52 +0300)]
ERP-417
marina [Mon, 26 May 2025 07:48:04 +0000 (10:48 +0300)]
ERP-417
marina [Mon, 26 May 2025 07:45:42 +0000 (10:45 +0300)]
ERP-417
marina [Mon, 26 May 2025 07:44:13 +0000 (10:44 +0300)]
ERP-417
marina [Mon, 26 May 2025 07:40:39 +0000 (10:40 +0300)]
ERP-417
marina [Mon, 26 May 2025 07:38:43 +0000 (10:38 +0300)]
ERP-417
marina [Mon, 26 May 2025 07:36:21 +0000 (10:36 +0300)]
ERP-417
marina [Mon, 26 May 2025 07:35:37 +0000 (10:35 +0300)]
ERP-417
marina [Mon, 26 May 2025 07:34:51 +0000 (10:34 +0300)]
ERP-417
marina [Mon, 26 May 2025 07:34:16 +0000 (10:34 +0300)]
ERP-417
marina [Mon, 26 May 2025 07:32:56 +0000 (10:32 +0300)]
ERP-417
marina [Mon, 26 May 2025 07:31:50 +0000 (10:31 +0300)]
ERP-417
marina [Mon, 26 May 2025 06:58:41 +0000 (09:58 +0300)]
ERP-417
marina [Mon, 26 May 2025 06:57:45 +0000 (09:57 +0300)]
ERP-417
marina [Mon, 26 May 2025 06:56:20 +0000 (09:56 +0300)]
ERP-417
marina [Mon, 26 May 2025 06:51:07 +0000 (09:51 +0300)]
ERP-417
marina [Mon, 26 May 2025 06:49:25 +0000 (09:49 +0300)]
ERP-417
marina [Mon, 26 May 2025 06:47:39 +0000 (09:47 +0300)]
ERP-417
marina [Mon, 26 May 2025 06:46:55 +0000 (09:46 +0300)]
ERP-417
marina [Mon, 26 May 2025 06:44:33 +0000 (09:44 +0300)]
ERP-417
marina [Mon, 26 May 2025 06:36:57 +0000 (09:36 +0300)]
ERP-417
fomichev [Fri, 23 May 2025 15:44:20 +0000 (18:44 +0300)]
Рефакторинг
marina [Fri, 23 May 2025 14:38:47 +0000 (17:38 +0300)]
ERP-417
marina [Fri, 23 May 2025 14:37:49 +0000 (17:37 +0300)]
ERP-417
marina [Fri, 23 May 2025 14:35:22 +0000 (17:35 +0300)]
ERP-417
marina [Fri, 23 May 2025 14:21:03 +0000 (17:21 +0300)]
ERP-417
marina [Fri, 23 May 2025 14:14:01 +0000 (17:14 +0300)]
ERP-417
marina [Fri, 23 May 2025 14:12:35 +0000 (17:12 +0300)]
ERP-417
marina [Fri, 23 May 2025 14:09:52 +0000 (17:09 +0300)]
ERP-417
marina [Fri, 23 May 2025 14:08:54 +0000 (17:08 +0300)]
ERP-417
marina [Fri, 23 May 2025 14:01:15 +0000 (17:01 +0300)]
ERP-417
marina [Fri, 23 May 2025 13:57:17 +0000 (16:57 +0300)]
ERP-417
marina [Fri, 23 May 2025 13:51:01 +0000 (16:51 +0300)]
ERP-417
marina [Fri, 23 May 2025 13:48:40 +0000 (16:48 +0300)]
ERP-417
marina [Fri, 23 May 2025 13:14:43 +0000 (16:14 +0300)]
ERP-417
marina [Fri, 23 May 2025 13:11:19 +0000 (16:11 +0300)]
ERP-417
marina [Fri, 23 May 2025 13:09:24 +0000 (16:09 +0300)]
ERP-417
fomichev [Thu, 22 May 2025 15:36:22 +0000 (18:36 +0300)]
расчет первого этапа
fomichev [Thu, 22 May 2025 14:34:47 +0000 (17:34 +0300)]
Merge remote-tracking branch 'refs/remotes/origin/feature_fomichev_erp-419_calculate_cleared_species_month_goal' into feature_fomichev_erp-363_count_offline_week_sales_forecast
Aleksey Filippov [Thu, 22 May 2025 14:29:39 +0000 (14:29 +0000)]
Merge branch 'feature_filippov_ERP-415_telegram_status_user_update' into 'develop'
[ERP-415] Актуализация данных о подписке в телеграмм по клиентам в ERP
See merge request gitlab-instance/yii-erp24!844
fomichev [Thu, 22 May 2025 14:16:21 +0000 (17:16 +0300)]
Выравнивание формы
Aleksey Filippov [Thu, 22 May 2025 14:07:51 +0000 (17:07 +0300)]
[ERP-415] Актуализация статусов подписки в Телеграм
fomichev [Thu, 22 May 2025 14:07:32 +0000 (17:07 +0300)]
перенос методов
Aleksey Filippov [Thu, 22 May 2025 14:02:12 +0000 (17:02 +0300)]
[ERP-415] Актуализация статусов подписки в Телеграм
Aleksey Filippov [Thu, 22 May 2025 14:00:58 +0000 (17:00 +0300)]
[ERP-415] Актуализация статусов подписки в Телеграм
Aleksey Filippov [Thu, 22 May 2025 13:52:59 +0000 (16:52 +0300)]
[ERP-415] Актуализация статусов подписки в Телеграм
fomichev [Thu, 22 May 2025 12:43:36 +0000 (15:43 +0300)]
Переименование методов
fomichev [Thu, 22 May 2025 12:34:15 +0000 (15:34 +0300)]
Переименование методов
marina [Thu, 22 May 2025 11:33:09 +0000 (14:33 +0300)]
ERP-417
marina [Thu, 22 May 2025 09:19:06 +0000 (12:19 +0300)]
ERP-417
fomichev [Thu, 22 May 2025 09:14:53 +0000 (12:14 +0300)]
Перенос методов
fomichev [Thu, 22 May 2025 07:54:43 +0000 (10:54 +0300)]
Фильтры в одну строку
fomichev [Wed, 21 May 2025 14:53:35 +0000 (17:53 +0300)]
Фильтры в одну строку
fomichev [Wed, 21 May 2025 14:42:42 +0000 (17:42 +0300)]
Merge branch 'refs/heads/feature_fomichev_erp-419_calculate_cleared_species_month_goal' into feature_fomichev_erp-20250411_month_bouquet_goal
fomichev [Wed, 21 May 2025 14:34:23 +0000 (17:34 +0300)]
Загрузка фото и просмотр
fomichev [Wed, 21 May 2025 13:45:35 +0000 (16:45 +0300)]
Коректировки по ценам товаров без истории - расчет по неделям
fomichev [Wed, 21 May 2025 13:05:49 +0000 (16:05 +0300)]
Коректировки по товарам без истории и букетам
fomichev [Wed, 21 May 2025 10:17:20 +0000 (13:17 +0300)]
Отладка запросов
fomichev [Wed, 21 May 2025 09:24:20 +0000 (12:24 +0300)]
Вывод 9 шага
Vladimir Fomichev [Wed, 21 May 2025 07:55:12 +0000 (10:55 +0300)]
9 шаг
marina [Wed, 21 May 2025 07:13:15 +0000 (10:13 +0300)]
ERP-417
fomichev [Tue, 20 May 2025 14:51:50 +0000 (17:51 +0300)]
Вывод 8 шага
fomichev [Tue, 20 May 2025 13:13:13 +0000 (16:13 +0300)]
Вывод 8 шага
fomichev [Tue, 20 May 2025 11:17:55 +0000 (14:17 +0300)]
Merge remote-tracking branch 'refs/remotes/origin/feature_fomichev_erp-419_month_clear_goal' into feature_fomichev_erp-419_calculate_cleared_species_month_goal
# Conflicts:
# erp24/controllers/AutoPlannogrammaController.php
Vladimir Fomichev [Tue, 20 May 2025 10:28:27 +0000 (13:28 +0300)]
8 шаг
Aleksey Filippov [Tue, 20 May 2025 09:04:09 +0000 (09:04 +0000)]
Merge branch 'feature_fomichev_erp-20250411_month_bouquet_goal' into 'develop'
[ERP-400] Обработка данных Создание расчёта месячной цели букета
See merge request gitlab-instance/yii-erp24!819
Vladimir Fomichev [Tue, 20 May 2025 08:54:42 +0000 (11:54 +0300)]
Merge branch 'develop' into feature_fomichev_erp-419_month_clear_goal
Vladimir Fomichev [Tue, 20 May 2025 08:52:33 +0000 (11:52 +0300)]
Merge branch 'develop' into feature_fomichev_erp-20250411_month_bouquet_goal
Vladimir Fomichev [Tue, 20 May 2025 08:52:09 +0000 (11:52 +0300)]
Константы коэффициентов
Vladimir Fomichev [Tue, 20 May 2025 08:37:47 +0000 (11:37 +0300)]
Merge remote-tracking branch 'origin/feature_fomichev_erp-20250411_month_bouquet_goal' into feature_fomichev_erp-419_month_clear_goal
Aleksey Filippov [Tue, 20 May 2025 07:34:00 +0000 (07:34 +0000)]
Merge branch 'feature_zozirova_erp-412_feedback_autopplannogramma' into 'develop'
ERP-413 Обработка ОС Планограмма (месяц)
See merge request gitlab-instance/yii-erp24!839
marina [Tue, 20 May 2025 07:32:25 +0000 (10:32 +0300)]
ERP-413 Обработка ОС Планограмма (месяц)
fomichev [Mon, 19 May 2025 15:57:20 +0000 (18:57 +0300)]
Вывод 7 шага
fomichev [Mon, 19 May 2025 15:12:39 +0000 (18:12 +0300)]
Merge branch 'refs/heads/feature_fomichev_erp-20250411_month_bouquet_goal' into feature_fomichev_erp-419_calculate_cleared_species_month_goal
fomichev [Mon, 19 May 2025 14:03:19 +0000 (17:03 +0300)]
Оптимизация запросов и циклов
fomichev [Mon, 19 May 2025 13:07:07 +0000 (16:07 +0300)]
Кеширование и вынос цены из цикла
fomichev [Mon, 19 May 2025 13:00:35 +0000 (16:00 +0300)]
Кеширование и вынос цены из цикла
fomichev [Mon, 19 May 2025 11:46:56 +0000 (14:46 +0300)]
Переименование переменных
fomichev [Mon, 19 May 2025 10:05:10 +0000 (13:05 +0300)]
Разметка констант
fomichev [Mon, 19 May 2025 10:01:58 +0000 (13:01 +0300)]
Разметка констант
fomichev [Mon, 19 May 2025 09:38:26 +0000 (12:38 +0300)]
Разметка констант
projects / erp24_rep / yii-erp24 / .git / log