]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
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)]
добавил пользователя и группу для финдиректора
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
Vladimir Fomichev [Wed, 4 Sep 2024 10:53:25 +0000 (13:53 +0300)]
добавление проверки возвратных чеков + 3 недели
Vladimir Fomichev [Wed, 4 Sep 2024 10:06:17 +0000 (13:06 +0300)]
исправление проверки поля на пустое
Vladimir Fomichev [Wed, 4 Sep 2024 09:49:12 +0000 (12:49 +0300)]
добавил логику возврата
Aleksey Filippov [Wed, 4 Sep 2024 09:35:02 +0000 (09:35 +0000)]
Merge branch 'feature_smirnov_2024_09_04_report_show_s_matrix_per_day_percent' into 'develop'
report/show_s добавлен matrix_per_day_percent
See merge request gitlab-instance/yii-erp24!337
Alexander Smirnov [Wed, 4 Sep 2024 09:06:02 +0000 (12:06 +0300)]
report/show_s добавлен matrix_per_day_percent
Alexander Smirnov [Wed, 4 Sep 2024 07:40:32 +0000 (10:40 +0300)]
[ERP-107] Подсчёт бонуса
Alexander Smirnov [Wed, 4 Sep 2024 07:03:49 +0000 (10:03 +0300)]
Merge branch 'develop' into feature_smirnov_erp-140_fact_motivation
Aleksey Filippov [Wed, 4 Sep 2024 07:00:12 +0000 (07:00 +0000)]
Merge branch 'feature_smirnov_erp-100_services_delivery_for_motivation' into 'develop'
[ERP-100] Использование правильной переменной для вычисления и небольшой рефактор
See merge request gitlab-instance/yii-erp24!334
Alexander Smirnov [Wed, 4 Sep 2024 06:40:01 +0000 (09:40 +0300)]
[ERP-100] рефактор
Alexander Smirnov [Wed, 4 Sep 2024 06:38:20 +0000 (09:38 +0300)]
[ERP-100] Использование правильной переменной для вычисления и небольшой рефактор
Vladimir Fomichev [Wed, 4 Sep 2024 06:10:39 +0000 (09:10 +0300)]
обновил метод подсчета
Alexander Smirnov [Wed, 4 Sep 2024 05:36:45 +0000 (08:36 +0300)]
[ERP-140] рефактор 3
Alexander Smirnov [Wed, 4 Sep 2024 05:28:28 +0000 (08:28 +0300)]
[ERP-140] рефактор
Alexander Smirnov [Tue, 3 Sep 2024 16:46:33 +0000 (19:46 +0300)]
[ERP-140] рефактор
Vladimir Fomichev [Tue, 3 Sep 2024 15:06:32 +0000 (18:06 +0300)]
добавил метод
Alexander Smirnov [Tue, 3 Sep 2024 14:46:41 +0000 (17:46 +0300)]
Merge branch 'develop' into feature_smirnov_erp-140_fact_motivation
# Conflicts:
# erp24/records/MotivationCostsItem.php
# erp24/services/MotivationService.php
# erp24/views/motivation/index.php
Alexander Smirnov [Tue, 3 Sep 2024 14:18:15 +0000 (17:18 +0300)]
[ERP-140] Исправление недочёта
Aleksey Filippov [Tue, 3 Sep 2024 12:55:37 +0000 (12:55 +0000)]
Merge branch 'feature_smirnov_erp-130_write_offs_for_motivation_NEW' into 'develop'
[ERP-130] Исправление брака для мотивации
See merge request gitlab-instance/yii-erp24!331
Aleksey Filippov [Tue, 3 Sep 2024 12:22:01 +0000 (12:22 +0000)]
Merge branch 'bug_smirnov_erp-144_pgsql_format_hour_minutes' into 'develop'
[ERP-144] Исправлено pgsql формат времени, часов и минут: HH:MM -> HH24:MI
See merge request gitlab-instance/yii-erp24!312
Alexander Smirnov [Tue, 3 Sep 2024 12:02:02 +0000 (15:02 +0300)]
Merge branch 'develop' into feature_smirnov_erp-130_write_offs_for_motivation_NEW
# Conflicts:
# erp24/views/motivation/index.php
Vladimir Fomichev [Tue, 3 Sep 2024 11:39:45 +0000 (14:39 +0300)]
добавил в erp24/views/layouts/main.php класс sidenav-toggled
Alexander Smirnov [Tue, 3 Sep 2024 10:22:24 +0000 (13:22 +0300)]
[ERP-140] Брак факт за месяц расчитывается с себестоимостью
Aleksey Filippov [Tue, 3 Sep 2024 09:50:08 +0000 (09:50 +0000)]
Merge branch 'feature_fomichev_erp_170_reg_sensivity_search_grade' into 'develop'
[ERP-170] Убрать проверку регистра на странице сотрудников
See merge request gitlab-instance/yii-erp24!332
Vladimir Fomichev [Tue, 3 Sep 2024 09:46:55 +0000 (12:46 +0300)]
изменил в запросе поиска чтобы он был частичным
Alexander Smirnov [Tue, 3 Sep 2024 09:10:27 +0000 (12:10 +0300)]
[ERP-140] Расходные материалы (обеспечение продаж) пополнены аналитикой из 1с розница
Vladimir Fomichev [Tue, 3 Sep 2024 08:31:20 +0000 (11:31 +0300)]
Merge branch 'develop' into feature_fomichev_erp_170_reg_sensivity_search_grade
Alexander Smirnov [Tue, 3 Sep 2024 08:05:51 +0000 (11:05 +0300)]
[ERP-140] подсчёт Расходные материалы (обеспечение продаж) факт мотивации
Alexander Smirnov [Tue, 3 Sep 2024 07:50:21 +0000 (10:50 +0300)]
[ERP-140] подсчёт Стоимость товара факт мотивации
Alexander Smirnov [Mon, 2 Sep 2024 14:43:56 +0000 (17:43 +0300)]
[ERP-130] Поправка девелопа 4
Alexander Smirnov [Mon, 2 Sep 2024 14:42:25 +0000 (17:42 +0300)]
[ERP-130] Поправка девелопа 3
Alexander Smirnov [Mon, 2 Sep 2024 14:40:23 +0000 (17:40 +0300)]
[ERP-130] Поправка девелопа 2
Alexander Smirnov [Mon, 2 Sep 2024 14:36:01 +0000 (17:36 +0300)]
[ERP-130] Поправка девелопа
Alexander Smirnov [Mon, 2 Sep 2024 14:33:43 +0000 (17:33 +0300)]
Merge branch 'develop' into feature_smirnov_erp-130_write_offs_for_motivation_NEW
Alexander Smirnov [Mon, 2 Sep 2024 14:08:06 +0000 (17:08 +0300)]
Merge branch 'develop' into feature_smirnov_erp-140_fact_motivation
# Conflicts:
# erp24/services/MotivationService.php
# erp24/views/motivation/index.php
Alexander Smirnov [Mon, 2 Sep 2024 13:37:50 +0000 (16:37 +0300)]
[ERP-140] syntax error починка
Aleksey Filippov [Mon, 2 Sep 2024 13:00:13 +0000 (13:00 +0000)]
Merge branch 'feature_filippov_20240902_motivatiov_viev_fix' into 'develop'
исправление motivation view
See merge request gitlab-instance/yii-erp24!330
Aleksey Filippov [Mon, 2 Sep 2024 12:58:08 +0000 (15:58 +0300)]
исправление motivation view
Vladimir Fomichev [Mon, 2 Sep 2024 12:38:19 +0000 (15:38 +0300)]
поменял запрос поиска
Alexander Smirnov [Mon, 2 Sep 2024 12:33:02 +0000 (15:33 +0300)]
[ERP-130] Дебаг 019 зачистка
Alexander Smirnov [Mon, 2 Sep 2024 12:31:58 +0000 (15:31 +0300)]
[ERP-130] Дебаг 018
Alexander Smirnov [Mon, 2 Sep 2024 12:29:52 +0000 (15:29 +0300)]
[ERP-130] Дебаг 017
Alexander Smirnov [Mon, 2 Sep 2024 12:28:54 +0000 (15:28 +0300)]
[ERP-130] Дебаг 016
Alexander Smirnov [Mon, 2 Sep 2024 12:27:19 +0000 (15:27 +0300)]
[ERP-130] Дебаг 015
Alexander Smirnov [Mon, 2 Sep 2024 12:25:33 +0000 (15:25 +0300)]
[ERP-130] Дебаг 014
Alexander Smirnov [Mon, 2 Sep 2024 12:23:45 +0000 (15:23 +0300)]
[ERP-130] Дебаг 013
Alexander Smirnov [Mon, 2 Sep 2024 12:22:39 +0000 (15:22 +0300)]
[ERP-130] Дебаг 012
Alexander Smirnov [Mon, 2 Sep 2024 12:19:09 +0000 (15:19 +0300)]
[ERP-130] Дебаг 011
Aleksey Filippov [Mon, 2 Sep 2024 11:58:19 +0000 (11:58 +0000)]
Merge branch 'feature_fomichev_erp_104_agents_services_computation' into 'develop'
[ERP-104] Создание метода на Услуги агентов
See merge request gitlab-instance/yii-erp24!329
Vladimir Fomichev [Mon, 2 Sep 2024 11:53:02 +0000 (14:53 +0300)]
Merge branch 'develop' into feature_fomichev_erp_104_agents_services_computation
Vladimir Fomichev [Mon, 2 Sep 2024 11:52:36 +0000 (14:52 +0300)]
добавил проверку на наличие параметров функции
Alexander Smirnov [Mon, 2 Sep 2024 11:30:30 +0000 (14:30 +0300)]
[ERP-130] Дебаг 010
Alexander Smirnov [Mon, 2 Sep 2024 11:20:33 +0000 (14:20 +0300)]
[ERP-130] Дебаг 009
Alexander Smirnov [Mon, 2 Sep 2024 11:15:10 +0000 (14:15 +0300)]
[ERP-130] Дебаг 008
Alexander Smirnov [Mon, 2 Sep 2024 11:10:03 +0000 (14:10 +0300)]
[ERP-130] Дебаг 007
Alexander Smirnov [Mon, 2 Sep 2024 11:06:59 +0000 (14:06 +0300)]
[ERP-130] Дебаг 006
Alexander Smirnov [Mon, 2 Sep 2024 11:03:21 +0000 (14:03 +0300)]
[ERP-130] Дебаг 0054
Alexander Smirnov [Mon, 2 Sep 2024 10:58:28 +0000 (13:58 +0300)]
[ERP-130] Дебаг 004
projects / erp24_rep / yii-erp24 / .git / log