]>
gitweb.erp-flowers.ru Git - yii-erp24/.git/log
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)]
правки по автозаказу
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
Aleksey Filippov [Tue, 16 Apr 2024 14:46:04 +0000 (14:46 +0000)]
Merge branch 'feature_smirnov_2024_04_16_shipment_shipment_fix' into 'develop'
shipment shipment fix
See merge request gitlab-instance/yii-erp24!23
Alexander Smirnov [Tue, 16 Apr 2024 14:44:51 +0000 (17:44 +0300)]
shipment shipment fix
Aleksey Filippov [Tue, 16 Apr 2024 14:36:55 +0000 (14:36 +0000)]
Merge branch 'feature_smirnov_2024_04_16_shipment_shipment' into 'develop'
move shipment shipment from old to new
See merge request gitlab-instance/yii-erp24!22
Alexander Smirnov [Tue, 16 Apr 2024 14:31:05 +0000 (17:31 +0300)]
move shipment shipment from old to new
Aleksey Filippov [Tue, 16 Apr 2024 06:53:18 +0000 (06:53 +0000)]
Merge branch 'feature_filippov_20240411_api_cron_fix' into 'develop'
правки по списку сотрудников
See merge request gitlab-instance/yii-erp24!21
Aleksey Filippov [Tue, 16 Apr 2024 06:44:04 +0000 (09:44 +0300)]
правки по списку сотрудников
Aleksey Filippov [Mon, 15 Apr 2024 11:26:19 +0000 (11:26 +0000)]
Merge branch 'feature_pavlikov_20240411_amobaza_include' into 'develop'
модуль амобазы в OrdersController
See merge request gitlab-instance/yii-erp24!20
pavlikov_maxim [Mon, 15 Apr 2024 11:24:34 +0000 (14:24 +0300)]
модуль амобазы в OrdersController
Aleksey Filippov [Mon, 15 Apr 2024 09:30:22 +0000 (09:30 +0000)]
Merge branch 'feature_filippov_20240403_api2_upload_edit' into 'develop'
api2 edit
See merge request gitlab-instance/yii-erp24!19
Aleksey Filippov [Mon, 15 Apr 2024 09:28:33 +0000 (09:28 +0000)]
Merge branch 'feature_filippov_20240411_api_cron_fix' into 'develop'
правки по обмену
See merge request gitlab-instance/yii-erp24!18
Aleksey Filippov [Mon, 15 Apr 2024 08:58:13 +0000 (08:58 +0000)]
Merge branch 'feature_smirnov_2024_04_15_orders_amo_checks' into 'develop'
fix orders amo checks
See merge request gitlab-instance/yii-erp24!17
Alexander Smirnov [Mon, 15 Apr 2024 08:54:27 +0000 (11:54 +0300)]
fix orders amo checks
Aleksey Filippov [Fri, 12 Apr 2024 14:43:07 +0000 (14:43 +0000)]
Merge branch 'feature_smirnov_2024_04_12_fix_orders_delivery' into 'develop'
fix orders delivery
See merge request gitlab-instance/yii-erp24!16
Alexander Smirnov [Fri, 12 Apr 2024 14:40:40 +0000 (17:40 +0300)]
fix orders delivery
Aleksey Filippov [Fri, 12 Apr 2024 07:46:56 +0000 (10:46 +0300)]
правки по обмену
Aleksey Filippov [Thu, 11 Apr 2024 14:21:25 +0000 (14:21 +0000)]
Merge branch 'feature_filippov_20240410_order_fix' into 'develop'
правки по заказу
See merge request gitlab-instance/yii-erp24!15
Aleksey Filippov [Thu, 11 Apr 2024 14:07:10 +0000 (17:07 +0300)]
правки по заказу
Aleksey Filippov [Wed, 10 Apr 2024 12:59:51 +0000 (12:59 +0000)]
Merge branch 'feature_smirnov_2024_04_10_unix_timestamp' into 'develop'
replace unix timestamp with extract epoch
See merge request gitlab-instance/yii-erp24!14
Alexander Smirnov [Wed, 10 Apr 2024 12:56:14 +0000 (15:56 +0300)]
replace unix timestamp with extract epoch
Aleksey Filippov [Wed, 10 Apr 2024 12:40:56 +0000 (12:40 +0000)]
Merge branch 'feature_pavlikov_20240410_task-query-fix' into 'develop'
правка запроса, замена like -> int на = int
See merge request gitlab-instance/yii-erp24!13
pavlikov_maxim [Wed, 10 Apr 2024 12:39:21 +0000 (15:39 +0300)]
правка запроса, замена like -> int на = int
Aleksey Filippov [Wed, 10 Apr 2024 11:53:33 +0000 (11:53 +0000)]
Merge branch 'feature_filippov_20240410_order_fix' into 'develop'
правки по заказу
See merge request gitlab-instance/yii-erp24!12
Aleksey Filippov [Wed, 10 Apr 2024 10:20:01 +0000 (13:20 +0300)]
правки по заказу
Aleksey Filippov [Wed, 10 Apr 2024 07:40:30 +0000 (07:40 +0000)]
Merge branch 'bugfix_smirnov_2024_04_10_orders_delivery' into 'develop'
remove logging
See merge request gitlab-instance/yii-erp24!11
Alexander Smirnov [Wed, 10 Apr 2024 07:39:23 +0000 (10:39 +0300)]
remove logging
Aleksey Filippov [Wed, 10 Apr 2024 07:30:40 +0000 (07:30 +0000)]
Merge branch 'feature_smirnov_2024_04_10_orders_delivery' into 'develop'
move orders delivery from old php
See merge request gitlab-instance/yii-erp24!10
Alexander Smirnov [Wed, 10 Apr 2024 07:26:20 +0000 (10:26 +0300)]
move orders delivery from old php
Aleksey Filippov [Wed, 10 Apr 2024 06:38:41 +0000 (06:38 +0000)]
Merge branch 'feature_filippov_20240410_image_save_fix' into 'develop'
миграция fix image save
See merge request gitlab-instance/yii-erp24!9
Aleksey Filippov [Wed, 10 Apr 2024 06:37:16 +0000 (09:37 +0300)]
миграция add alias
Aleksey Filippov [Tue, 9 Apr 2024 12:39:32 +0000 (12:39 +0000)]
Merge branch 'feature_smirnov_2024_04_09_moving_orders_couriers_from_old_modul' into 'develop'
move orders couriers from old modul
See merge request gitlab-instance/yii-erp24!8
Alexander Smirnov [Tue, 9 Apr 2024 12:37:58 +0000 (15:37 +0300)]
move orders couriers from old modul
Aleksey Filippov [Tue, 9 Apr 2024 07:09:25 +0000 (07:09 +0000)]
Merge branch 'feature_filippov_20240405_file_fix' into 'develop'
миграция add alias
See merge request gitlab-instance/yii-erp24!7
Aleksey Filippov [Tue, 9 Apr 2024 06:59:07 +0000 (09:59 +0300)]
миграция add alias
Aleksey Filippov [Mon, 8 Apr 2024 13:53:54 +0000 (13:53 +0000)]
Merge branch 'feature_smirnov_2024_04_08_company_functions_for_users_url_fix' into 'develop'
fix urls for company functions for users
See merge request gitlab-instance/yii-erp24!6
Aleksey Filippov [Mon, 8 Apr 2024 13:53:16 +0000 (13:53 +0000)]
Merge branch 'feature_smirnov_2024_04_08_fix_charts_for_managemenet_for_pgsql' into 'develop'
fix charts-for-management for pgsql
See merge request gitlab-instance/yii-erp24!5
Alexander Smirnov [Mon, 8 Apr 2024 13:47:59 +0000 (16:47 +0300)]
fix urls for company functions for users
Alexander Smirnov [Mon, 8 Apr 2024 06:16:19 +0000 (09:16 +0300)]
fix charts-for-management for pgsql
Aleksey Filippov [Fri, 5 Apr 2024 14:14:26 +0000 (14:14 +0000)]
Merge branch 'feature_pgsql_migrate' into 'develop'
Feature pgsql migrate
See merge request gitlab-instance/yii-erp24!4
Aleksey Filippov [Fri, 5 Apr 2024 08:12:13 +0000 (11:12 +0300)]
миграция api
Aleksey Filippov [Wed, 3 Apr 2024 17:22:47 +0000 (20:22 +0300)]
миграция отключение очереди на MySql
Aleksey Filippov [Wed, 3 Apr 2024 17:20:09 +0000 (20:20 +0300)]
api2 edit
Aleksey Filippov [Wed, 3 Apr 2024 07:37:26 +0000 (10:37 +0300)]
Merge branch 'feature_filippov_20240401_pg_migrate'' into feature_pgsql_migrate
Aleksey Filippov [Wed, 3 Apr 2024 07:36:19 +0000 (10:36 +0300)]
миграция
Alexander Smirnov [Tue, 2 Apr 2024 14:34:20 +0000 (17:34 +0300)]
fix bonus sex undefined variable
Alexander Smirnov [Tue, 2 Apr 2024 13:49:19 +0000 (16:49 +0300)]
Merge branch 'feature_pgsql_migrate' of https://git-bc.gitlab.yandexcloud.net/gitlab-instance/yii-erp24 into feature_pgsql_migrate
Alexander Smirnov [Tue, 2 Apr 2024 13:48:50 +0000 (16:48 +0300)]
add kartik grid support
Aleksey Filippov [Tue, 2 Apr 2024 11:33:45 +0000 (14:33 +0300)]
Merge remote-tracking branch 'origin/feature_pgsql_migrate' into feature_pgsql_migrate
Alexander Smirnov [Tue, 2 Apr 2024 10:34:10 +0000 (13:34 +0300)]
fix double quotes around value in pgsql
Alexander Smirnov [Tue, 2 Apr 2024 10:25:33 +0000 (13:25 +0300)]
fix storeId is null bad for pgsql
Alexander Smirnov [Tue, 2 Apr 2024 10:03:18 +0000 (13:03 +0300)]
fix bug to pgsql and port for pg
Aleksey Filippov [Tue, 2 Apr 2024 08:30:25 +0000 (11:30 +0300)]
миграция
Aleksey Filippov [Fri, 29 Mar 2024 20:43:57 +0000 (23:43 +0300)]
миграция
Alexander Smirnov [Wed, 27 Mar 2024 16:41:01 +0000 (19:41 +0300)]
fix integration api
Alexander Smirnov [Wed, 27 Mar 2024 11:05:54 +0000 (14:05 +0300)]
fix history if group is no longer exists
Alexander Smirnov [Wed, 27 Mar 2024 10:36:55 +0000 (13:36 +0300)]
fix
Alexander Smirnov [Wed, 27 Mar 2024 09:43:38 +0000 (12:43 +0300)]
fix if
Alexander Smirnov [Wed, 27 Mar 2024 08:23:33 +0000 (11:23 +0300)]
moving to pgsql charts-for-management
Aleksey Filippov [Tue, 26 Mar 2024 19:48:26 +0000 (19:48 +0000)]
Merge branch 'feature_filippov_20240326_payroll_make_fix' into 'develop'
исправления по формированию зарплатной ведомости
See merge request gitlab-instance/yii-erp24!2
Aleksey Filippov [Tue, 26 Mar 2024 19:46:28 +0000 (22:46 +0300)]
исправления по формированию зарплатной ведомости
Aleksey Filippov [Tue, 26 Mar 2024 14:50:04 +0000 (14:50 +0000)]
Merge branch 'feature_filippov_20240326_dashboard_fix' into 'develop'
исправления получения данных по дашборду
See merge request gitlab-instance/yii-erp24!1
Aleksey Filippov [Tue, 26 Mar 2024 14:48:19 +0000 (17:48 +0300)]
исправления получения данных по дашборду
Alexander Smirnov [Mon, 25 Mar 2024 10:06:32 +0000 (13:06 +0300)]
modify code after moving to pgsql starting
filippov [Mon, 25 Mar 2024 02:35:06 +0000 (02:35 +0000)]
Merge branch 'feature_filippov_20240324_test' into 'develop'
test
See merge request gitlab-instance-
71cad6d6/yii_erp24!42
Aleksey Filippov [Sun, 24 Mar 2024 18:48:49 +0000 (21:48 +0300)]
test
filippov [Fri, 22 Mar 2024 04:06:50 +0000 (04:06 +0000)]
Merge branch 'feature_filippov_20240321_payroll_management' into 'develop'
payroll fix
See merge request gitlab-instance-
71cad6d6/yii_erp24!41
Aleksey Filippov [Thu, 21 Mar 2024 20:19:29 +0000 (23:19 +0300)]
payroll fix
filippov [Thu, 21 Mar 2024 17:05:41 +0000 (17:05 +0000)]
Merge branch 'feature_filippov_20240321_revert_gitignore' into 'develop'
revert gitignore
See merge request gitlab-instance-
71cad6d6/yii_erp24!40
filippov [Thu, 21 Mar 2024 16:57:48 +0000 (16:57 +0000)]
Merge branch 'feature_filippov_20240321_payroll_fix' into 'develop'
payroll fix
See merge request gitlab-instance-
71cad6d6/yii_erp24!39
Aleksey Filippov [Thu, 21 Mar 2024 09:19:25 +0000 (12:19 +0300)]
payroll fix
Aleksey Filippov [Thu, 21 Mar 2024 09:03:00 +0000 (12:03 +0300)]
payroll fix
filippov [Wed, 20 Mar 2024 21:41:05 +0000 (21:41 +0000)]
Merge branch 'feature_filippov_20240920_command_add' into 'develop'
command add
See merge request gitlab-instance-
71cad6d6/yii_erp24!38
Aleksey Filippov [Wed, 20 Mar 2024 13:53:30 +0000 (16:53 +0300)]
command add
filippov [Fri, 15 Mar 2024 21:20:42 +0000 (21:20 +0000)]
Merge branch 'feature_filippov_20240315_fix_actual' into 'develop'
fix set actual code
See merge request gitlab-instance-
71cad6d6/yii_erp24!37
projects / yii-erp24 / .git / log