]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
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'
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'
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: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'
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
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'
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'
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
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'
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
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'
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'
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
Alexander Smirnov [Mon, 2 Sep 2024 10:52:10 +0000 (13:52 +0300)]
[ERP-130] Дебаг 003
Alexander Smirnov [Mon, 2 Sep 2024 10:50:43 +0000 (13:50 +0300)]
[ERP-130] Дебаг 002
Alexander Smirnov [Mon, 2 Sep 2024 10:47:59 +0000 (13:47 +0300)]
[ERP-130] Дебаг 001
Aleksey Filippov [Mon, 2 Sep 2024 10:45:30 +0000 (10:45 +0000)]
Merge branch 'feature_fomichev_erp_169_add_self_cost_custom_cron_job' into 'develop'
Aleksey Filippov [Mon, 2 Sep 2024 10:34:56 +0000 (10:34 +0000)]
Merge branch 'feature_fomichev_erp_164_chage_numbers_format_motivation' into 'develop'
Vladimir Fomichev [Mon, 2 Sep 2024 09:25:26 +0000 (12:25 +0300)]
Merge branch 'develop' into feature_fomichev_erp_104_agents_services_computation
Aleksey Filippov [Mon, 2 Sep 2024 08:51:16 +0000 (08:51 +0000)]
Merge branch 'feature_fomichev_erp-86_create_reference_table_for_budget_items_motivation_model' into 'develop'
Vladimir Fomichev [Mon, 2 Sep 2024 08:43:27 +0000 (11:43 +0300)]
Merge branch 'develop' into feature_fomichev_erp_169_add_self_cost_custom_cron_job
Vladimir Fomichev [Mon, 2 Sep 2024 08:29:50 +0000 (11:29 +0300)]
померял correction на ajustment
Vladimir Fomichev [Mon, 2 Sep 2024 08:13:21 +0000 (11:13 +0300)]
Merge branch 'feature_fomichev_erp-86_create_reference_table_for_budget_items_motivation_model' of https://git-bc.gitlab.yandexcloud.net/gitlab-instance/yii-erp24 into develop
vladfo [Fri, 30 Aug 2024 14:47:19 +0000 (17:47 +0300)]
добавил уникальность для кода
Vladimir Fomichev [Fri, 30 Aug 2024 10:40:04 +0000 (13:40 +0300)]
убрал массив для дебага и поставил значение в нул
Vladimir Fomichev [Fri, 30 Aug 2024 10:09:50 +0000 (13:09 +0300)]
добавил проверку на свойство класса и проставил 0
Vladimir Fomichev [Fri, 30 Aug 2024 10:06:22 +0000 (13:06 +0300)]
добавил проверку на свойство класса и проставил нул если его нет
Vladimir Fomichev [Fri, 30 Aug 2024 09:48:38 +0000 (12:48 +0300)]
добавил проверку на пустой масссив
Vladimir Fomichev [Fri, 30 Aug 2024 08:53:21 +0000 (11:53 +0300)]
добавил строку в представление
Vladimir Fomichev [Fri, 30 Aug 2024 07:45:15 +0000 (10:45 +0300)]
исправление ошибок
Vladimir Fomichev [Thu, 29 Aug 2024 15:07:22 +0000 (18:07 +0300)]
добавил расчет услуг агентов добавил коды
Vladimir Fomichev [Thu, 29 Aug 2024 15:03:59 +0000 (18:03 +0300)]
добавил расчет услуг агентов проверка на ключи
Vladimir Fomichev [Thu, 29 Aug 2024 14:40:14 +0000 (17:40 +0300)]
добавил расчет услуг агентов
Vladimir Fomichev [Thu, 29 Aug 2024 14:29:29 +0000 (17:29 +0300)]
Merge branch 'develop' into feature_fomichev_erp_104_agents_services_computation
Vladimir Fomichev [Thu, 29 Aug 2024 14:24:25 +0000 (17:24 +0300)]
добавил расчет себестоимости и сохранеинеи в таблицу MotivationValues
Alexander Smirnov [Thu, 29 Aug 2024 13:49:16 +0000 (16:49 +0300)]
[ERP-130] Дебаг 004
Alexander Smirnov [Thu, 29 Aug 2024 13:45:06 +0000 (16:45 +0300)]
[ERP-130] Дебаг 003
Alexander Smirnov [Thu, 29 Aug 2024 13:43:29 +0000 (16:43 +0300)]
[ERP-130] Дебаг 002
Alexander Smirnov [Thu, 29 Aug 2024 13:40:09 +0000 (16:40 +0300)]
[ERP-130] Дебаг 001
Alexander Smirnov [Thu, 29 Aug 2024 12:54:03 +0000 (15:54 +0300)]
[ERP-140] Данные из 1с берутся из month мотивации
Aleksey Filippov [Thu, 29 Aug 2024 12:49:38 +0000 (12:49 +0000)]
Merge branch 'feature_smirnov_erp-165_employee_on_shift_active_field' into 'develop'
Alexander Smirnov [Thu, 29 Aug 2024 12:38:23 +0000 (15:38 +0300)]
Merge branch 'develop' into feature_smirnov_erp-140_fact_motivation
Alexander Smirnov [Thu, 29 Aug 2024 12:24:36 +0000 (15:24 +0300)]
Merge branch 'develop' into feature_smirnov_erp-130_write_offs_for_motivation_NEW
Aleksey Filippov [Thu, 29 Aug 2024 12:04:44 +0000 (12:04 +0000)]
Merge branch 'feature_smirnov_erp-105_final_fact_motivation' into 'develop'
Aleksey Filippov [Thu, 29 Aug 2024 10:21:00 +0000 (10:21 +0000)]
Merge branch 'feature_fomichev_erp_131_self_cost_upload_to_db' into 'develop'
Vladimir Fomichev [Thu, 29 Aug 2024 10:16:20 +0000 (13:16 +0300)]
Merge branch 'develop' into feature_fomichev_erp_131_self_cost_upload_to_db
Aleksey Filippov [Thu, 29 Aug 2024 07:13:16 +0000 (07:13 +0000)]
Merge branch 'feature_zozirova_erp-85_1c_buh_connect' into 'develop'
Vladimir Fomichev [Wed, 28 Aug 2024 15:17:24 +0000 (18:17 +0300)]
Merge branch 'develop' into feature_fomichev_erp_131_self_cost_upload_to_db
Vladimir Fomichev [Wed, 28 Aug 2024 15:16:08 +0000 (18:16 +0300)]
добавил имя товара
Alexander Smirnov [Wed, 28 Aug 2024 14:51:21 +0000 (17:51 +0300)]
[ERP-130] Добавил себестоимости в брак
Alexander Smirnov [Wed, 28 Aug 2024 13:44:26 +0000 (16:44 +0300)]
Merge branch 'develop' into feature_smirnov_erp-130_write_offs_for_motivation_NEW
Aleksey Filippov [Wed, 28 Aug 2024 13:06:52 +0000 (13:06 +0000)]
Merge branch 'feature_zozirova_erp-102_adjustment' into 'develop'
Marina Zozirova [Wed, 28 Aug 2024 13:06:52 +0000 (13:06 +0000)]
ERP-102 Приёмник для эксель файла (корректировка)
marina [Wed, 28 Aug 2024 12:36:13 +0000 (15:36 +0300)]
ERP-85 Реализовать обмен данных с 1С Бухгалтерия
Aleksey Filippov [Wed, 28 Aug 2024 12:31:11 +0000 (12:31 +0000)]
Merge branch 'feature_fomichev_erp_131_self_cost_upload_to_db' into 'develop'
Alexander Smirnov [Wed, 28 Aug 2024 12:08:23 +0000 (15:08 +0300)]
[ERP-105] использование кодов вместо названий
projects / erp24_rep / yii-erp24 / .git / log