]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
Aleksey Filippov [Fri, 6 Jun 2025 09:48:52 +0000 (09:48 +0000)]
Merge branch 'feature_fomichev_erp-419_calculate_cleared_species_month_goal' into 'develop'
[ERP-419] Вычисление месячной цели вида
See merge request gitlab-instance/yii-erp24!840
fomichev [Fri, 6 Jun 2025 09:08:05 +0000 (12:08 +0300)]
Исправление по ревью
fomichev [Wed, 4 Jun 2025 09:40:32 +0000 (12:40 +0300)]
Правки методов
fomichev [Wed, 4 Jun 2025 08:46:39 +0000 (11:46 +0300)]
Добавил TODO
Aleksey Filippov [Tue, 3 Jun 2025 14:02:00 +0000 (14:02 +0000)]
Merge branch 'feature_zozirova_erp-417_test_constaraints' into 'develop'
ERP-417
See merge request gitlab-instance/yii-erp24!852
marina [Tue, 3 Jun 2025 13:25:47 +0000 (16:25 +0300)]
Merge branch 'develop' into feature_zozirova_erp-417_test_constaraints
marina [Tue, 3 Jun 2025 13:24:55 +0000 (16:24 +0300)]
ERP-417
marina [Tue, 3 Jun 2025 13:23:45 +0000 (16:23 +0300)]
ERP-417
marina [Tue, 3 Jun 2025 13:22:16 +0000 (16:22 +0300)]
ERP-417
marina [Tue, 3 Jun 2025 13:20:38 +0000 (16:20 +0300)]
ERP-417
Aleksey Filippov [Tue, 3 Jun 2025 12:50:09 +0000 (12:50 +0000)]
Merge branch 'feature_zozirova_erp-417_test_constaraints' into 'develop'
ERP-417
See merge request gitlab-instance/yii-erp24!851
marina [Tue, 3 Jun 2025 12:44:12 +0000 (15:44 +0300)]
ERP-417
marina [Tue, 3 Jun 2025 12:34:13 +0000 (15:34 +0300)]
111
marina [Tue, 3 Jun 2025 10:27:14 +0000 (13:27 +0300)]
ERP-417
marina [Tue, 3 Jun 2025 10:22:27 +0000 (13:22 +0300)]
ERP-417
marina [Tue, 3 Jun 2025 10:12:16 +0000 (13:12 +0300)]
ERP-417
marina [Tue, 3 Jun 2025 10:09:47 +0000 (13:09 +0300)]
Merge branch 'develop' into feature_zozirova_erp-417_test_constaraints
marina [Tue, 3 Jun 2025 10:08:28 +0000 (13:08 +0300)]
ERP-417
Aleksey Filippov [Tue, 3 Jun 2025 09:54:14 +0000 (09:54 +0000)]
Merge branch 'feature_zozirova_erp-417_test_constaraints' into 'develop'
ERP-417 Сделать добавление в позицию списания видео файла и QR кода на это списание
See merge request gitlab-instance/yii-erp24!849
marina [Tue, 3 Jun 2025 09:46:40 +0000 (12:46 +0300)]
ERP-417
marina [Tue, 3 Jun 2025 09:45:40 +0000 (12:45 +0300)]
ERP-417
marina [Tue, 3 Jun 2025 09:42:00 +0000 (12:42 +0300)]
ERP-417
marina [Tue, 3 Jun 2025 09:36:09 +0000 (12:36 +0300)]
ERP-417
marina [Tue, 3 Jun 2025 07:48:48 +0000 (10:48 +0300)]
ERP-417
marina [Tue, 3 Jun 2025 07:39:57 +0000 (10:39 +0300)]
ERP-417
marina [Tue, 3 Jun 2025 07:08:04 +0000 (10:08 +0300)]
ERP-417
marina [Tue, 3 Jun 2025 07:07:12 +0000 (10:07 +0300)]
ERP-417
marina [Tue, 3 Jun 2025 07:05:04 +0000 (10:05 +0300)]
ERP-417
marina [Tue, 3 Jun 2025 06:58:43 +0000 (09:58 +0300)]
ERP-417
marina [Tue, 3 Jun 2025 06:47:26 +0000 (09:47 +0300)]
ERP-417
marina [Tue, 3 Jun 2025 06:45:10 +0000 (09:45 +0300)]
ERP-417
marina [Tue, 3 Jun 2025 06:41:37 +0000 (09:41 +0300)]
ERP-417
marina [Tue, 3 Jun 2025 06:37:44 +0000 (09:37 +0300)]
ERP-417
fomichev [Fri, 30 May 2025 11:51:09 +0000 (14:51 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-419_calculate_cleared_species_month_goal
# Conflicts:
# erp24/services/AutoPlannogrammaService.php
fomichev [Fri, 30 May 2025 11:43:13 +0000 (14:43 +0300)]
Правки по товарам без истории
fomichev [Fri, 30 May 2025 10:50:41 +0000 (13:50 +0300)]
Правки по количеству - расчет с раскрытием товаров
fomichev [Fri, 30 May 2025 10:42:01 +0000 (13:42 +0300)]
Правки по количеству - расчет с раскрытием товаров
fomichev [Fri, 30 May 2025 10:14:22 +0000 (13:14 +0300)]
Правки по количеству - расчет с раскрытием товаров
fomichev [Fri, 30 May 2025 10:12:46 +0000 (13:12 +0300)]
Правки по количеству - расчет с раскрытием товаров
fomichev [Fri, 30 May 2025 10:11:25 +0000 (13:11 +0300)]
Правки по количеству - расчет с раскрытием товаров
fomichev [Fri, 30 May 2025 08:43:56 +0000 (11:43 +0300)]
Правки по видам - расчет с раскрытием товаров
fomichev [Fri, 30 May 2025 06:51:37 +0000 (09:51 +0300)]
Правки по подкатегориям - расчет с раскрытием товаров
fomichev [Thu, 29 May 2025 15:02:43 +0000 (18:02 +0300)]
Правки по подкатегориям
Aleksey Filippov [Thu, 29 May 2025 14:54:33 +0000 (14:54 +0000)]
Merge branch 'feature_zozirova_erp-422_fix_lk_sales' into 'develop'
ERP-422 Не сходятся продажи в ЛК флориста
See merge request gitlab-instance/yii-erp24!848
marina [Thu, 29 May 2025 14:50:50 +0000 (17:50 +0300)]
ERP-422 Не сходятся продажи в ЛК флориста
fomichev [Thu, 29 May 2025 09:59:00 +0000 (12:59 +0300)]
Модификация метода calculateMedianSalesForProductsWithoutHistoryExtended
fomichev [Thu, 29 May 2025 09:50:35 +0000 (12:50 +0300)]
Модификация метода analyzeHistory
fomichev [Thu, 29 May 2025 09:49:03 +0000 (12:49 +0300)]
Модификация метода getSalesHistory
fomichev [Thu, 29 May 2025 09:39:12 +0000 (12:39 +0300)]
Правки по методу расчетов без истории
fomichev [Thu, 29 May 2025 09:32:34 +0000 (12:32 +0300)]
Добавил фильтрацию по категориям 'букет', 'сборка', 'сервис'
fomichev [Thu, 29 May 2025 09:19:53 +0000 (12:19 +0300)]
убрал проверку по пустой категории
fomichev [Thu, 29 May 2025 08:48:31 +0000 (11:48 +0300)]
убрал откладку
fomichev [Thu, 29 May 2025 08:45:45 +0000 (11:45 +0300)]
убрал откладку
Aleksey Filippov [Thu, 29 May 2025 08:35:54 +0000 (08:35 +0000)]
Merge branch 'feature_zozirova_erp-417_add_video_and_qr' into 'develop'
ERP-417 Сделать добавление в позицию списания видео файла и QR кода на это списание
See merge request gitlab-instance/yii-erp24!847
marina [Thu, 29 May 2025 08:29:46 +0000 (11:29 +0300)]
ERP-417
marina [Thu, 29 May 2025 08:26:46 +0000 (11:26 +0300)]
ERP-417
fomichev [Thu, 29 May 2025 08:26:08 +0000 (11:26 +0300)]
убрал откладку
marina [Thu, 29 May 2025 08:22:56 +0000 (11:22 +0300)]
ERP-417
fomichev [Thu, 29 May 2025 08:20:46 +0000 (11:20 +0300)]
убрал откладку
fomichev [Thu, 29 May 2025 08:07:24 +0000 (11:07 +0300)]
убрал откладку
Aleksey Filippov [Thu, 29 May 2025 06:59:10 +0000 (06:59 +0000)]
Merge branch 'feature_fomichev_erp-322_add_foto_to_marketplace_order' into 'develop'
[ERP-322] Добавление фото к заказу
See merge request gitlab-instance/yii-erp24!841
Aleksey Filippov [Thu, 29 May 2025 06:58:11 +0000 (06:58 +0000)]
Merge branch 'feature_fomichev_ERP-20250407_add_notification_telegram_mpstore_message' into 'develop'
уведомление в телеграм об отсутствии магазина ЯМ в MarketplaceStore
See merge request gitlab-instance/yii-erp24!778
Aleksey Filippov [Thu, 29 May 2025 06:57:30 +0000 (06:57 +0000)]
Merge branch 'fix_fomichev_20250228_telegram_error_msg_format' into 'develop'
Добавление уведомлений телеграм об ошибках в media
See merge request gitlab-instance/yii-erp24!708
marina [Wed, 28 May 2025 12:21:45 +0000 (15:21 +0300)]
ERP-417
marina [Wed, 28 May 2025 12:19:46 +0000 (15:19 +0300)]
ERP-417
marina [Wed, 28 May 2025 12:13:45 +0000 (15:13 +0300)]
ERP-417
marina [Wed, 28 May 2025 12:02:01 +0000 (15:02 +0300)]
ERP-417
marina [Wed, 28 May 2025 11:57:18 +0000 (14:57 +0300)]
ERP-417
marina [Wed, 28 May 2025 11:53:00 +0000 (14:53 +0300)]
ERP-417
marina [Wed, 28 May 2025 11:43:49 +0000 (14:43 +0300)]
ERP-417
marina [Wed, 28 May 2025 11:42:00 +0000 (14:42 +0300)]
ERP-417
marina [Wed, 28 May 2025 11:39:27 +0000 (14:39 +0300)]
ERP-417
marina [Wed, 28 May 2025 10:18:18 +0000 (13:18 +0300)]
ERP-417
marina [Wed, 28 May 2025 10:05:15 +0000 (13:05 +0300)]
ERP-417
marina [Wed, 28 May 2025 10:03:13 +0000 (13:03 +0300)]
ERP-417
marina [Wed, 28 May 2025 10:01:08 +0000 (13:01 +0300)]
ERP-417
marina [Wed, 28 May 2025 09:59:06 +0000 (12:59 +0300)]
ERP-417
marina [Wed, 28 May 2025 09:57:41 +0000 (12:57 +0300)]
ERP-417
marina [Wed, 28 May 2025 09:55:26 +0000 (12:55 +0300)]
ERP-417
marina [Wed, 28 May 2025 09:52:35 +0000 (12:52 +0300)]
ERP-417
marina [Wed, 28 May 2025 09:51:01 +0000 (12:51 +0300)]
ERP-417
marina [Wed, 28 May 2025 09:42:55 +0000 (12:42 +0300)]
ERP-417
marina [Wed, 28 May 2025 09:37:12 +0000 (12:37 +0300)]
ERP-417
marina [Wed, 28 May 2025 09:32:14 +0000 (12:32 +0300)]
ERP-417
marina [Wed, 28 May 2025 09:29:11 +0000 (12:29 +0300)]
ERP-417
marina [Wed, 28 May 2025 09:28:19 +0000 (12:28 +0300)]
ERP-417
marina [Wed, 28 May 2025 09:27:33 +0000 (12:27 +0300)]
ERP-417
marina [Wed, 28 May 2025 09:07:43 +0000 (12:07 +0300)]
ERP-417
marina [Wed, 28 May 2025 09:05:34 +0000 (12:05 +0300)]
ERP-417
marina [Wed, 28 May 2025 07:30:45 +0000 (10:30 +0300)]
ERP-417
marina [Wed, 28 May 2025 07:26:58 +0000 (10:26 +0300)]
ERP-417
marina [Wed, 28 May 2025 07:23:44 +0000 (10:23 +0300)]
ERP-417
marina [Wed, 28 May 2025 07:22:32 +0000 (10:22 +0300)]
ERP-417
marina [Wed, 28 May 2025 07:19:30 +0000 (10:19 +0300)]
ERP-417
marina [Wed, 28 May 2025 07:18:10 +0000 (10:18 +0300)]
ERP-417
marina [Wed, 28 May 2025 06:57:14 +0000 (09:57 +0300)]
ERP-417
marina [Tue, 27 May 2025 12:32:42 +0000 (15:32 +0300)]
ERP-417
marina [Tue, 27 May 2025 12:29:33 +0000 (15:29 +0300)]
ERP-417
marina [Tue, 27 May 2025 12:22:31 +0000 (15:22 +0300)]
ERP-417
marina [Tue, 27 May 2025 12:19:01 +0000 (15:19 +0300)]
ERP-417
projects / erp24_rep / yii-erp24 / .git / log