]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
marina [Thu, 19 Dec 2024 08:43:16 +0000 (11:43 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
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с
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
fomichev [Wed, 18 Dec 2024 09:07:45 +0000 (12:07 +0300)]
Правки ошибок в Upload
marina [Wed, 18 Dec 2024 08:42:27 +0000 (11:42 +0300)]
Merge branch 'develop' into feature-zozirova-erp_256-send_doc_on_1c
Aleksey Filippov [Wed, 18 Dec 2024 08:37:01 +0000 (08:37 +0000)]
Merge branch 'feature_smirnov_erp-261_waybill_incoming' into 'develop'
исправлена двойная вложенность items
See merge request gitlab-instance/yii-erp24!520
marina [Wed, 18 Dec 2024 08:31:22 +0000 (11:31 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
marina [Wed, 18 Dec 2024 08:30:47 +0000 (11:30 +0300)]
ERP-256 Сделать отправку документов Пересортица в 1с
Alexander Smirnov [Wed, 18 Dec 2024 08:28:56 +0000 (11:28 +0300)]
исправлена двойная вложенность items
fomichev [Wed, 18 Dec 2024 08:19:02 +0000 (11:19 +0300)]
Убрал свойство
Aleksey Filippov [Wed, 18 Dec 2024 07:31:26 +0000 (07:31 +0000)]
Merge branch 'feature_smirnov_erp-261_waybill_incoming' into 'develop'
фиксы
See merge request gitlab-instance/yii-erp24!518
fomichev [Wed, 18 Dec 2024 07:30:51 +0000 (10:30 +0300)]
Правки по константам и статусам
Alexander Smirnov [Wed, 18 Dec 2024 07:30:10 +0000 (10:30 +0300)]
фиксы
Alexander Smirnov [Wed, 18 Dec 2024 07:23:51 +0000 (10:23 +0300)]
фиксы
fomichev [Wed, 18 Dec 2024 06:59:47 +0000 (09:59 +0300)]
Получение из 1с
fomichev [Wed, 18 Dec 2024 06:41:25 +0000 (09:41 +0300)]
Отправка списаний
Aleksey Filippov [Tue, 17 Dec 2024 12:55:07 +0000 (12:55 +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!517
marina [Tue, 17 Dec 2024 12:51:52 +0000 (15:51 +0300)]
ERP-259 Доработка второго шага передачи смен
marina [Tue, 17 Dec 2024 12:43:04 +0000 (15:43 +0300)]
ERP-259 Доработка второго шага передачи смен
Aleksey Filippov [Tue, 17 Dec 2024 12:05:07 +0000 (12:05 +0000)]
Merge branch 'feature-zozirova-erp_256-send_doc_on_1c' into 'develop'
ERP-259 Доработка второго шага передачи смен
See merge request gitlab-instance/yii-erp24!516
marina [Tue, 17 Dec 2024 12:03:13 +0000 (15:03 +0300)]
ERP-259 Доработка второго шага передачи смен
Aleksey Filippov [Tue, 17 Dec 2024 12:02:25 +0000 (12:02 +0000)]
Merge branch 'feature-zozirova-erp_256-send_doc_on_1c' into 'develop'
ERP-259 Доработка второго шага передачи смен
See merge request gitlab-instance/yii-erp24!513
Aleksey Filippov [Tue, 17 Dec 2024 12:00:34 +0000 (12:00 +0000)]
Merge branch 'feature_smirnov_erp-261_waybill_incoming' into 'develop'
pagination = false
See merge request gitlab-instance/yii-erp24!515
Alexander Smirnov [Tue, 17 Dec 2024 11:59:03 +0000 (14:59 +0300)]
pagination = false
Aleksey Filippov [Tue, 17 Dec 2024 11:53:33 +0000 (11:53 +0000)]
Merge branch 'feature_smirnov_erp-261_waybill_incoming' into 'develop'
добавлена ссылка на shift_transfer_id
See merge request gitlab-instance/yii-erp24!512
marina [Tue, 17 Dec 2024 11:46:27 +0000 (14:46 +0300)]
ERP-259 Доработка второго шага передачи смен
marina [Tue, 17 Dec 2024 11:38:43 +0000 (14:38 +0300)]
ERP-259 Доработка второго шага передачи смен
marina [Tue, 17 Dec 2024 11:29:54 +0000 (14:29 +0300)]
ERP-259 Доработка второго шага передачи смен
marina [Tue, 17 Dec 2024 10:08:43 +0000 (13:08 +0300)]
ERP-259 Доработка второго шага передачи смен
marina [Tue, 17 Dec 2024 09:52:47 +0000 (12:52 +0300)]
ERP-259 Доработка второго шага передачи смен
marina [Tue, 17 Dec 2024 09:51:29 +0000 (12:51 +0300)]
ERP-259 Доработка второго шага передачи смен
marina [Tue, 17 Dec 2024 09:49:53 +0000 (12:49 +0300)]
ERP-259 Доработка второго шага передачи смен
marina [Tue, 17 Dec 2024 09:45:15 +0000 (12:45 +0300)]
ERP-259 Доработка второго шага передачи смен
marina [Tue, 17 Dec 2024 09:42:43 +0000 (12:42 +0300)]
ERP-259 Доработка второго шага передачи смен
marina [Tue, 17 Dec 2024 09:41:19 +0000 (12:41 +0300)]
ERP-259 Доработка второго шага передачи смен
marina [Tue, 17 Dec 2024 09:38:17 +0000 (12:38 +0300)]
ERP-259 Доработка второго шага передачи смен
marina [Tue, 17 Dec 2024 09:35:35 +0000 (12:35 +0300)]
ERP-259 Доработка второго шага передачи смен
marina [Tue, 17 Dec 2024 09:12:36 +0000 (12:12 +0300)]
ERP-259 Доработка второго шага передачи смен
marina [Tue, 17 Dec 2024 09:10:17 +0000 (12:10 +0300)]
ERP-259 Доработка второго шага передачи смен
Alexander Smirnov [Tue, 17 Dec 2024 08:20:41 +0000 (11:20 +0300)]
добавлена ссылка на shift_transfer_id
marina [Tue, 17 Dec 2024 08:14:10 +0000 (11:14 +0300)]
Merge branch 'develop' into feature-zozirova-erp_256-send_doc_on_1c
Aleksey Filippov [Tue, 17 Dec 2024 08:13:12 +0000 (08:13 +0000)]
Merge branch 'feature_smirnov_erp-261_waybill_incoming' into 'develop'
shift_transfer_id
See merge request gitlab-instance/yii-erp24!511
Alexander Smirnov [Tue, 17 Dec 2024 08:11:32 +0000 (11:11 +0300)]
shift_transfer_id
marina [Tue, 17 Dec 2024 08:04:50 +0000 (11:04 +0300)]
ERP-259 Доработка второго шага передачи смен
marina [Tue, 17 Dec 2024 08:03:26 +0000 (11:03 +0300)]
ERP-259 Доработка второго шага передачи смен
marina [Tue, 17 Dec 2024 07:58:53 +0000 (10:58 +0300)]
ERP-259 Доработка второго шага передачи смен
marina [Tue, 17 Dec 2024 07:55:27 +0000 (10:55 +0300)]
ERP-259 Доработка второго шага передачи смен
marina [Tue, 17 Dec 2024 07:50:57 +0000 (10:50 +0300)]
ERP-259 Доработка второго шага передачи смен
marina [Tue, 17 Dec 2024 07:41:49 +0000 (10:41 +0300)]
ERP-259 Доработка второго шага передачи смен
Aleksey Filippov [Tue, 17 Dec 2024 07:32:43 +0000 (07:32 +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!510
marina [Tue, 17 Dec 2024 07:26:00 +0000 (10:26 +0300)]
ERP-259 Доработка второго шага передачи смен
marina [Tue, 17 Dec 2024 07:23:26 +0000 (10:23 +0300)]
Merge branch 'develop' into feature-zozirova-erp_256-send_doc_on_1c
# Conflicts:
# erp24/records/WaybillIncoming.php
# erp24/views/shift-transfer/_transfer.php
marina [Tue, 17 Dec 2024 07:22:25 +0000 (10:22 +0300)]
ERP-259 Доработка второго шага передачи смен
Aleksey Filippov [Tue, 17 Dec 2024 07:17:43 +0000 (07:17 +0000)]
Merge branch 'feature_fomichev_erp-263_kogort_download_page' into 'develop'
[ERP-263] Нужно сформировать выгрузку когорт в файл
See merge request gitlab-instance/yii-erp24!502
Aleksey Filippov [Tue, 17 Dec 2024 07:11:23 +0000 (07:11 +0000)]
Merge branch 'feature_smirnov_erp-261_waybill_incoming' into 'develop'
[ERP-261] добавил артикулы, убрал штуки
See merge request gitlab-instance/yii-erp24!509
Alexander Smirnov [Mon, 16 Dec 2024 17:17:38 +0000 (20:17 +0300)]
[ERP-261] убрал себестоимость, штуки, добавил артикул
projects / erp24_rep / yii-erp24 / .git / log