]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
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 [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
marina [Thu, 19 Dec 2024 09:03:23 +0000 (12:03 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
Aleksey Filippov [Thu, 19 Dec 2024 08:49:14 +0000 (08:49 +0000)]
Merge branch 'feature-zozirova-erp_256-send_doc_on_1c' into 'develop'
ERP-256 Сделать отправку документов Пересортица в 1с
See merge request gitlab-instance/yii-erp24!538
marina [Thu, 19 Dec 2024 08:48:40 +0000 (11:48 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
marina [Thu, 19 Dec 2024 08:47:42 +0000 (11:47 +0300)]
Merge branch 'develop' into feature-zozirova-erp_256-send_doc_on_1c
# Conflicts:
# erp24/records/WaybillWriteOffs.php
marina [Thu, 19 Dec 2024 08:45:18 +0000 (11:45 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
marina [Thu, 19 Dec 2024 08:43:16 +0000 (11:43 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
Aleksey Filippov [Thu, 19 Dec 2024 08:28:00 +0000 (08:28 +0000)]
Merge branch 'feature_fomichev_erp-262_waybill_write_offs' into 'develop'
[ERP-262] Нужно добавить создание накладной списания
See merge request gitlab-instance/yii-erp24!537
fomichev [Thu, 19 Dec 2024 08:22:29 +0000 (11:22 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-262_waybill_write_offs
fomichev [Thu, 19 Dec 2024 08:22:04 +0000 (11:22 +0300)]
Проверка на товары у списания
Aleksey Filippov [Thu, 19 Dec 2024 07:59:23 +0000 (07:59 +0000)]
Merge branch 'feature-zozirova-erp_256-send_doc_on_1c' into 'develop'
ERP-256 Сделать отправку документов Пересортица в 1с
See merge request gitlab-instance/yii-erp24!536
marina [Thu, 19 Dec 2024 07:58:41 +0000 (10:58 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
Aleksey Filippov [Thu, 19 Dec 2024 07:45:07 +0000 (07:45 +0000)]
Merge branch 'feature_smirnov_erp-261_waybill_incoming' into 'develop'
summ_self_cost
See merge request gitlab-instance/yii-erp24!532
Aleksey Filippov [Thu, 19 Dec 2024 07:43:35 +0000 (07:43 +0000)]
Merge branch 'feature-zozirova-erp_256-send_doc_on_1c' into 'develop'
ERP-256 Сделать отправку документов Пересортица в 1с
See merge request gitlab-instance/yii-erp24!535
marina [Thu, 19 Dec 2024 07:42:58 +0000 (10:42 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
Alexander Smirnov [Thu, 19 Dec 2024 07:39:25 +0000 (10:39 +0300)]
[ERP-261] Переименованы заголовки
Aleksey Filippov [Thu, 19 Dec 2024 07:38:34 +0000 (07:38 +0000)]
Merge branch 'feature-zozirova-erp_256-send_doc_on_1c' into 'develop'
Feature zozirova erp 256 send doc on 1c
See merge request gitlab-instance/yii-erp24!534
Alexander Smirnov [Thu, 19 Dec 2024 07:37:56 +0000 (10:37 +0300)]
Merge branch 'develop' into feature_smirnov_erp-261_waybill_incoming
marina [Thu, 19 Dec 2024 07:36:47 +0000 (10:36 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
fomichev [Thu, 19 Dec 2024 07:35:52 +0000 (10:35 +0300)]
Правки по полям в документе списания 2
Aleksey Filippov [Thu, 19 Dec 2024 07:28:18 +0000 (07:28 +0000)]
Merge branch 'feature_fomichev_erp-262_waybill_write_offs' into 'develop'
[ERP-262] Нужно добавить создание накладной списания
See merge request gitlab-instance/yii-erp24!533
fomichev [Thu, 19 Dec 2024 07:24:45 +0000 (10:24 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-262_waybill_write_offs
fomichev [Thu, 19 Dec 2024 07:24:16 +0000 (10:24 +0300)]
Правки по полям в документе списания
marina [Thu, 19 Dec 2024 07:20:20 +0000 (10:20 +0300)]
Merge branch 'develop' into feature-zozirova-erp_256-send_doc_on_1c
marina [Thu, 19 Dec 2024 07:20:04 +0000 (10:20 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
Aleksey Filippov [Thu, 19 Dec 2024 06:05:02 +0000 (06:05 +0000)]
Merge branch 'feature_fomichev_erp-262_waybill_write_offs' into 'develop'
[ERP-262] Нужно добавить создание накладной списания
See merge request gitlab-instance/yii-erp24!531
Alexander Smirnov [Wed, 18 Dec 2024 18:43:48 +0000 (21:43 +0300)]
summ_self_cost
fomichev [Wed, 18 Dec 2024 18:37:06 +0000 (21:37 +0300)]
Сумма себестоимости
Aleksey Filippov [Wed, 18 Dec 2024 14:26:21 +0000 (14:26 +0000)]
Merge branch 'feature-zozirova-erp_256-send_doc_on_1c' into 'develop'
Feature zozirova erp 256 send doc on 1c
See merge request gitlab-instance/yii-erp24!530
Aleksey Filippov [Wed, 18 Dec 2024 14:26:02 +0000 (14:26 +0000)]
Merge branch 'fezture_fomichev_erp-264_send_waybill_write_offs' into 'develop'
[ERP-264] Отправка документов ревизия накладные списания
See merge request gitlab-instance/yii-erp24!528
fomichev [Wed, 18 Dec 2024 14:25:22 +0000 (17:25 +0300)]
Заполнение comment с причиной
marina [Wed, 18 Dec 2024 14:25:15 +0000 (17:25 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
Aleksey Filippov [Wed, 18 Dec 2024 14:25:00 +0000 (14:25 +0000)]
Merge branch 'feature_smirnov_erp-261_waybill_incoming' into 'develop'
[ERP-261] cause -> comment
See merge request gitlab-instance/yii-erp24!529
marina [Wed, 18 Dec 2024 14:24:34 +0000 (17:24 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
Alexander Smirnov [Wed, 18 Dec 2024 14:23:22 +0000 (17:23 +0300)]
[ERP-261] cause -> comment
fomichev [Wed, 18 Dec 2024 14:20:36 +0000 (17:20 +0300)]
Merge branch 'refs/heads/develop' into fezture_fomichev_erp-264_send_waybill_write_offs
fomichev [Wed, 18 Dec 2024 14:19:20 +0000 (17:19 +0300)]
Заполнение comment
Aleksey Filippov [Wed, 18 Dec 2024 13:44:36 +0000 (13:44 +0000)]
Merge branch 'feature_smirnov_erp-261_waybill_incoming' into 'develop'
upload waybillIncoming created_write_ons
See merge request gitlab-instance/yii-erp24!527
Alexander Smirnov [Wed, 18 Dec 2024 13:06:28 +0000 (16:06 +0300)]
upload waybillIncoming created_write_ons
Aleksey Filippov [Wed, 18 Dec 2024 12:29:26 +0000 (12:29 +0000)]
Merge branch 'feature-zozirova-erp_256-send_doc_on_1c' into 'develop'
ERP-256 Сделать отправку документов Пересортица в 1с
See merge request gitlab-instance/yii-erp24!526
marina [Wed, 18 Dec 2024 12:20:07 +0000 (15:20 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
Aleksey Filippov [Wed, 18 Dec 2024 11:49:22 +0000 (11:49 +0000)]
Merge branch 'feature-zozirova-erp_256-send_doc_on_1c' into 'develop'
правка 2 минут
See merge request gitlab-instance/yii-erp24!525
marina [Wed, 18 Dec 2024 11:24:34 +0000 (14:24 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
Aleksey Filippov [Wed, 18 Dec 2024 10:59:12 +0000 (10:59 +0000)]
Merge branch 'fezture_fomichev_erp-264_send_waybill_write_offs' into 'develop'
[ERP-264] Отправка документов ревизия накладные списания
See merge request gitlab-instance/yii-erp24!524
fomichev [Wed, 18 Dec 2024 10:39:20 +0000 (13:39 +0300)]
Добавил сохрание ошибок в error_text
Aleksey Filippov [Wed, 18 Dec 2024 10:34:18 +0000 (10:34 +0000)]
Merge branch 'feature_smirnov_erp-261_waybill_incoming' into 'develop'
STATUS_CREATED
See merge request gitlab-instance/yii-erp24!523
Alexander Smirnov [Wed, 18 Dec 2024 10:29:32 +0000 (13:29 +0300)]
STATUS_CREATED
Aleksey Filippov [Wed, 18 Dec 2024 10:19:36 +0000 (10:19 +0000)]
Merge branch 'feature_smirnov_erp-261_waybill_incoming' into 'develop'
error_text
See merge request gitlab-instance/yii-erp24!521
Alexander Smirnov [Wed, 18 Dec 2024 10:17:51 +0000 (13:17 +0300)]
Merge branch 'develop' into feature_smirnov_erp-261_waybill_incoming
# Conflicts:
# erp24/api2/controllers/DataController.php
Aleksey Filippov [Wed, 18 Dec 2024 10:07:39 +0000 (10:07 +0000)]
Merge branch 'feature-zozirova-erp_256-send_doc_on_1c' into 'develop'
ERP-256 Сделать отправку документов Пересортица в 1с
See merge request gitlab-instance/yii-erp24!522
Alexander Smirnov [Wed, 18 Dec 2024 10:06:55 +0000 (13:06 +0300)]
Merge branch 'develop' into feature_smirnov_erp-261_waybill_incoming
# Conflicts:
# erp24/records/WaybillWriteOffs.php
marina [Wed, 18 Dec 2024 10:04:13 +0000 (13:04 +0300)]
Merge branch 'develop' into feature-zozirova-erp_256-send_doc_on_1c
# Conflicts:
# erp24/api2/controllers/DataController.php
marina [Wed, 18 Dec 2024 10:03:55 +0000 (13:03 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
Alexander Smirnov [Wed, 18 Dec 2024 10:02:29 +0000 (13:02 +0300)]
error_text
Aleksey Filippov [Wed, 18 Dec 2024 09:34:11 +0000 (09:34 +0000)]
Merge branch 'fezture_fomichev_erp-264_send_waybill_write_offs' into 'develop'
[ERP-264] Отправка документов ревизия накладные списания
See merge request gitlab-instance/yii-erp24!519
fomichev [Wed, 18 Dec 2024 09:29:50 +0000 (12:29 +0300)]
Merge branch 'refs/heads/develop' into fezture_fomichev_erp-264_send_waybill_write_offs
fomichev [Wed, 18 Dec 2024 09:29:22 +0000 (12:29 +0300)]
Добавил смену статуса в $result['write_offs'] для waybill_write_offs
projects / erp24_rep / yii-erp24 / .git / log