]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
Aleksey Filippov [Sat, 27 Apr 2024 12:41:32 +0000 (12:41 +0000)]
Merge branch 'insert_ignore_from_mysql_to_pgsql' into 'develop'
insert ignore c mysql переведен postgresql
See merge request gitlab-instance/yii-erp24!70
Marina Zozirova [Sat, 27 Apr 2024 12:41:32 +0000 (12:41 +0000)]
insert ignore c mysql переведен postgresql
Aleksey Filippov [Sat, 27 Apr 2024 12:09:15 +0000 (12:09 +0000)]
Merge branch 'feature_pavlikov_20240427_session_drop' into 'develop'
delete session if required data not exists
See merge request gitlab-instance/yii-erp24!69
pavlikov_maxim [Sat, 27 Apr 2024 11:52:45 +0000 (14:52 +0300)]
delete session if required data not exists
pavlikov_maxim [Sat, 27 Apr 2024 11:37:53 +0000 (14:37 +0300)]
delete session if required data not exists
Aleksey Filippov [Fri, 26 Apr 2024 14:21:50 +0000 (14:21 +0000)]
Merge branch 'feature_filippov_20240425_amo_token_refresh' into 'develop'
правки по api
See merge request gitlab-instance/yii-erp24!68
Aleksey Filippov [Fri, 26 Apr 2024 14:19:44 +0000 (17:19 +0300)]
правки по api
Aleksey Filippov [Fri, 26 Apr 2024 14:19:02 +0000 (14:19 +0000)]
Merge branch 'feature_smirnov_2024_04_26_bonus_users_sale_update' into 'develop'
fix bonus users sale update
See merge request gitlab-instance/yii-erp24!67
Alexander Smirnov [Fri, 26 Apr 2024 14:17:15 +0000 (17:17 +0300)]
fix bonus users sale update
Aleksey Filippov [Fri, 26 Apr 2024 09:27:54 +0000 (09:27 +0000)]
Merge branch 'change_column_type_on_page_statistics' into 'develop'
изменен тип колонки, так как при фильтрации выпадала ошибка о слишком длинном...
See merge request gitlab-instance/yii-erp24!66
Marina Zozirova [Fri, 26 Apr 2024 09:27:54 +0000 (09:27 +0000)]
изменен тип колонки, так как при фильтрации выпадала ошибка о слишком длинном...
Aleksey Filippov [Fri, 26 Apr 2024 06:55:16 +0000 (06:55 +0000)]
Merge branch 'feature_filippov_20240426_rate_category_admin_fix' into 'develop'
правки по лк отключение расчёта категории нормасмены
See merge request gitlab-instance/yii-erp24!65
Aleksey Filippov [Fri, 26 Apr 2024 06:51:57 +0000 (09:51 +0300)]
правки по лк отключение расчёта категории нормасмены
Aleksey Filippov [Thu, 25 Apr 2024 14:59:09 +0000 (14:59 +0000)]
Merge branch 'fix_timetable_filter' into 'develop'
выправлен фильтр на странице /timetable/plan
See merge request gitlab-instance/yii-erp24!64
marina [Thu, 25 Apr 2024 14:57:54 +0000 (17:57 +0300)]
выправлен фильтр на странице /timetable/plan
Aleksey Filippov [Thu, 25 Apr 2024 14:55:47 +0000 (14:55 +0000)]
Merge branch 'feature_filippov_20240424_sales_fix' into 'develop'
правки по api
See merge request gitlab-instance/yii-erp24!63
Aleksey Filippov [Thu, 25 Apr 2024 14:54:13 +0000 (17:54 +0300)]
правки по api
Aleksey Filippov [Thu, 25 Apr 2024 14:21:09 +0000 (14:21 +0000)]
Merge branch 'feature_smirnov_2024_04_25_products_products_1c' into 'develop'
add products/products-1c
See merge request gitlab-instance/yii-erp24!62
Alexander Smirnov [Thu, 25 Apr 2024 14:19:28 +0000 (17:19 +0300)]
add products/products-1c
Aleksey Filippov [Wed, 24 Apr 2024 17:44:13 +0000 (17:44 +0000)]
Merge branch 'feature_smirnov_2024_04_24_bonus_bonus_users' into 'develop'
add bonus/bonus-users
See merge request gitlab-instance/yii-erp24!61
Alexander Smirnov [Wed, 24 Apr 2024 15:46:02 +0000 (18:46 +0300)]
add bonus/bonus-users
Aleksey Filippov [Wed, 24 Apr 2024 13:16:59 +0000 (13:16 +0000)]
Merge branch 'feature_pavlikov_20240424_palnogramma_edit' into 'develop'
фикс модуля polnogramm edit
See merge request gitlab-instance/yii-erp24!60
pavlikov_maxim [Wed, 24 Apr 2024 12:49:43 +0000 (15:49 +0300)]
фикс модуля polnogramm edit
Aleksey Filippov [Wed, 24 Apr 2024 12:06:38 +0000 (12:06 +0000)]
Merge branch 'fix_timetable_query' into 'develop'
выправлен вызов модалки на странице /timetable/fact
See merge request gitlab-instance/yii-erp24!59
marina [Wed, 24 Apr 2024 12:04:04 +0000 (15:04 +0300)]
выправлен вызов модалки на странице /timetable/fact
Aleksey Filippov [Wed, 24 Apr 2024 12:00:32 +0000 (12:00 +0000)]
Merge branch 'feature_pavlikov_20240424_palnogramma_edit' into 'develop'
фикс модуля polnogramm edit
See merge request gitlab-instance/yii-erp24!58
pavlikov_maxim [Wed, 24 Apr 2024 11:22:04 +0000 (14:22 +0300)]
фикс модуля polnogramm edit
Aleksey Filippov [Wed, 24 Apr 2024 08:40:28 +0000 (08:40 +0000)]
Merge branch 'feature_filippov_20240424_sales_fix' into 'develop'
правки по дашборду Продажи сегодня
See merge request gitlab-instance/yii-erp24!57
Aleksey Filippov [Wed, 24 Apr 2024 08:39:40 +0000 (11:39 +0300)]
правки по дашборду Продажи сегодня
Aleksey Filippov [Tue, 23 Apr 2024 18:51:51 +0000 (18:51 +0000)]
Merge branch 'bugfix_smirnov_2024_04_23_shipment_shipment_p2' into 'develop'
shipment shipment fix 2
See merge request gitlab-instance/yii-erp24!56
Alexander Smirnov [Tue, 23 Apr 2024 18:43:28 +0000 (21:43 +0300)]
shipment shipment fix 2
Aleksey Filippov [Tue, 23 Apr 2024 14:42:26 +0000 (14:42 +0000)]
Merge branch 'bugfix_smirnov_2024_04_23_shipment_shipment' into 'develop'
shipment bugfixment
See merge request gitlab-instance/yii-erp24!55
Alexander Smirnov [Tue, 23 Apr 2024 14:39:55 +0000 (17:39 +0300)]
shipment bugfixment
Aleksey Filippov [Tue, 23 Apr 2024 12:39:15 +0000 (12:39 +0000)]
Merge branch 'feature_smirnov_2024_04_22_shipment_polnogramm' into 'develop'
shipment polnogram
See merge request gitlab-instance/yii-erp24!54
Alexander Smirnov [Tue, 23 Apr 2024 09:15:42 +0000 (12:15 +0300)]
shipment polnogram
Aleksey Filippov [Mon, 22 Apr 2024 13:45:30 +0000 (13:45 +0000)]
Merge branch 'feature_pavlikov_20240422_shipment_info' into 'develop'
фикс модуля couriers stats
See merge request gitlab-instance/yii-erp24!53
pavlikov_maxim [Mon, 22 Apr 2024 13:39:11 +0000 (16:39 +0300)]
фикс модуля couriers stats
Aleksey Filippov [Mon, 22 Apr 2024 12:02:50 +0000 (12:02 +0000)]
Merge branch 'feature_pavlikov_20240422_couriers_stats' into 'develop'
фикс модуля couriers stats
See merge request gitlab-instance/yii-erp24!52
pavlikov_maxim [Mon, 22 Apr 2024 11:59:24 +0000 (14:59 +0300)]
фикс модуля couriers stats
Aleksey Filippov [Mon, 22 Apr 2024 11:20:49 +0000 (11:20 +0000)]
Merge branch 'feature_filippov_20240422_shipments_ajax_field_edit_fix' into 'develop'
правки по автозаказу фикс редактирования полей ajax
See merge request gitlab-instance/yii-erp24!51
Aleksey Filippov [Mon, 22 Apr 2024 11:19:08 +0000 (14:19 +0300)]
правки по автозаказу фикс редактирования полей ajax
Aleksey Filippov [Mon, 22 Apr 2024 10:37:41 +0000 (10:37 +0000)]
Merge branch 'feature_pavlikov_20240422_couriers_stats' into 'develop'
фикс модуля couriers stats
See merge request gitlab-instance/yii-erp24!50
pavlikov_maxim [Mon, 22 Apr 2024 10:18:41 +0000 (13:18 +0300)]
фикс модуля couriers stats
Aleksey Filippov [Mon, 22 Apr 2024 09:17:38 +0000 (09:17 +0000)]
Merge branch 'feature_filippov_20240422_store_product_fact_fix' into 'develop'
правки по автозаказу фактические остатки
See merge request gitlab-instance/yii-erp24!49
Aleksey Filippov [Mon, 22 Apr 2024 09:15:41 +0000 (12:15 +0300)]
правки по автозаказу фактические остатки
Aleksey Filippov [Sun, 21 Apr 2024 14:47:18 +0000 (14:47 +0000)]
Merge branch 'feature_smirnov_2024_04_20_shipment_store_product_fact' into 'develop'
shipment store product fact p1
See merge request gitlab-instance/yii-erp24!48
Alexander Smirnov [Sat, 20 Apr 2024 14:04:43 +0000 (17:04 +0300)]
shipment store product fact p1
Aleksey Filippov [Fri, 19 Apr 2024 14:16:40 +0000 (14:16 +0000)]
Merge branch 'feature_smirnov_2024_04_19_orders_samovivoz' into 'develop'
orders samovivoz
See merge request gitlab-instance/yii-erp24!47
Alexander Smirnov [Fri, 19 Apr 2024 14:15:08 +0000 (17:15 +0300)]
orders samovivoz
Aleksey Filippov [Fri, 19 Apr 2024 13:58:56 +0000 (13:58 +0000)]
Merge branch 'feature_pavlikov_20240418_write_offs_fix' into 'develop'
фикс модуля write-offs
See merge request gitlab-instance/yii-erp24!46
pavlikov_maxim [Fri, 19 Apr 2024 13:57:22 +0000 (16:57 +0300)]
фикс модуля write-offs
Aleksey Filippov [Fri, 19 Apr 2024 13:48:09 +0000 (13:48 +0000)]
Merge branch 'feature_pavlikov_20240418_write_offs_fix' into 'develop'
фикс модуля write-offs
See merge request gitlab-instance/yii-erp24!45
Aleksey Filippov [Fri, 19 Apr 2024 13:45:36 +0000 (13:45 +0000)]
Merge branch 'feature_smirnov_2024_04_19_orders_logist_table' into 'develop'
orders logist table
See merge request gitlab-instance/yii-erp24!44
pavlikov_maxim [Fri, 19 Apr 2024 13:42:01 +0000 (16:42 +0300)]
фикс модуля write-offs
Alexander Smirnov [Fri, 19 Apr 2024 13:39:51 +0000 (16:39 +0300)]
orders logist table
Aleksey Filippov [Fri, 19 Apr 2024 13:31:22 +0000 (13:31 +0000)]
Merge branch 'feature_filippov_20240419_write_offs_tumb_file_fix' into 'develop'
правки по картинкам в списании в erp и скрытие пункта в Автозаказе
See merge request gitlab-instance/yii-erp24!43
Aleksey Filippov [Fri, 19 Apr 2024 13:26:57 +0000 (16:26 +0300)]
правки по картинкам в списании в erp
скрытие пункта в Автозаказе
Aleksey Filippov [Fri, 19 Apr 2024 13:18:06 +0000 (13:18 +0000)]
Merge branch 'feature_pavlikov_20240418_write_offs_fix' into 'develop'
фикс модуля write-offs
See merge request gitlab-instance/yii-erp24!42
pavlikov_maxim [Fri, 19 Apr 2024 13:15:38 +0000 (16:15 +0300)]
фикс модуля write-offs
Aleksey Filippov [Fri, 19 Apr 2024 10:24:17 +0000 (10:24 +0000)]
Merge branch 'feature_pavlikov_20240418_write_offs_fix' into 'develop'
фикс модуля write-offs
See merge request gitlab-instance/yii-erp24!41
pavlikov_maxim [Fri, 19 Apr 2024 10:22:14 +0000 (13:22 +0300)]
фикс модуля write-offs
Aleksey Filippov [Fri, 19 Apr 2024 09:56:25 +0000 (09:56 +0000)]
Merge branch 'feature_pavlikov_20240418_write_offs_fix' into 'develop'
фикс модуля write-offs
See merge request gitlab-instance/yii-erp24!40
pavlikov_maxim [Fri, 19 Apr 2024 09:39:11 +0000 (12:39 +0300)]
фикс модуля write-offs
Aleksey Filippov [Fri, 19 Apr 2024 09:31:35 +0000 (09:31 +0000)]
Merge branch 'feature_pavlikov_20240418_write_offs_fix' into 'develop'
фикс модуля write-offs
See merge request gitlab-instance/yii-erp24!39
pavlikov_maxim [Fri, 19 Apr 2024 09:29:44 +0000 (12:29 +0300)]
фикс модуля write-offs
Aleksey Filippov [Fri, 19 Apr 2024 09:18:06 +0000 (09:18 +0000)]
Merge branch 'feature_filippov_20240419_shipments_score_fix' into 'develop'
правки по автозаказу score
See merge request gitlab-instance/yii-erp24!38
Aleksey Filippov [Fri, 19 Apr 2024 09:17:05 +0000 (12:17 +0300)]
правки по автозаказу score
Aleksey Filippov [Fri, 19 Apr 2024 08:12:21 +0000 (08:12 +0000)]
Merge branch 'feature_pavlikov_20240418_write_offs_fix' into 'develop'
фикс модуля write-offs
See merge request gitlab-instance/yii-erp24!33
pavlikov_maxim [Fri, 19 Apr 2024 08:03:22 +0000 (11:03 +0300)]
фикс модуля write-offs
Aleksey Filippov [Thu, 18 Apr 2024 20:15:32 +0000 (20:15 +0000)]
Merge branch 'feature_filippov_20240418_fix_ajax_division' into 'develop'
правки по автозаказу
See merge request gitlab-instance/yii-erp24!37
Aleksey Filippov [Thu, 18 Apr 2024 20:14:15 +0000 (23:14 +0300)]
правки по автозаказу
Aleksey Filippov [Thu, 18 Apr 2024 15:31:05 +0000 (15:31 +0000)]
Merge branch 'feature_filippov_20240418_fix_ajax_division' into 'develop'
правки по автозаказу
See merge request gitlab-instance/yii-erp24!36
Aleksey Filippov [Thu, 18 Apr 2024 15:26:25 +0000 (18:26 +0300)]
правки по автозаказу
Aleksey Filippov [Thu, 18 Apr 2024 15:08:16 +0000 (15:08 +0000)]
Merge branch 'feature_smirnov_2024_04_18_shipment_ajax' into 'develop'
Feature smirnov 2024 04 18 shipment ajax
See merge request gitlab-instance/yii-erp24!35
Alexander Smirnov [Thu, 18 Apr 2024 15:05:34 +0000 (18:05 +0300)]
Merge branch 'develop' into feature_smirnov_2024_04_18_shipment_ajax
Alexander Smirnov [Thu, 18 Apr 2024 15:05:01 +0000 (18:05 +0300)]
shipment ajax
Aleksey Filippov [Thu, 18 Apr 2024 15:01:39 +0000 (15:01 +0000)]
Merge branch 'feature_filippov_20240418_shipment_division_fix' into 'develop'
правки по автозаказу
See merge request gitlab-instance/yii-erp24!34
Aleksey Filippov [Thu, 18 Apr 2024 15:00:26 +0000 (18:00 +0300)]
правки по автозаказу
pavlikov_maxim [Thu, 18 Apr 2024 12:12:43 +0000 (15:12 +0300)]
фикс модуля write-offs
Aleksey Filippov [Thu, 18 Apr 2024 11:30:49 +0000 (11:30 +0000)]
Merge branch 'feature_filippov_20240418_shipments_fix' into 'develop'
правки по автозаказу
See merge request gitlab-instance/yii-erp24!32
Aleksey Filippov [Thu, 18 Apr 2024 11:30:27 +0000 (14:30 +0300)]
правки по автозаказу
Aleksey Filippov [Thu, 18 Apr 2024 11:27:34 +0000 (11:27 +0000)]
Merge branch 'feature_filippov_20240418_shipments_fix' into 'develop'
правки по автозаказу
See merge request gitlab-instance/yii-erp24!31
Aleksey Filippov [Thu, 18 Apr 2024 11:26:50 +0000 (14:26 +0300)]
правки по автозаказу
Aleksey Filippov [Thu, 18 Apr 2024 10:50:55 +0000 (10:50 +0000)]
Merge branch 'feature_smirnov_2024_04_18_shipment_shipment_fix3' into 'develop'
shipment fix 3
See merge request gitlab-instance/yii-erp24!30
Alexander Smirnov [Thu, 18 Apr 2024 10:49:56 +0000 (13:49 +0300)]
shipment fix 3
Aleksey Filippov [Thu, 18 Apr 2024 10:46:41 +0000 (10:46 +0000)]
Merge branch 'feature_smirnov_2024_04_18_shipment_shipment_fix2' into 'develop'
shipment shipment fix2
See merge request gitlab-instance/yii-erp24!29
Alexander Smirnov [Thu, 18 Apr 2024 10:45:07 +0000 (13:45 +0300)]
shipment shipment fix2
Aleksey Filippov [Thu, 18 Apr 2024 10:13:05 +0000 (10:13 +0000)]
Merge branch 'feature_smirnov_2024_04_18_shipment_shipment' into 'develop'
shipment shipment
See merge request gitlab-instance/yii-erp24!28
Alexander Smirnov [Thu, 18 Apr 2024 10:10:54 +0000 (13:10 +0300)]
shipment shipment
Aleksey Filippov [Wed, 17 Apr 2024 13:14:20 +0000 (13:14 +0000)]
Merge branch 'feature_smirnov_2024_04_17_shipment_division_store_print' into 'develop'
fix shipment division store print
See merge request gitlab-instance/yii-erp24!27
Alexander Smirnov [Wed, 17 Apr 2024 13:12:35 +0000 (16:12 +0300)]
fix shipment division store print
Aleksey Filippov [Wed, 17 Apr 2024 12:42:00 +0000 (12:42 +0000)]
Merge branch 'feature_filippov_20240417_cron_file_path_fix' into 'develop'
правки по ссылке на файл
See merge request gitlab-instance/yii-erp24!26
Aleksey Filippov [Wed, 17 Apr 2024 11:15:44 +0000 (14:15 +0300)]
правки по ссылке на файл
Aleksey Filippov [Wed, 17 Apr 2024 11:07:03 +0000 (11:07 +0000)]
Merge branch 'feature_smirnov_2024_04_16_shipment_index' into 'develop'
Feature smirnov 2024 04 16 shipment index
See merge request gitlab-instance/yii-erp24!25
Alexander Smirnov [Wed, 17 Apr 2024 11:05:37 +0000 (14:05 +0300)]
shipment index
Alexander Smirnov [Wed, 17 Apr 2024 08:41:52 +0000 (11:41 +0300)]
fix providers
Alexander Smirnov [Tue, 16 Apr 2024 16:29:43 +0000 (19:29 +0300)]
shipment add
Alexander Smirnov [Tue, 16 Apr 2024 15:20:45 +0000 (18:20 +0300)]
shipment index
Aleksey Filippov [Tue, 16 Apr 2024 14:55:40 +0000 (14:55 +0000)]
Merge branch 'feature_smirnov_2024_04_16_shipment_shipment_fix_p2' into 'develop'
shipment shipment fix p2
See merge request gitlab-instance/yii-erp24!24
Alexander Smirnov [Tue, 16 Apr 2024 14:54:34 +0000 (17:54 +0300)]
shipment shipment fix p2
projects / erp24_rep / yii-erp24 / .git / log