]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
marina [Fri, 27 Dec 2024 12:44:14 +0000 (15:44 +0300)]
ERP-275 Добавление колонки для сохранения type в товаре из каталога
marina [Fri, 27 Dec 2024 09:44:41 +0000 (12:44 +0300)]
ERP-275 Добавление колонки для сохранения type в товаре из каталога
Aleksey Filippov [Fri, 27 Dec 2024 09:05:46 +0000 (09:05 +0000)]
Merge branch 'feature_smirnov_erp-272_sales_write_offs_plan' into 'develop'
[ERP-272] план продаж и списания
See merge request gitlab-instance/yii-erp24!567
Aleksey Filippov [Fri, 27 Dec 2024 07:52:30 +0000 (07:52 +0000)]
Merge branch 'feature_zozirova_erp-268_cron_1c_to_mvc' into 'develop'
ERP-268 Перевод страницы 1с cron в MVC
See merge request gitlab-instance/yii-erp24!559
marina [Fri, 27 Dec 2024 07:19:28 +0000 (10:19 +0300)]
ERP-268 Перевод страницы 1с cron в MVC
marina [Fri, 27 Dec 2024 06:53:07 +0000 (09:53 +0300)]
ERP-268 Перевод страницы 1с cron в MVC
Alexander Smirnov [Fri, 27 Dec 2024 06:51:08 +0000 (09:51 +0300)]
[ERP-272] время создания и обновления а также кто это сделал
Alexander Smirnov [Fri, 27 Dec 2024 06:14:43 +0000 (09:14 +0300)]
[ERP-272] план продаж и списания
marina [Thu, 26 Dec 2024 13:14:22 +0000 (16:14 +0300)]
ERP-268 Перевод страницы 1с cron в MVC
marina [Thu, 26 Dec 2024 12:55:26 +0000 (15:55 +0300)]
ERP-268 Перевод страницы 1с cron в MVC
marina [Thu, 26 Dec 2024 12:52:52 +0000 (15:52 +0300)]
ERP-268 Перевод страницы 1с cron в MVC
marina [Thu, 26 Dec 2024 12:23:06 +0000 (15:23 +0300)]
ERP-268 Перевод страницы 1с cron в MVC
Aleksey Filippov [Thu, 26 Dec 2024 11:53:26 +0000 (11:53 +0000)]
Merge branch 'bug_zozirova_erp-270_fix_salary' into 'develop'
ERP-270 Проверить формирование зарплатной ведомости
See merge request gitlab-instance/yii-erp24!566
marina [Thu, 26 Dec 2024 09:38:50 +0000 (12:38 +0300)]
ERP-270 Проверить формирование зарплатной ведомости
marina [Thu, 26 Dec 2024 09:31:51 +0000 (12:31 +0300)]
cache reset
marina [Thu, 26 Dec 2024 09:28:10 +0000 (12:28 +0300)]
cache reset
marina [Thu, 26 Dec 2024 09:27:27 +0000 (12:27 +0300)]
cache reset
marina [Thu, 26 Dec 2024 09:20:07 +0000 (12:20 +0300)]
cache reset
marina [Thu, 26 Dec 2024 09:15:22 +0000 (12:15 +0300)]
cache reset
marina [Thu, 26 Dec 2024 09:12:58 +0000 (12:12 +0300)]
cache reset
marina [Thu, 26 Dec 2024 09:08:18 +0000 (12:08 +0300)]
cache reset
Aleksey Filippov [Thu, 26 Dec 2024 08:05:55 +0000 (08:05 +0000)]
Merge branch 'cache-reset' into 'develop'
cache reset
See merge request gitlab-instance/yii-erp24!565
marina [Thu, 26 Dec 2024 07:57:31 +0000 (10:57 +0300)]
cache reset
marina [Thu, 26 Dec 2024 06:54:02 +0000 (09:54 +0300)]
cache reset
marina [Thu, 26 Dec 2024 06:09:05 +0000 (09:09 +0300)]
ERP-270 Проверить формирование зарплатной ведомости
Aleksey Filippov [Wed, 25 Dec 2024 07:48:49 +0000 (07:48 +0000)]
Merge branch 'feature_smirnov_erp-271_pending_error' into 'develop'
[ERP-271] отключить pending сообщения в тг
See merge request gitlab-instance/yii-erp24!564
Alexander Smirnov [Wed, 25 Dec 2024 07:36:38 +0000 (10:36 +0300)]
[ERP-271] disable csrf validation for pending
Alexander Smirnov [Wed, 25 Dec 2024 06:49:42 +0000 (09:49 +0300)]
[ERP-271] отключить pending сообщения в тг
Aleksey Filippov [Tue, 24 Dec 2024 16:19:07 +0000 (16:19 +0000)]
Merge branch 'fix_fomichev_erp-20241224_city_store_search_cluster_id' into 'develop'
Фикс
20241224 проблема с cluster_id в CityStoreSearch
See merge request gitlab-instance/yii-erp24!563
Aleksey Filippov [Tue, 24 Dec 2024 13:55:10 +0000 (13:55 +0000)]
Merge branch 'feature_smirnov_erp-269_memory_dates_300_bonus' into 'develop'
[ERP-269] memorable 300
See merge request gitlab-instance/yii-erp24!562
fomichev [Tue, 24 Dec 2024 13:20:20 +0000 (16:20 +0300)]
Убрал cluster_id
Alexander Smirnov [Tue, 24 Dec 2024 12:53:05 +0000 (15:53 +0300)]
поправка
Alexander Smirnov [Tue, 24 Dec 2024 12:30:36 +0000 (15:30 +0300)]
[ERP-269] memorable 300
Aleksey Filippov [Tue, 24 Dec 2024 10:17:44 +0000 (10:17 +0000)]
Merge branch 'feature_smirnov_erp-267_sms_function' into 'develop'
Feature smirnov erp 267 sms function
See merge request gitlab-instance/yii-erp24!561
Alexander Smirnov [Tue, 24 Dec 2024 10:15:08 +0000 (13:15 +0300)]
new log path
Alexander Smirnov [Tue, 24 Dec 2024 10:05:06 +0000 (13:05 +0300)]
keycode = ''
Aleksey Filippov [Tue, 24 Dec 2024 09:46:59 +0000 (09:46 +0000)]
Merge branch 'feature_smirnov_erp-267_sms_function' into 'develop'
[ERP-267] actionSendMessage
See merge request gitlab-instance/yii-erp24!560
Alexander Smirnov [Tue, 24 Dec 2024 09:43:45 +0000 (12:43 +0300)]
[ERP-267] actionSendMessage
marina [Tue, 24 Dec 2024 08:51:20 +0000 (11:51 +0300)]
ERP-268 Перевод страницы 1с cron в MVC
marina [Tue, 24 Dec 2024 08:48:41 +0000 (11:48 +0300)]
ERP-268 Перевод страницы 1с cron в MVC
marina [Tue, 24 Dec 2024 08:47:05 +0000 (11:47 +0300)]
ERP-268 Перевод страницы 1с cron в MVC
marina [Tue, 24 Dec 2024 08:06:50 +0000 (11:06 +0300)]
ERP-268 Перевод страницы 1с cron в MVC
Aleksey Filippov [Mon, 23 Dec 2024 15:03:42 +0000 (15:03 +0000)]
Merge branch 'feature_zozirova_erp-266_add_text_errors_on_shifts' into 'develop'
ERP-266 Вывод развёрнутых сообщений об ошибках при открытии/закрытии сменыERP-266 Вывод развёрнутых сообщений об ошибках при открытии/закрытии смены
See merge request gitlab-instance/yii-erp24!558
marina [Mon, 23 Dec 2024 14:25:44 +0000 (17:25 +0300)]
ERP-266 Вывод развёрнутых сообщений об ошибках при открытии/закрытии смены
marina [Mon, 23 Dec 2024 14:25:31 +0000 (17:25 +0300)]
ERP-266 Вывод развёрнутых сообщений об ошибках при открытии/закрытии смены
marina [Mon, 23 Dec 2024 13:33:57 +0000 (16:33 +0300)]
ERP-266 Вывод развёрнутых сообщений об ошибках при открытии/закрытии смены
marina [Mon, 23 Dec 2024 13:23:40 +0000 (16:23 +0300)]
ERP-266 Вывод развёрнутых сообщений об ошибках при открытии/закрытии смены
marina [Mon, 23 Dec 2024 11:40:31 +0000 (14:40 +0300)]
фиксы
Aleksey Filippov [Mon, 23 Dec 2024 10:59:18 +0000 (10:59 +0000)]
Merge branch 'feature_smirnov_erp-265_amo_buttons' into 'develop'
[ERP-265] кнопка обновления текущего дня
See merge request gitlab-instance/yii-erp24!557
Alexander Smirnov [Mon, 23 Dec 2024 10:56:36 +0000 (13:56 +0300)]
[ERP-265] отображение
Alexander Smirnov [Fri, 20 Dec 2024 19:14:32 +0000 (22:14 +0300)]
[ERP-256] вторая кнопка с датой
Alexander Smirnov [Fri, 20 Dec 2024 18:06:45 +0000 (21:06 +0300)]
[ERP-265] кнопка обновления текущего дня 2
Alexander Smirnov [Fri, 20 Dec 2024 18:04:11 +0000 (21:04 +0300)]
[ERP-265] кнопка обновления текущего дня
Aleksey Filippov [Fri, 20 Dec 2024 10:29:45 +0000 (10:29 +0000)]
Merge branch 'feature_smirnov_erp-261_waybill_incoming' into 'develop'
[ERP-261] группы товаров
See merge request gitlab-instance/yii-erp24!556
Alexander Smirnov [Fri, 20 Dec 2024 10:28:32 +0000 (13:28 +0300)]
[ERP-261] группы товаров
Aleksey Filippov [Fri, 20 Dec 2024 10:25:22 +0000 (10:25 +0000)]
Merge branch 'fezture_fomichev_erp-264_send_waybill_write_offs' into 'develop'
[ERP-264] Отправка документов ревизия накладные списания
See merge request gitlab-instance/yii-erp24!555
fomichev [Fri, 20 Dec 2024 10:22:22 +0000 (13:22 +0300)]
Merge branch 'refs/heads/develop' into fezture_fomichev_erp-264_send_waybill_write_offs
fomichev [Fri, 20 Dec 2024 10:22:05 +0000 (13:22 +0300)]
Открытие номера локумента
Aleksey Filippov [Fri, 20 Dec 2024 09:58:43 +0000 (09:58 +0000)]
Merge branch 'fezture_fomichev_erp-264_send_waybill_write_offs' into 'develop'
[ERP-264] Отправка документов ревизия накладные списания
See merge request gitlab-instance/yii-erp24!554
fomichev [Fri, 20 Dec 2024 09:45:24 +0000 (12:45 +0300)]
Правка с number на name_1c
fomichev [Fri, 20 Dec 2024 09:43:35 +0000 (12:43 +0300)]
Правка с name на name_1c
fomichev [Fri, 20 Dec 2024 09:26:54 +0000 (12:26 +0300)]
Добавление Название документа в 1с
Aleksey Filippov [Fri, 20 Dec 2024 09:18:13 +0000 (09:18 +0000)]
Merge branch 'fixes_for_shift_transfer' into 'develop'
фиксы
See merge request gitlab-instance/yii-erp24!553
marina [Fri, 20 Dec 2024 09:17:51 +0000 (12:17 +0300)]
фиксы
marina [Fri, 20 Dec 2024 09:06:34 +0000 (12:06 +0300)]
фиксы
marina [Fri, 20 Dec 2024 08:50:01 +0000 (11:50 +0300)]
фиксы
Aleksey Filippov [Fri, 20 Dec 2024 08:43:12 +0000 (08:43 +0000)]
Merge branch 'feature_smirnov_erp-261_waybill_incoming' into 'develop'
[ERP-261] self_cost_products sort by date and take the last
See merge request gitlab-instance/yii-erp24!552
Alexander Smirnov [Fri, 20 Dec 2024 08:20:39 +0000 (11:20 +0300)]
[ERP-261] self_cost_products sort by date and take the last
Aleksey Filippov [Fri, 20 Dec 2024 06:31:01 +0000 (06:31 +0000)]
Merge branch 'fix_shift' into 'develop'
правка смен
See merge request gitlab-instance/yii-erp24!551
marina [Fri, 20 Dec 2024 06:13:01 +0000 (09:13 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
Aleksey Filippov [Thu, 19 Dec 2024 14:14:22 +0000 (14:14 +0000)]
Merge branch 'fezture_fomichev_erp-264_send_waybill_write_offs' into 'develop'
[ERP-264] Отправка документов ревизия накладные списания
See merge request gitlab-instance/yii-erp24!550
fomichev [Thu, 19 Dec 2024 14:12:12 +0000 (17:12 +0300)]
Merge branch 'refs/heads/develop' into fezture_fomichev_erp-264_send_waybill_write_offs
fomichev [Thu, 19 Dec 2024 14:11:45 +0000 (17:11 +0300)]
Добавляем инициализацию $waybillWriteOffIds
Aleksey Filippov [Thu, 19 Dec 2024 13:28:50 +0000 (13:28 +0000)]
Merge branch 'fix_created_resortings' into 'develop'
ERP-256 Сделать отправку документов Пересортица в 1с
See merge request gitlab-instance/yii-erp24!549
marina [Thu, 19 Dec 2024 13:25:36 +0000 (16:25 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
marina [Thu, 19 Dec 2024 13:07:36 +0000 (16:07 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
marina [Thu, 19 Dec 2024 12:31:37 +0000 (15:31 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
marina [Thu, 19 Dec 2024 12:29:00 +0000 (15:29 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
Aleksey Filippov [Thu, 19 Dec 2024 11:57:49 +0000 (11:57 +0000)]
Merge branch 'fezture_fomichev_erp-264_send_waybill_write_offs' into 'develop'
[ERP-264] Отправка документов ревизия накладные списания
See merge request gitlab-instance/yii-erp24!548
Aleksey Filippov [Thu, 19 Dec 2024 11:56:32 +0000 (11:56 +0000)]
Merge branch 'feature-zozirova-erp_256-send_doc_on_1c' into 'develop'
ERP-256 Сделать отправку документов Пересортица в 1с
See merge request gitlab-instance/yii-erp24!547
fomichev [Thu, 19 Dec 2024 11:56:22 +0000 (14:56 +0300)]
Merge branch 'refs/heads/develop' into fezture_fomichev_erp-264_send_waybill_write_offs
fomichev [Thu, 19 Dec 2024 11:55:36 +0000 (14:55 +0300)]
Скрываем проверку
marina [Thu, 19 Dec 2024 11:55:32 +0000 (14:55 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
Aleksey Filippov [Thu, 19 Dec 2024 11:40:18 +0000 (11:40 +0000)]
Merge branch 'feature-zozirova-erp_256-send_doc_on_1c' into 'develop'
ERP-256 Сделать отправку документов Пересортица в 1с
See merge request gitlab-instance/yii-erp24!546
marina [Thu, 19 Dec 2024 11:39:40 +0000 (14:39 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
Aleksey Filippov [Thu, 19 Dec 2024 11:24:01 +0000 (11:24 +0000)]
Merge branch 'feature-zozirova-erp_256-send_doc_on_1c' into 'develop'
ERP-256 Сделать отправку документов Пересортица в 1с
See merge request gitlab-instance/yii-erp24!544
marina [Thu, 19 Dec 2024 11:23:09 +0000 (14:23 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
Aleksey Filippov [Thu, 19 Dec 2024 11:00:31 +0000 (11:00 +0000)]
Merge branch 'feature-zozirova-erp_256-send_doc_on_1c' into 'develop'
ERP-256 Сделать отправку документов Пересортица в 1с
See merge request gitlab-instance/yii-erp24!543
marina [Thu, 19 Dec 2024 10:59:47 +0000 (13:59 +0300)]
Merge branch 'develop' into feature-zozirova-erp_256-send_doc_on_1c
# Conflicts:
# erp24/api2/controllers/DataController.php
Aleksey Filippov [Thu, 19 Dec 2024 10:57:33 +0000 (10:57 +0000)]
Merge branch 'feature_smirnov_erp-261_waybill_incoming' into 'develop'
[ERP-261] name -> number_1c + held
See merge request gitlab-instance/yii-erp24!542
Aleksey Filippov [Thu, 19 Dec 2024 10:57:15 +0000 (10:57 +0000)]
Merge branch 'fezture_fomichev_erp-264_send_waybill_write_offs' into 'develop'
[ERP-264] Отправка документов ревизия накладные списания
See merge request gitlab-instance/yii-erp24!541
marina [Thu, 19 Dec 2024 10:38:58 +0000 (13:38 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
marina [Thu, 19 Dec 2024 10:38:15 +0000 (13:38 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
marina [Thu, 19 Dec 2024 10:36:55 +0000 (13:36 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
Alexander Smirnov [Thu, 19 Dec 2024 10:30:12 +0000 (13:30 +0300)]
[ERP-261] name -> number_1c + held
fomichev [Thu, 19 Dec 2024 10:22:44 +0000 (13:22 +0300)]
Merge branch 'refs/heads/develop' into fezture_fomichev_erp-264_send_waybill_write_offs
fomichev [Thu, 19 Dec 2024 10:21:32 +0000 (13:21 +0300)]
Коды ошибок
Aleksey Filippov [Thu, 19 Dec 2024 09:13:34 +0000 (09:13 +0000)]
Merge branch 'feature-zozirova-erp_256-send_doc_on_1c' into 'develop'
ERP-256 Сделать отправку документов Пересортица в 1с
See merge request gitlab-instance/yii-erp24!540
marina [Thu, 19 Dec 2024 09:12:33 +0000 (12:12 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
Aleksey Filippov [Thu, 19 Dec 2024 09:04:40 +0000 (09:04 +0000)]
Merge branch 'feature-zozirova-erp_256-send_doc_on_1c' into 'develop'
ERP-256 Сделать отправку документов Пересортица в 1с
See merge request gitlab-instance/yii-erp24!539
projects / erp24_rep / yii-erp24 / .git / log