]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
marina [Mon, 2 Dec 2024 14:05:00 +0000 (17:05 +0300)]
ERP-243 Действия по замене (II этап)
Aleksey Filippov [Mon, 2 Dec 2024 13:57:00 +0000 (13:57 +0000)]
Merge branch 'feature_smirnov_erp-242_input_fact_remains' into 'develop'
Feature smirnov erp 242 input fact remains
See merge request gitlab-instance/yii-erp24!459
Aleksey Filippov [Mon, 2 Dec 2024 13:50:40 +0000 (13:50 +0000)]
Merge branch 'fix_step_on_replacement' into 'develop'
ERP-243 Действия по замене (II этап)
See merge request gitlab-instance/yii-erp24!458
marina [Mon, 2 Dec 2024 13:49:38 +0000 (16:49 +0300)]
ERP-243 Действия по замене (II этап)
marina [Mon, 2 Dec 2024 13:49:14 +0000 (16:49 +0300)]
ERP-243 Действия по замене (II этап)
marina [Mon, 2 Dec 2024 13:46:09 +0000 (16:46 +0300)]
ERP-243 Действия по замене (II этап)
Alexander Smirnov [Mon, 2 Dec 2024 13:28:53 +0000 (16:28 +0300)]
[ERP-242] переделки
marina [Mon, 2 Dec 2024 13:25:52 +0000 (16:25 +0300)]
ERP-243 Действия по замене (II этап)
marina [Mon, 2 Dec 2024 13:15:22 +0000 (16:15 +0300)]
ERP-243 Действия по замене (II этап)
Alexander Smirnov [Mon, 2 Dec 2024 12:55:53 +0000 (15:55 +0300)]
[ERP-242] поправка индекса в update.js
Alexander Smirnov [Mon, 2 Dec 2024 12:12:22 +0000 (15:12 +0300)]
[ERP-242] спрятали статус
Alexander Smirnov [Mon, 2 Dec 2024 11:59:36 +0000 (14:59 +0300)]
[ERP-242] ограничение магазинов по пользователю и пользователей по магазину
Aleksey Filippov [Mon, 2 Dec 2024 10:34:00 +0000 (10:34 +0000)]
Merge branch 'close_access_for_dismissed' into 'develop'
запретить уволенным пользователям входить в систему
See merge request gitlab-instance/yii-erp24!457
marina [Mon, 2 Dec 2024 10:31:58 +0000 (13:31 +0300)]
запретить уволенным пользователям входить в систему
Aleksey Filippov [Mon, 2 Dec 2024 09:52:13 +0000 (09:52 +0000)]
Merge branch 'feature_fomichev_erp-234_upload_add_props_products' into 'develop'
[ERP-234] Настроить получение доп.свойств из каталога 1С
See merge request gitlab-instance/yii-erp24!456
Aleksey Filippov [Mon, 2 Dec 2024 09:40:30 +0000 (09:40 +0000)]
Merge branch 'feature_smirnov_erp-242_input_fact_remains' into 'develop'
Feature smirnov erp 242 input fact remains
See merge request gitlab-instance/yii-erp24!455
fomichev [Mon, 2 Dec 2024 09:19:24 +0000 (12:19 +0300)]
Исправление вывода тегов на категорияз в каталоге
Alexander Smirnov [Mon, 2 Dec 2024 09:17:58 +0000 (12:17 +0300)]
[ERP-242] после неудачного резолва конфликта
Alexander Smirnov [Mon, 2 Dec 2024 09:06:37 +0000 (12:06 +0300)]
[ERP-242] осле неправильного резолва конфликта
Aleksey Filippov [Mon, 2 Dec 2024 08:29:43 +0000 (08:29 +0000)]
Merge branch 'feature_smirnov_erp-242_input_fact_remains' into 'develop'
Feature smirnov erp 242 input fact remains
See merge request gitlab-instance/yii-erp24!454
Alexander Smirnov [Mon, 2 Dec 2024 08:27:00 +0000 (11:27 +0300)]
Merge branch 'develop' into feature_smirnov_erp-242_input_fact_remains
# Conflicts:
# erp24/controllers/ShiftTransferController.php
Alexander Smirnov [Mon, 2 Dec 2024 08:24:01 +0000 (11:24 +0300)]
[ERP-242] отсортировать передачи смен
Aleksey Filippov [Mon, 2 Dec 2024 08:20:48 +0000 (08:20 +0000)]
Merge branch 'feature_fomichev_erp_249_save_nomenclature_cards_features' into 'develop'
[ERP-249] Сохранение значений характеристик номенклатуры карточки товара из 1с
See merge request gitlab-instance/yii-erp24!452
Aleksey Filippov [Mon, 2 Dec 2024 08:12:28 +0000 (08:12 +0000)]
Merge branch 'feature_zozirova_erp-243_replacment_actions_2' into 'develop'
ERP-243 Действия по замене (II этап)
See merge request gitlab-instance/yii-erp24!453
marina [Mon, 2 Dec 2024 08:09:18 +0000 (11:09 +0300)]
Merge branch 'develop' into feature_zozirova_erp-243_replacment_actions_2
# Conflicts:
# erp24/controllers/ShiftTransferController.php
marina [Mon, 2 Dec 2024 08:05:20 +0000 (11:05 +0300)]
ERP-243 Действия по замене (II этап)
Aleksey Filippov [Mon, 2 Dec 2024 08:00:13 +0000 (08:00 +0000)]
Merge branch 'feature_smirnov_erp-248_shift_transfer_replacement_invoice' into 'develop'
[ERP-248] накладная товаров замены при передаче смены
See merge request gitlab-instance/yii-erp24!446
marina [Mon, 2 Dec 2024 07:06:00 +0000 (10:06 +0300)]
ERP-243 Действия по замене (II этап)
marina [Mon, 2 Dec 2024 07:04:49 +0000 (10:04 +0300)]
ERP-243 Действия по замене (II этап)
marina [Mon, 2 Dec 2024 06:59:10 +0000 (09:59 +0300)]
ERP-243 Действия по замене (II этап)
marina [Mon, 2 Dec 2024 06:50:41 +0000 (09:50 +0300)]
ERP-243 Действия по замене (II этап)
marina [Mon, 2 Dec 2024 06:12:40 +0000 (09:12 +0300)]
ERP-243 Действия по замене (II этап)
Alexander Smirnov [Fri, 29 Nov 2024 18:10:31 +0000 (21:10 +0300)]
[ERP-242] сохранение остатков при перезагрузке неправильной формы передачи смены
marina [Fri, 29 Nov 2024 16:03:50 +0000 (19:03 +0300)]
ERP-243 Действия по замене (II этап)
marina [Fri, 29 Nov 2024 16:02:52 +0000 (19:02 +0300)]
Merge branch 'develop' into feature_zozirova_erp-243_replacment_actions_2
# Conflicts:
# erp24/controllers/ShiftTransferController.php
# erp24/views/shift-transfer/view.php
marina [Fri, 29 Nov 2024 16:00:48 +0000 (19:00 +0300)]
ERP-243 Действия по замене (II этап)
marina [Fri, 29 Nov 2024 15:57:54 +0000 (18:57 +0300)]
ERP-243 Действия по замене (II этап)
marina [Fri, 29 Nov 2024 15:48:36 +0000 (18:48 +0300)]
ERP-243 Действия по замене (II этап)
Aleksey Filippov [Fri, 29 Nov 2024 14:18:10 +0000 (14:18 +0000)]
Merge branch 'feature_smirnov_erp-251_soft_deletion_from_matrix_erp' into 'develop'
[ERP-251] мягкое удаление из matrix_erp
See merge request gitlab-instance/yii-erp24!451
Alexander Smirnov [Fri, 29 Nov 2024 14:15:14 +0000 (17:15 +0300)]
[ERP-251] отображать в посланных и посылать только active=1 карточки c articule
fomichev [Fri, 29 Nov 2024 13:22:20 +0000 (16:22 +0300)]
Merge branch 'refs/heads/feature_fomichev_erp-234_upload_add_props_products' into feature_fomichev_erp_249_save_nomenclature_cards_features
fomichev [Fri, 29 Nov 2024 13:21:56 +0000 (16:21 +0300)]
Форматирование кода
fomichev [Fri, 29 Nov 2024 13:19:09 +0000 (16:19 +0300)]
Форматирование кода
fomichev [Fri, 29 Nov 2024 13:07:40 +0000 (16:07 +0300)]
Merge branch 'refs/heads/feature_fomichev_erp-234_upload_add_props_products' into feature_fomichev_erp_249_save_nomenclature_cards_features
fomichev [Fri, 29 Nov 2024 13:07:14 +0000 (16:07 +0300)]
Форматирование кода
fomichev [Fri, 29 Nov 2024 12:50:10 +0000 (15:50 +0300)]
Форматирование кода
fomichev [Fri, 29 Nov 2024 12:41:32 +0000 (15:41 +0300)]
Merge branch 'refs/heads/feature_fomichev_erp-234_upload_add_props_products' into feature_fomichev_erp_249_save_nomenclature_cards_features
fomichev [Fri, 29 Nov 2024 12:40:16 +0000 (15:40 +0300)]
Форматирование кода
fomichev [Fri, 29 Nov 2024 12:30:20 +0000 (15:30 +0300)]
Форматирование кода
Alexander Smirnov [Fri, 29 Nov 2024 11:26:36 +0000 (14:26 +0300)]
[ERP-251] быстрый переход во вью
Alexander Smirnov [Fri, 29 Nov 2024 11:17:52 +0000 (14:17 +0300)]
[ERP-251] сообщения об ошибках
marina [Fri, 29 Nov 2024 06:45:31 +0000 (09:45 +0300)]
ERP-243 Действия по замене (II этап)
Alexander Smirnov [Thu, 28 Nov 2024 15:00:51 +0000 (18:00 +0300)]
[ERP-251] поправки
fomichev [Thu, 28 Nov 2024 14:56:54 +0000 (17:56 +0300)]
Возвращаем путь к файлу
Alexander Smirnov [Thu, 28 Nov 2024 14:56:34 +0000 (17:56 +0300)]
[ERP-251] поправка
Alexander Smirnov [Thu, 28 Nov 2024 14:50:06 +0000 (17:50 +0300)]
[ERP-251] поправки
Alexander Smirnov [Thu, 28 Nov 2024 14:43:59 +0000 (17:43 +0300)]
[ERP-251] поправка миграции
Alexander Smirnov [Thu, 28 Nov 2024 14:32:16 +0000 (17:32 +0300)]
[ERP-251] мягкое удаление из matrix_erp
fomichev [Thu, 28 Nov 2024 14:28:00 +0000 (17:28 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp_249_save_nomenclature_cards_features
fomichev [Thu, 28 Nov 2024 14:27:25 +0000 (17:27 +0300)]
Интерфейс редактирования наименований свойств товара
fomichev [Thu, 28 Nov 2024 13:16:30 +0000 (16:16 +0300)]
Удаление миграции
fomichev [Thu, 28 Nov 2024 13:15:38 +0000 (16:15 +0300)]
Добавление характеристик в таблицу
fomichev [Thu, 28 Nov 2024 12:38:54 +0000 (15:38 +0300)]
Merge branch 'refs/heads/feature_fomichev_erp-234_upload_add_props_products' into feature_fomichev_erp_249_save_nomenclature_cards_features
Aleksey Filippov [Thu, 28 Nov 2024 12:29:11 +0000 (12:29 +0000)]
Merge branch 'feature_smirnov_22024_11_28_articule_in_marketplace' into 'develop'
articule вместо guid
See merge request gitlab-instance/yii-erp24!450
Alexander Smirnov [Thu, 28 Nov 2024 12:27:24 +0000 (15:27 +0300)]
articule вместо guid
fomichev [Thu, 28 Nov 2024 08:34:37 +0000 (11:34 +0300)]
Форматирование
Aleksey Filippov [Thu, 28 Nov 2024 08:02:16 +0000 (08:02 +0000)]
Merge branch 'feature_smirnov_erp-242_input_fact_remains' into 'develop'
[ERP-242] автоматика на старые значения и скрытие автоматически вычисляемых
See merge request gitlab-instance/yii-erp24!447
Alexander Smirnov [Thu, 28 Nov 2024 08:01:37 +0000 (11:01 +0300)]
[ERP-242] remove var_dump
Alexander Smirnov [Thu, 28 Nov 2024 07:58:16 +0000 (10:58 +0300)]
[ERP-242] disabled -> readonly
Aleksey Filippov [Thu, 28 Nov 2024 06:14:55 +0000 (06:14 +0000)]
Merge branch 'feature_fomichev_erp-239_replacement_interface' into 'develop'
[ERP-239] Создать интерфейс для формирования возможных замен
See merge request gitlab-instance/yii-erp24!444
fomichev [Wed, 27 Nov 2024 14:37:20 +0000 (17:37 +0300)]
Поправил название класса
Alexander Smirnov [Wed, 27 Nov 2024 12:12:40 +0000 (15:12 +0300)]
[ERP-242] автоматика на старые значения и скрытие автоматически вычисляемых
fomichev [Wed, 27 Nov 2024 12:09:47 +0000 (15:09 +0300)]
Изменение миграций и моделей
marina [Wed, 27 Nov 2024 08:06:06 +0000 (11:06 +0300)]
ERP-243 Действия по замене (II этап)
Alexander Smirnov [Wed, 27 Nov 2024 07:48:38 +0000 (10:48 +0300)]
[ERP-248] накладная товаров замены при передаче смены
Aleksey Filippov [Wed, 27 Nov 2024 07:26:16 +0000 (07:26 +0000)]
Merge branch 'feature_smirnov_erp-242_input_fact_remains' into 'develop'
[ERP-241] задизейблить статус
See merge request gitlab-instance/yii-erp24!445
fomichev [Tue, 26 Nov 2024 15:41:18 +0000 (18:41 +0300)]
Миграция с доп полями products_1c
Alexander Smirnov [Tue, 26 Nov 2024 07:41:08 +0000 (10:41 +0300)]
[ERP-241] задизейблить статус
fomichev [Mon, 25 Nov 2024 14:46:07 +0000 (17:46 +0300)]
Задвоение удалений и при удалении последней записи переход на индекс
fomichev [Mon, 25 Nov 2024 12:26:53 +0000 (15:26 +0300)]
Получение списка классов в контроллере из справочника
Aleksey Filippov [Mon, 25 Nov 2024 11:38:55 +0000 (11:38 +0000)]
Merge branch 'feature_smirnov_erp-242_input_fact_remains' into 'develop'
[ERP-242] ввод фактических остатков
See merge request gitlab-instance/yii-erp24!443
fomichev [Mon, 25 Nov 2024 09:57:40 +0000 (12:57 +0300)]
Первичный ключ
fomichev [Mon, 25 Nov 2024 09:37:43 +0000 (12:37 +0300)]
Замена константы на вызов функции
fomichev [Mon, 25 Nov 2024 09:34:24 +0000 (12:34 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-234_upload_add_props_products
# Conflicts:
# erp24/records/ProductsClass.php
fomichev [Fri, 22 Nov 2024 16:23:08 +0000 (19:23 +0300)]
Настройка привязки классов
fomichev [Fri, 22 Nov 2024 15:31:40 +0000 (18:31 +0300)]
Вывод доп свойств
Aleksey Filippov [Fri, 22 Nov 2024 13:15:38 +0000 (13:15 +0000)]
Merge branch 'feature_smirnov_erp-135_hide_visible_0_in_filters' into 'develop'
[ERP-135] Спрятать магазины с visible=0
See merge request gitlab-instance/yii-erp24!296
Alexander Smirnov [Fri, 22 Nov 2024 06:50:13 +0000 (09:50 +0300)]
[ERP-242] итого в картик вьюв
Alexander Smirnov [Fri, 22 Nov 2024 06:46:03 +0000 (09:46 +0300)]
[ERP-242] итого в картик вьюв
fomichev [Thu, 21 Nov 2024 15:08:45 +0000 (18:08 +0300)]
Перенос и правки кода
Alexander Smirnov [Thu, 21 Nov 2024 14:02:46 +0000 (17:02 +0300)]
[ERP-242] ввод фактических остатков
fomichev [Thu, 21 Nov 2024 11:15:16 +0000 (14:15 +0300)]
Добаввил экшн actionAjaxProductProvider
fomichev [Thu, 21 Nov 2024 08:13:52 +0000 (11:13 +0300)]
Добавление выпадающего списка товаров в группе
fomichev [Thu, 21 Nov 2024 05:49:24 +0000 (08:49 +0300)]
Перенос функционала каталога
Aleksey Filippov [Wed, 20 Nov 2024 13:20:12 +0000 (13:20 +0000)]
Merge branch 'feature_smirnov_erp-240_store_balance_table' into 'develop'
[ERP-240] создание таблицы store_balance
See merge request gitlab-instance/yii-erp24!440
Aleksey Filippov [Wed, 20 Nov 2024 13:17:14 +0000 (13:17 +0000)]
Merge branch 'feature_fomichev_erp-239_replacement_interface' into 'develop'
[ERP-239] Создать интерфейс для формирования возможных замен
See merge request gitlab-instance/yii-erp24!439
Aleksey Filippov [Wed, 20 Nov 2024 13:11:20 +0000 (13:11 +0000)]
Merge branch 'feature_fomichev_erp-232_error_log_bot' into 'develop'
[ERP-232] Создать бота и настроить отправку логов с ошибками из ERP
See merge request gitlab-instance/yii-erp24!430
Aleksey Filippov [Wed, 20 Nov 2024 13:10:18 +0000 (13:10 +0000)]
Merge branch 'feature_fomichev_erp_215_link_cluster_to_manager' into 'develop'
[ERP-215] Сделать интерфейс и хранение данных о принадлежности кустового к кусту
See merge request gitlab-instance/yii-erp24!405
Aleksey Filippov [Wed, 20 Nov 2024 12:53:03 +0000 (12:53 +0000)]
Merge branch 'feature_smirnov_2024_11_15_refactor_marketplace_products' into 'develop'
Рефактор marketplace products
See merge request gitlab-instance/yii-erp24!437
Aleksey Filippov [Wed, 20 Nov 2024 12:45:56 +0000 (12:45 +0000)]
Merge branch 'feature_smirnov_erp-241_shift_transfer' into 'develop'
[ERP-241] передача смены
See merge request gitlab-instance/yii-erp24!438
projects / erp24_rep / yii-erp24 / .git / log