]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
Marina Zozirova [Thu, 19 Sep 2024 11:05:13 +0000 (11:05 +0000)]
добавление can_open Timetable.php
Aleksey Filippov [Thu, 19 Sep 2024 09:31:25 +0000 (09:31 +0000)]
Merge branch 'bug_zozirova_erp-175_fixes_for_tg_bot' into 'develop'
Bug zozirova erp 175 fixes for tg bot
See merge request gitlab-instance/yii-erp24!369
marina [Thu, 19 Sep 2024 09:30:22 +0000 (12:30 +0300)]
Merge branch 'develop' into bug_zozirova_erp-175_fixes_for_tg_bot
# Conflicts:
# erp24/api3/modules/v1/models/timetable/Timetable.php
marina [Thu, 19 Sep 2024 09:29:09 +0000 (12:29 +0300)]
фильтрация смен
marina [Thu, 19 Sep 2024 08:49:52 +0000 (11:49 +0300)]
добавление can_open Timetable.php
Aleksey Filippov [Thu, 19 Sep 2024 08:26:10 +0000 (08:26 +0000)]
Merge branch 'bug_zozirova_erp-175_fixes_for_tg_bot' into 'develop'
Bug zozirova erp 175 fixes for tg bot
See merge request gitlab-instance/yii-erp24!368
Marina Zozirova [Thu, 19 Sep 2024 08:26:09 +0000 (08:26 +0000)]
Bug zozirova erp 175 fixes for tg bot
marina [Thu, 19 Sep 2024 08:08:44 +0000 (11:08 +0300)]
добавление can_open Timetable.php
marina [Thu, 19 Sep 2024 06:52:53 +0000 (09:52 +0300)]
переименование date_shift TimetableFactModel.php в date
Aleksey Filippov [Wed, 18 Sep 2024 13:15:37 +0000 (13:15 +0000)]
Merge branch 'bug_zozirova_erp-175_fixes_for_tg_bot' into 'develop'
Bug zozirova erp 175 fixes for tg bot
See merge request gitlab-instance/yii-erp24!366
marina [Wed, 18 Sep 2024 13:11:44 +0000 (16:11 +0300)]
Merge branch 'develop' into bug_zozirova_erp-175_fixes_for_tg_bot
# Conflicts:
# erp24/api3/core/services/TimetableService.php
# erp24/records/TimetableFactModel.php
marina [Wed, 18 Sep 2024 13:06:26 +0000 (16:06 +0300)]
переименование date_shift TimetableFactModel.php в date
marina [Wed, 18 Sep 2024 13:01:15 +0000 (16:01 +0300)]
переименование date_shift TimetableFactModel.php в date
Aleksey Filippov [Wed, 18 Sep 2024 11:26:35 +0000 (11:26 +0000)]
Merge branch 'bug_zozirova_erp-175_fixes_for_tg_bot' into 'develop'
Bug zozirova erp 175 fixes for tg bot
See merge request gitlab-instance/yii-erp24!365
Marina Zozirova [Wed, 18 Sep 2024 11:26:35 +0000 (11:26 +0000)]
Bug zozirova erp 175 fixes for tg bot
marina [Wed, 18 Sep 2024 11:25:30 +0000 (14:25 +0300)]
ERP-175 Исправить ошибки ворк-бота корректная версия
Aleksey Filippov [Wed, 18 Sep 2024 09:34:26 +0000 (09:34 +0000)]
Merge branch 'bug_zozirova_erp-175_fixes_for_tg_bot' into 'develop'
Bug zozirova erp 175 fixes for tg bot
See merge request gitlab-instance/yii-erp24!364
Marina Zozirova [Wed, 18 Sep 2024 09:34:26 +0000 (09:34 +0000)]
Bug zozirova erp 175 fixes for tg bot
marina [Wed, 18 Sep 2024 09:11:39 +0000 (12:11 +0300)]
Merge branch 'develop' into bug_zozirova_erp-175_fixes_for_tg_bot
# Conflicts:
# erp24/api3/modules/v1/controllers/timetable/PlanController.php
# erp24/records/TimetableFactModel.php
marina [Wed, 18 Sep 2024 09:05:39 +0000 (12:05 +0300)]
ERP-175 Исправить ошибки ворк-бота корректная версия
marina [Wed, 18 Sep 2024 09:00:16 +0000 (12:00 +0300)]
ERP-175 Исправить ошибки ворк-бота корректная версия
Aleksey Filippov [Wed, 18 Sep 2024 06:49:42 +0000 (06:49 +0000)]
Merge branch 'fix_fomichev_erp_133_change_crud_employee-payment' into 'develop'
[ERP-133] Переработать страницу окладов
See merge request gitlab-instance/yii-erp24!311
Aleksey Filippov [Tue, 17 Sep 2024 14:08:19 +0000 (14:08 +0000)]
Merge branch 'revert_175_zozirova' into 'develop'
ERP-175 Исправить ошибки ворк-бота ОТКАТ
See merge request gitlab-instance/yii-erp24!362
Marina Zozirova [Tue, 17 Sep 2024 14:08:19 +0000 (14:08 +0000)]
ERP-175 Исправить ошибки ворк-бота ОТКАТ
marina [Tue, 17 Sep 2024 14:02:22 +0000 (17:02 +0300)]
ERP-175 Исправить ошибки ворк-бота
Aleksey Filippov [Tue, 17 Sep 2024 11:33:40 +0000 (11:33 +0000)]
Merge branch 'bug_zozirova_erp-175_fixes_for_tg_bot' into 'develop'
ERP-175 Исправить ошибки ворк-бота
See merge request gitlab-instance/yii-erp24!361
marina [Tue, 17 Sep 2024 11:12:47 +0000 (14:12 +0300)]
ERP-175 Исправить ошибки ворк-бота
vladfo [Tue, 17 Sep 2024 05:57:14 +0000 (08:57 +0300)]
Поменял правило валидации
vladfo [Tue, 17 Sep 2024 05:49:12 +0000 (08:49 +0300)]
Merge branch 'refs/heads/develop' into fix_fomichev_erp_133_change_crud_employee-payment
Aleksey Filippov [Fri, 13 Sep 2024 13:19:34 +0000 (13:19 +0000)]
Merge branch 'feature_smirnov_erp-185_comment_popup' into 'develop'
[ERP-185] комментарий при добавлении в чс
See merge request gitlab-instance/yii-erp24!354
Aleksey Filippov [Thu, 12 Sep 2024 13:16:21 +0000 (13:16 +0000)]
Merge branch 'feature_fomichev_erp_32_api_integration_save_fix' into 'develop'
[ERP-32] В Интеграции при привязке сотрудника не сохраняется guid
See merge request gitlab-instance/yii-erp24!357
Aleksey Filippov [Thu, 12 Sep 2024 12:25:23 +0000 (12:25 +0000)]
Merge branch 'feature_smirnov_erp-186_sales_without_service_and_service_delivery' into 'develop'
[ERP-186] Вычитаем из подсчёта продаж service и service_delivery категории товаров
See merge request gitlab-instance/yii-erp24!355
Alexander Smirnov [Thu, 12 Sep 2024 12:04:09 +0000 (15:04 +0300)]
[ERP-185] Переделан модальный диалог вместо промпта
Vladimir Fomichev [Thu, 12 Sep 2024 11:54:12 +0000 (14:54 +0300)]
чистка кода
Alexander Smirnov [Wed, 11 Sep 2024 14:51:43 +0000 (17:51 +0300)]
[ERP-186] Вычитаем из подсчёта продаж service и service_delivery категории товаров
Vladimir Fomichev [Wed, 11 Sep 2024 11:25:28 +0000 (14:25 +0300)]
добавил обновление данных
Alexander Smirnov [Wed, 11 Sep 2024 11:23:42 +0000 (14:23 +0300)]
[ERP-185] комментарий при добавлении в чс
Vladimir Fomichev [Wed, 11 Sep 2024 11:00:28 +0000 (14:00 +0300)]
добавил обработчик поиска и кнопки
Aleksey Filippov [Wed, 11 Sep 2024 10:49:11 +0000 (10:49 +0000)]
Merge branch 'feature_fomichev_erp_172_cabinet_admin_search' into 'develop'
[ERP-172] Доработать поиск по сотрудникам на странице /cabinet/index
See merge request gitlab-instance/yii-erp24!353
Aleksey Filippov [Wed, 11 Sep 2024 10:46:40 +0000 (10:46 +0000)]
Merge branch 'feature_smirnov_erp-166_clear_phone' into 'develop'
[ERP-166] новый метод очистки телефонных номеров со справочником
See merge request gitlab-instance/yii-erp24!326
Aleksey Filippov [Wed, 11 Sep 2024 10:44:42 +0000 (10:44 +0000)]
Merge branch 'feature_smirnov_erp-183_month_sales_dashboard' into 'develop'
[ERP-183] dashboard/sales показывает чеки за месяц
See merge request gitlab-instance/yii-erp24!352
Vladimir Fomichev [Wed, 11 Sep 2024 06:58:15 +0000 (09:58 +0300)]
чистка кода
Vladimir Fomichev [Wed, 11 Sep 2024 06:49:14 +0000 (09:49 +0300)]
Merge branch 'develop' into fix_fomichev_erp_133_change_crud_employee-payment
Vladimir Fomichev [Wed, 11 Sep 2024 06:45:15 +0000 (09:45 +0300)]
чистка кода
Vladimir Fomichev [Wed, 11 Sep 2024 06:43:42 +0000 (09:43 +0300)]
чистка кода
Vladimir Fomichev [Wed, 11 Sep 2024 06:25:38 +0000 (09:25 +0300)]
Merge branch 'develop' into feature_fomichev_erp_172_cabinet_admin_search
Alexander Smirnov [Tue, 10 Sep 2024 14:42:35 +0000 (17:42 +0300)]
[ERP-183] dashboard/sales показывает чеки за месяц
Aleksey Filippov [Tue, 10 Sep 2024 13:21:15 +0000 (13:21 +0000)]
Merge branch 'feature_fomichev_erp_180_permission_for_admin' into 'develop'
[ERP-180] Открыть доступ к списаниям
See merge request gitlab-instance/yii-erp24!348
Vladimir Fomichev [Tue, 10 Sep 2024 08:20:31 +0000 (11:20 +0300)]
Merge branch 'develop' into fix_fomichev_erp_133_change_crud_employee-payment
Aleksey Filippov [Tue, 10 Sep 2024 06:33:47 +0000 (06:33 +0000)]
Merge branch 'feature_smirnov_erp-152_storage' into 'develop'
[ERP-152] Переписывание storage
See merge request gitlab-instance/yii-erp24!317
Alexander Smirnov [Mon, 9 Sep 2024 18:12:29 +0000 (21:12 +0300)]
[ERP-152] Правки по комментариям
Aleksey Filippov [Mon, 9 Sep 2024 13:07:48 +0000 (13:07 +0000)]
Merge branch 'fixes_for_tg_bot' into 'develop'
правка для отображения данных в телеграм боте
See merge request gitlab-instance/yii-erp24!351
marina [Mon, 9 Sep 2024 12:54:22 +0000 (15:54 +0300)]
правка для отображения данных в телеграм боте
Aleksey Filippov [Mon, 9 Sep 2024 12:16:22 +0000 (12:16 +0000)]
Merge branch 'fixes_for_tg_bot' into 'develop'
правка для отображения данных в телеграм боте
See merge request gitlab-instance/yii-erp24!350
marina [Mon, 9 Sep 2024 12:09:33 +0000 (15:09 +0300)]
правка для отображения данных в телеграм боте
Aleksey Filippov [Mon, 9 Sep 2024 11:43:23 +0000 (11:43 +0000)]
Merge branch 'feature_fomichev_erp-179_motivation_access' into 'develop'
[ERP-179] Настроить доступ к таблице мотивации
See merge request gitlab-instance/yii-erp24!349
Vladimir Fomichev [Mon, 9 Sep 2024 11:33:14 +0000 (14:33 +0300)]
добавил пользователя и группу для финдиректора
Vladimir Fomichev [Mon, 9 Sep 2024 09:34:20 +0000 (12:34 +0300)]
Merge branch 'develop' into feature_fomichev_erp_180_permission_for_admin
Vladimir Fomichev [Mon, 9 Sep 2024 09:22:51 +0000 (12:22 +0300)]
убрал проверку разрешений пользователя в контроллере
Aleksey Filippov [Mon, 9 Sep 2024 09:11:22 +0000 (09:11 +0000)]
Merge branch 'fixes_consumable' into 'develop'
правка расходных материалов
See merge request gitlab-instance/yii-erp24!347
Aleksey Filippov [Mon, 9 Sep 2024 09:10:15 +0000 (09:10 +0000)]
Merge branch 'feature_fomichev_erp_168_hide_sidebar_menu_onclick' into 'develop'
[ERP-168] Доработать скрытие меню
See merge request gitlab-instance/yii-erp24!346
marina [Mon, 9 Sep 2024 09:08:02 +0000 (12:08 +0300)]
правка расходных материалов
marina [Mon, 9 Sep 2024 08:07:42 +0000 (11:07 +0300)]
правка расходных материалов
Aleksey Filippov [Mon, 9 Sep 2024 05:52:14 +0000 (05:52 +0000)]
Merge branch 'feature_fomichev_erp-179_motivation_access' into 'develop'
[ERP-179] Настроить доступ к таблице мотивации
See merge request gitlab-instance/yii-erp24!345
Vladimir Fomichev [Fri, 6 Sep 2024 10:39:51 +0000 (13:39 +0300)]
Merge branch 'develop' into feature_fomichev_erp_168_hide_sidebar_menu_onclick
Vladimir Fomichev [Fri, 6 Sep 2024 09:06:14 +0000 (12:06 +0300)]
добавил проверку на доступ к motivation
Aleksey Filippov [Fri, 6 Sep 2024 06:50:28 +0000 (06:50 +0000)]
Merge branch 'feature_fomichev_erp-91_create_method_sum_salary' into 'develop'
[ERP-91] Сбор данных по ФОТ
See merge request gitlab-instance/yii-erp24!344
Vladimir Fomichev [Fri, 6 Sep 2024 06:33:28 +0000 (09:33 +0300)]
Merge branch 'develop' into feature_fomichev_erp-91_create_method_sum_salary
Vladimir Fomichev [Fri, 6 Sep 2024 06:33:00 +0000 (09:33 +0300)]
перенес присвоение типа значения за переделы блока новой записи
Aleksey Filippov [Thu, 5 Sep 2024 11:15:43 +0000 (11:15 +0000)]
Merge branch 'feature_fomichev_erp_174_selfcost' into 'develop'
[ERP-174] Себестоимость
See merge request gitlab-instance/yii-erp24!342
Vladimir Fomichev [Thu, 5 Sep 2024 11:04:16 +0000 (14:04 +0300)]
убрал файл polnogramma
Vladimir Fomichev [Thu, 5 Sep 2024 10:38:50 +0000 (13:38 +0300)]
Merge branch 'develop' into feature_fomichev_erp_174_selfcost
Vladimir Fomichev [Thu, 5 Sep 2024 10:32:34 +0000 (13:32 +0300)]
убрал Логирование с именами товаров
Aleksey Filippov [Thu, 5 Sep 2024 10:22:14 +0000 (10:22 +0000)]
Merge branch 'feature_zozriova_erp-106_complete_consumable' into 'develop'
ERP-106 Сбор данных по расходным материалам
See merge request gitlab-instance/yii-erp24!343
Marina Zozirova [Thu, 5 Sep 2024 10:22:14 +0000 (10:22 +0000)]
ERP-106 Сбор данных по расходным материалам
Vladimir Fomichev [Thu, 5 Sep 2024 09:51:32 +0000 (12:51 +0300)]
Логирование с именами товаров
Aleksey Filippov [Thu, 5 Sep 2024 09:10:43 +0000 (09:10 +0000)]
Merge branch 'feature_smirnov_erp-107_bonus_calculation' into 'develop'
[ERP-107] Подсчёт бонуса
See merge request gitlab-instance/yii-erp24!335
Vladimir Fomichev [Thu, 5 Sep 2024 08:45:05 +0000 (11:45 +0300)]
Правки по ревью
Alexander Smirnov [Thu, 5 Sep 2024 08:37:03 +0000 (11:37 +0300)]
[ERP-107] умножил на 100 и добавил проценты
Alexander Smirnov [Thu, 5 Sep 2024 08:21:05 +0000 (11:21 +0300)]
[ERP-107] поправил формулу
Alexander Smirnov [Thu, 5 Sep 2024 07:02:39 +0000 (10:02 +0300)]
Merge branch 'develop' into feature_smirnov_erp-107_bonus_calculation
Vladimir Fomichev [Wed, 4 Sep 2024 20:43:36 +0000 (23:43 +0300)]
Merge branch 'develop' into feature_fomichev_erp_174_selfcost
Vladimir Fomichev [Wed, 4 Sep 2024 20:43:17 +0000 (23:43 +0300)]
изменение порядка блоков
Aleksey Filippov [Wed, 4 Sep 2024 15:59:02 +0000 (15:59 +0000)]
Merge branch 'feature_smirnov_erp-140_fact_motivation' into 'develop'
[ERP-140] добавление процентов отклонениям и некоторым константам
See merge request gitlab-instance/yii-erp24!341
Alexander Smirnov [Wed, 4 Sep 2024 15:52:05 +0000 (18:52 +0300)]
[ERP-140] проценты в записи числа важны как и умножение на 100 при переводе в них 2
Alexander Smirnov [Wed, 4 Sep 2024 15:28:38 +0000 (18:28 +0300)]
Merge branch 'develop' into feature_smirnov_erp-140_fact_motivation
Alexander Smirnov [Wed, 4 Sep 2024 15:27:21 +0000 (18:27 +0300)]
[ERP-140] проценты в записи числа важны как и умножение на 100 при переводе в них
Aleksey Filippov [Wed, 4 Sep 2024 15:05:01 +0000 (15:05 +0000)]
Merge branch 'feature_smirnov_erp-137_motivation_forecast' into 'develop'
[ERP-137] ранее использовались ключи дополнительных полей, теперь коды
See merge request gitlab-instance/yii-erp24!340
Aleksey Filippov [Wed, 4 Sep 2024 14:40:09 +0000 (14:40 +0000)]
Merge branch 'feature_smirnov_erp-140_fact_motivation' into 'develop'
[ERP-140] факт мотивации.
See merge request gitlab-instance/yii-erp24!306
Aleksey Filippov [Wed, 4 Sep 2024 14:37:19 +0000 (14:37 +0000)]
Merge branch 'feature_smirnov_erp-130_write_offs_for_motivation_NEW' into 'develop'
[ERP-130] В случае отсутствия себестоимости записываем summ от продукта
See merge request gitlab-instance/yii-erp24!339
Alexander Smirnov [Wed, 4 Sep 2024 14:28:57 +0000 (17:28 +0300)]
[ERP-137] ранее использовались ключи дополнительных полей, теперь коды
Alexander Smirnov [Wed, 4 Sep 2024 14:02:03 +0000 (17:02 +0300)]
[ERP-140] изменена формула себестоимости
Alexander Smirnov [Wed, 4 Sep 2024 13:56:03 +0000 (16:56 +0300)]
[ERP-130] изменена формула себестоимости
Alexander Smirnov [Wed, 4 Sep 2024 13:20:42 +0000 (16:20 +0300)]
[ERP-130] В случае отсутствия себестоимости записываем summ от продукта
Alexander Smirnov [Wed, 4 Sep 2024 13:18:35 +0000 (16:18 +0300)]
[ERP-140] В случае отсутствия себестоимости записываем summ от продукта
Alexander Smirnov [Wed, 4 Sep 2024 12:48:46 +0000 (15:48 +0300)]
[ERP-140] после 174ой
Aleksey Filippov [Wed, 4 Sep 2024 12:12:39 +0000 (12:12 +0000)]
Merge branch 'feature_zozirova_erp-108_data_collection_from_1c' into 'develop'
Cбор и вывод данных 1С бухгалтерия
See merge request gitlab-instance/yii-erp24!333
Marina Zozirova [Wed, 4 Sep 2024 12:12:39 +0000 (12:12 +0000)]
Cбор и вывод данных 1С бухгалтерия
Alexander Smirnov [Wed, 4 Sep 2024 12:12:25 +0000 (15:12 +0300)]
Merge branch 'develop' into feature_smirnov_erp-140_fact_motivation
Aleksey Filippov [Wed, 4 Sep 2024 11:50:03 +0000 (11:50 +0000)]
Merge branch 'feature_fomichev_erp_174_selfcost' into 'develop'
[ERP-174] Себестоимость
See merge request gitlab-instance/yii-erp24!336
projects / erp24_rep / yii-erp24 / .git / log