]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
Aleksey Filippov [Tue, 24 Jun 2025 07:57:14 +0000 (07:57 +0000)]
Merge branch 'feature_filippov_2025_add_percent_workbot_author' into 'develop'
Добавил в справочник процент мотивации для Авторских букетов в воркбот
See merge request gitlab-instance/yii-erp24!886
Aleksey Filippov [Tue, 24 Jun 2025 06:58:31 +0000 (09:58 +0300)]
Добавил в справочник процент мотивации для Авторских букетов в воркбот
Aleksey Filippov [Mon, 23 Jun 2025 08:31:42 +0000 (08:31 +0000)]
Merge branch 'feature_zozirova_erp-423_add_price_to_api' into 'develop'
ERP-423
See merge request gitlab-instance/yii-erp24!884
marina [Mon, 23 Jun 2025 07:45:20 +0000 (10:45 +0300)]
добавлена цена позиции
Aleksey Filippov [Fri, 20 Jun 2025 11:45:33 +0000 (11:45 +0000)]
Merge branch 'feature_fomichev_erp-428_marketplace_orders_1c_exchange_seller_id' into 'develop'
[ERP-428] Правки по seller_id
See merge request gitlab-instance/yii-erp24!881
Vladimir Fomichev [Fri, 20 Jun 2025 09:27:35 +0000 (12:27 +0300)]
Правки по seller_id
Aleksey Filippov [Fri, 20 Jun 2025 07:51:43 +0000 (07:51 +0000)]
Merge branch 'feature_fomichev_erp_424_change_marketplace+orders_statuses_1c_relations' into 'develop'
[ERP-424] Правки по интерфейсу
See merge request gitlab-instance/yii-erp24!879
Aleksey Filippov [Fri, 20 Jun 2025 07:38:12 +0000 (07:38 +0000)]
Merge branch 'feature_fomichev_erp-428_marketplace_orders_1c_exchange_seller_id' into 'develop'
[ERP-428] Доработать обмен с 1с (marketplace_orders)
See merge request gitlab-instance/yii-erp24!880
Vladimir Fomichev [Fri, 20 Jun 2025 07:12:20 +0000 (10:12 +0300)]
Добавление обработки и сохранения полей для заказа
Vladimir Fomichev [Fri, 20 Jun 2025 07:11:31 +0000 (10:11 +0300)]
Добавление обработки и сохранения полей для заказа
Vladimir Fomichev [Fri, 20 Jun 2025 07:10:22 +0000 (10:10 +0300)]
Добавление обработки и сохранения полей для заказа
Vladimir Fomichev [Fri, 20 Jun 2025 06:45:46 +0000 (09:45 +0300)]
Добавление обработки и сохранения полей для заказа
fomichev [Thu, 19 Jun 2025 15:11:24 +0000 (18:11 +0300)]
Добавлена миграция и крон команда
fomichev [Thu, 19 Jun 2025 14:10:01 +0000 (17:10 +0300)]
Правки по интерфейсу
Aleksey Filippov [Thu, 19 Jun 2025 13:46:58 +0000 (13:46 +0000)]
Merge branch 'feature_fomichev_erp_424_change_marketplace+orders_statuses_1c_relations' into 'develop'
[ERP-424] Правки структуры статусов
See merge request gitlab-instance/yii-erp24!878
fomichev [Thu, 19 Jun 2025 13:45:07 +0000 (16:45 +0300)]
Правки структуры статусов
Aleksey Filippov [Thu, 19 Jun 2025 11:52:15 +0000 (11:52 +0000)]
Merge branch 'feature_fomichev_erp_424_change_marketplace+orders_statuses_1c_relations' into 'develop'
[ERP-424] Изменение структуры в крон команде
See merge request gitlab-instance/yii-erp24!877
fomichev [Thu, 19 Jun 2025 11:39:41 +0000 (14:39 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp_424_change_marketplace+orders_statuses_1c_relations
# Conflicts:
# erp24/commands/CronController.php
Vladimir Fomichev [Thu, 19 Jun 2025 09:45:02 +0000 (12:45 +0300)]
Изменение структуры в крон команде
Aleksey Filippov [Thu, 19 Jun 2025 07:48:45 +0000 (07:48 +0000)]
Merge branch 'fix_tooltip' into 'develop'
правки
See merge request gitlab-instance/yii-erp24!876
marina [Thu, 19 Jun 2025 07:41:43 +0000 (10:41 +0300)]
правки
Aleksey Filippov [Thu, 19 Jun 2025 07:18:57 +0000 (07:18 +0000)]
Merge branch 'fix_tooltip' into 'develop'
Fix tooltip
See merge request gitlab-instance/yii-erp24!875
marina [Thu, 19 Jun 2025 07:18:56 +0000 (10:18 +0300)]
правки
marina [Thu, 19 Jun 2025 07:14:36 +0000 (10:14 +0300)]
правки
marina [Thu, 19 Jun 2025 07:12:44 +0000 (10:12 +0300)]
правки
Aleksey Filippov [Thu, 19 Jun 2025 06:25:51 +0000 (06:25 +0000)]
Merge branch 'feature_fomichev_erp_424_change_marketplace+orders_statuses_1c_relations' into 'develop'
[ERP-424] Добавить доступные статусы для перехода в текущем статусе
See merge request gitlab-instance/yii-erp24!874
Vladimir Fomichev [Thu, 19 Jun 2025 06:15:22 +0000 (09:15 +0300)]
Изменение структуры
Aleksey Filippov [Wed, 18 Jun 2025 14:57:48 +0000 (14:57 +0000)]
Merge branch 'fix_tooltip' into 'develop'
правки
See merge request gitlab-instance/yii-erp24!873
marina [Wed, 18 Jun 2025 14:53:10 +0000 (17:53 +0300)]
правки
Aleksey Filippov [Wed, 18 Jun 2025 14:34:31 +0000 (14:34 +0000)]
Merge branch 'feature_fomichev_erp-363_week_forecast' into 'develop'
[ERP-363] Приватный в публичный
See merge request gitlab-instance/yii-erp24!872
Aleksey Filippov [Wed, 18 Jun 2025 14:34:12 +0000 (14:34 +0000)]
Merge branch 'add_link_to_create_orders_on_1c' into 'develop'
добавление поля ссылки для отправки в 1с
See merge request gitlab-instance/yii-erp24!871
Vladimir Fomichev [Wed, 18 Jun 2025 14:28:38 +0000 (17:28 +0300)]
Приватный в публичный
marina [Wed, 18 Jun 2025 14:27:30 +0000 (17:27 +0300)]
добавление поля ссылки для отправки в 1с
Aleksey Filippov [Wed, 18 Jun 2025 14:22:04 +0000 (14:22 +0000)]
Merge branch 'feature_fomichev_erp-363_week_forecast' into 'develop'
[ERP-363] Расчет списаний за 3 месяца
See merge request gitlab-instance/yii-erp24!870
Vladimir Fomichev [Wed, 18 Jun 2025 14:18:55 +0000 (17:18 +0300)]
Расчет за 3 месяца
Aleksey Filippov [Wed, 18 Jun 2025 14:18:07 +0000 (14:18 +0000)]
Merge branch 'add_manager_link_on_marketplace_orders' into 'develop'
добавление поля ссылки на панели менеджера заказов
See merge request gitlab-instance/yii-erp24!869
marina [Wed, 18 Jun 2025 14:16:58 +0000 (17:16 +0300)]
добавление поля ссылки на панели менеджера заказов
marina [Wed, 18 Jun 2025 14:15:56 +0000 (17:15 +0300)]
добавление поля ссылки на панели менеджера заказов
Aleksey Filippov [Wed, 18 Jun 2025 13:57:17 +0000 (13:57 +0000)]
Merge branch 'feature_fomichev_erp_424_change_marketplace+orders_statuses_1c_relations' into 'develop'
[ERP-424] Добавить доступные статусы для перехода в текущем статусе
See merge request gitlab-instance/yii-erp24!854
Aleksey Filippov [Wed, 18 Jun 2025 13:35:58 +0000 (13:35 +0000)]
Merge branch 'feature_zozirova_erp-360_autoplannogramma_build' into 'develop'
ERP-360 Сборка страницы автопм
See merge request gitlab-instance/yii-erp24!868
marina [Wed, 18 Jun 2025 13:35:45 +0000 (16:35 +0300)]
ERP-360 Сборка страницы автопм
marina [Wed, 18 Jun 2025 13:32:10 +0000 (16:32 +0300)]
ERP-360 Сборка страницы автопм
Aleksey Filippov [Wed, 18 Jun 2025 13:18:10 +0000 (13:18 +0000)]
Merge branch 'feature_zozirova_erp-360_autoplannogramma_build' into 'develop'
ERP-360
See merge request gitlab-instance/yii-erp24!865
marina [Wed, 18 Jun 2025 12:54:47 +0000 (15:54 +0300)]
Merge branch 'develop' into feature_zozirova_erp-360_autoplannogramma_build
# Conflicts:
# erp24/services/AutoPlannogrammaService.php
marina [Wed, 18 Jun 2025 12:52:16 +0000 (15:52 +0300)]
ERP-360 Сборка страницы автопм
marina [Wed, 18 Jun 2025 12:51:36 +0000 (15:51 +0300)]
ERP-360 Сборка страницы автопм
marina [Wed, 18 Jun 2025 12:49:38 +0000 (15:49 +0300)]
ERP-360 Сборка страницы автопм
Aleksey Filippov [Wed, 18 Jun 2025 12:35:51 +0000 (12:35 +0000)]
Merge branch 'feature_fomichev_erp-363_week_forecast' into 'develop'
[ERP-363] Правка доли списаний на товар
See merge request gitlab-instance/yii-erp24!867
Vladimir Fomichev [Wed, 18 Jun 2025 12:28:59 +0000 (15:28 +0300)]
Добавление группировки
marina [Wed, 18 Jun 2025 12:19:23 +0000 (15:19 +0300)]
ERP-360 Сборка страницы автопм
Vladimir Fomichev [Wed, 18 Jun 2025 12:03:02 +0000 (15:03 +0300)]
Merge branch 'develop' into feature_fomichev_erp-363_week_forecast
# Conflicts:
# erp24/controllers/AutoPlannogrammaController.php
# erp24/services/AutoPlannogrammaService.php
Vladimir Fomichev [Wed, 18 Jun 2025 11:54:59 +0000 (14:54 +0300)]
Вычисление долей списания товара в виде
marina [Wed, 18 Jun 2025 07:38:59 +0000 (10:38 +0300)]
ERP-360 Сборка страницы автопм
marina [Wed, 18 Jun 2025 07:00:04 +0000 (10:00 +0300)]
Merge branch 'develop' into feature_zozirova_erp-360_autoplannogramma_build
Vladimir Fomichev [Tue, 17 Jun 2025 15:10:17 +0000 (18:10 +0300)]
Перенос в DataController.php actionRequest
Vladimir Fomichev [Tue, 17 Jun 2025 15:04:45 +0000 (18:04 +0300)]
Перенос в DataController.php actionRequest
Aleksey Filippov [Tue, 17 Jun 2025 14:21:24 +0000 (14:21 +0000)]
Merge branch 'change_result_api_format' into 'develop'
правка апи для 1с
See merge request gitlab-instance/yii-erp24!866
marina [Tue, 17 Jun 2025 14:18:12 +0000 (17:18 +0300)]
правка апи для 1с
marina [Tue, 17 Jun 2025 13:42:42 +0000 (16:42 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 12:59:36 +0000 (15:59 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 12:58:05 +0000 (15:58 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 12:56:04 +0000 (15:56 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 12:53:09 +0000 (15:53 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 12:52:26 +0000 (15:52 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 12:51:14 +0000 (15:51 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 12:49:47 +0000 (15:49 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 12:47:55 +0000 (15:47 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 12:36:39 +0000 (15:36 +0300)]
Merge branch 'develop' into feature_zozirova_erp-360_autoplannogramma_build
# Conflicts:
# erp24/commands/CronController.php
marina [Tue, 17 Jun 2025 12:25:09 +0000 (15:25 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 12:19:33 +0000 (15:19 +0300)]
ERP-360 Сборка страницы автопм
Aleksey Filippov [Tue, 17 Jun 2025 12:17:39 +0000 (12:17 +0000)]
Merge branch 'feature_zozirova_erp-360_autoplannogramma_build_tooltips' into 'develop'
[ERP-360] Добавление колонки крона
See merge request gitlab-instance/yii-erp24!864
Vladimir Fomichev [Tue, 17 Jun 2025 12:07:01 +0000 (15:07 +0300)]
Исправление ошибок при исполнении скрипта крона
Vladimir Fomichev [Tue, 17 Jun 2025 11:39:33 +0000 (14:39 +0300)]
Миграция добавление колонки списаний
Vladimir Fomichev [Tue, 17 Jun 2025 11:31:59 +0000 (14:31 +0300)]
Merge branch 'feature_zozirova_erp-360_autoplannogramma_build' into feature_zozirova_erp-360_autoplannogramma_build_tooltips
# Conflicts:
# erp24/services/AutoPlannogrammaService.php
Vladimir Fomichev [Tue, 17 Jun 2025 11:30:33 +0000 (14:30 +0300)]
Merge remote-tracking branch 'origin/feature_zozirova_erp-360_autoplannogramma_build' into feature_zozirova_erp-360_autoplannogramma_build
# Conflicts:
# erp24/controllers/AutoPlannogrammaController.php
# erp24/web/js/autoplannogramma/autoplannogramma.js
Aleksey Filippov [Tue, 17 Jun 2025 11:20:28 +0000 (11:20 +0000)]
Merge branch 'feature_zozirova_erp-423_send_orders_to_1c' into 'develop'
ERP-423
See merge request gitlab-instance/yii-erp24!863
Vladimir Fomichev [Tue, 17 Jun 2025 11:13:25 +0000 (14:13 +0300)]
Рассчет в кроне
marina [Tue, 17 Jun 2025 11:01:56 +0000 (14:01 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 11:00:28 +0000 (14:00 +0300)]
ERP-360 Сборка страницы автопм
Vladimir Fomichev [Tue, 17 Jun 2025 10:43:50 +0000 (13:43 +0300)]
правки таблиц для списаний
Vladimir Fomichev [Tue, 17 Jun 2025 10:33:01 +0000 (13:33 +0300)]
метод прогноза списаний
marina [Tue, 17 Jun 2025 10:16:42 +0000 (13:16 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 10:11:41 +0000 (13:11 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 10:11:26 +0000 (13:11 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 10:09:21 +0000 (13:09 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 10:06:27 +0000 (13:06 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 10:04:15 +0000 (13:04 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 10:03:41 +0000 (13:03 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 10:02:05 +0000 (13:02 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 09:59:14 +0000 (12:59 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 09:55:40 +0000 (12:55 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 09:48:58 +0000 (12:48 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 09:46:22 +0000 (12:46 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 09:42:41 +0000 (12:42 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 09:33:05 +0000 (12:33 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 09:25:38 +0000 (12:25 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 09:22:41 +0000 (12:22 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 09:19:25 +0000 (12:19 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 09:05:33 +0000 (12:05 +0300)]
ERP-360 Сборка страницы автопм
marina [Tue, 17 Jun 2025 09:03:44 +0000 (12:03 +0300)]
ERP-360 Сборка страницы автопм
projects / erp24_rep / yii-erp24 / .git / log