]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
Aleksey Filippov [Wed, 3 Apr 2024 17:20:09 +0000 (20:20 +0300)]
api2 edit
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)]
исправления получения данных по дашборду
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
filippov [Fri, 15 Mar 2024 19:18:41 +0000 (19:18 +0000)]
Merge branch 'feature_filippov_20240315_fix' into 'develop'
Feature filippov
20240315 fix
See merge request gitlab-instance-
71cad6d6/yii_erp24!36
filippov [Fri, 15 Mar 2024 17:09:18 +0000 (17:09 +0000)]
Merge branch 'feature_20240314_erp_to_yii_erp_actual' into 'develop'
set actual code from erp
See merge request gitlab-instance-
71cad6d6/yii_erp24!35
Aleksey Filippov [Fri, 15 Mar 2024 13:34:39 +0000 (16:34 +0300)]
fix set actual code
Aleksey Filippov [Fri, 15 Mar 2024 11:32:40 +0000 (14:32 +0300)]
fix set actual code
Aleksey Filippov [Fri, 15 Mar 2024 11:15:38 +0000 (14:15 +0300)]
fix set actual code
Aleksey Filippov [Fri, 15 Mar 2024 10:41:04 +0000 (13:41 +0300)]
fix set actual code from erp
Aleksey Filippov [Fri, 15 Mar 2024 09:17:43 +0000 (12:17 +0300)]
set actual code from erp
filippov [Thu, 14 Mar 2024 18:32:45 +0000 (18:32 +0000)]
Merge branch 'feature_20240314_config_fix' into 'develop'
config fix
See merge request gitlab-instance-
71cad6d6/yii_erp24!34
filippov [Thu, 14 Mar 2024 18:32:07 +0000 (18:32 +0000)]
Merge branch 'feature_smirnov_2024_03_14_legacy_session_reload' into 'develop'
add legacy fill reload
See merge request gitlab-instance-
71cad6d6/yii_erp24!33
Alexander Smirnov [Thu, 14 Mar 2024 10:44:32 +0000 (13:44 +0300)]
add legacy fill reload
Aleksey Filippov [Thu, 14 Mar 2024 10:16:49 +0000 (13:16 +0300)]
config fix
filippov [Wed, 13 Mar 2024 23:58:32 +0000 (23:58 +0000)]
Merge branch 'feature_filippov_20240313_docker_fix' into 'develop'
docker fix
See merge request gitlab-instance-
71cad6d6/yii_erp24!32
Aleksey Filippov [Wed, 13 Mar 2024 16:11:34 +0000 (19:11 +0300)]
docker fix
filippov [Tue, 12 Mar 2024 21:57:52 +0000 (21:57 +0000)]
Merge branch 'feature_smirnov_2024_03_12_page_statistics_view' into 'develop'
add page statistics view
See merge request gitlab-instance-
71cad6d6/yii_erp24!31
filippov [Tue, 12 Mar 2024 21:14:42 +0000 (21:14 +0000)]
Merge branch 'bugfix_smirnov_2024_03_12_if_session_is_missing' into 'develop'
if session is missing
See merge request gitlab-instance-
71cad6d6/yii_erp24!30
filippov [Tue, 12 Mar 2024 19:52:18 +0000 (19:52 +0000)]
Merge branch 'feature_smirnov_2024_03_12_page_request_statistics' into 'develop'
page stats
See merge request gitlab-instance-
71cad6d6/yii_erp24!29
filippov [Tue, 12 Mar 2024 17:14:40 +0000 (17:14 +0000)]
Merge branch 'bugfix_smirnov_2024_03_12_fix_request_time' into 'develop'
fix request start time
See merge request gitlab-instance-
71cad6d6/yii_erp24!28
Alexander Smirnov [Tue, 12 Mar 2024 14:10:31 +0000 (17:10 +0300)]
add page statistics view
Alexander Smirnov [Tue, 12 Mar 2024 13:28:18 +0000 (16:28 +0300)]
if session is missing no record in page_statistics
Alexander Smirnov [Tue, 12 Mar 2024 13:16:03 +0000 (16:16 +0300)]
if session is missing
Alexander Smirnov [Tue, 12 Mar 2024 11:49:14 +0000 (14:49 +0300)]
page stats
Alexander Smirnov [Tue, 12 Mar 2024 09:18:10 +0000 (12:18 +0300)]
fix request start time
filippov [Mon, 11 Mar 2024 23:09:00 +0000 (23:09 +0000)]
Merge branch 'feature_smirnov_2024_03_11_fix_menu' into 'develop'
fix menu
See merge request gitlab-instance-
71cad6d6/yii_erp24!27
filippov [Mon, 11 Mar 2024 22:10:50 +0000 (22:10 +0000)]
Merge branch 'feature_smirnov_2024_03_11_postgresql_db_php' into 'develop'
add pgsql config to db.php
See merge request gitlab-instance-
71cad6d6/yii_erp24!26
filippov [Mon, 11 Mar 2024 21:02:55 +0000 (21:02 +0000)]
Merge branch 'feature_smirnov_2024_03_05_shipment_add' into 'develop'
add /shipment/add
See merge request gitlab-instance-
71cad6d6/yii_erp24!25
Alexander Smirnov [Mon, 11 Mar 2024 15:00:22 +0000 (18:00 +0300)]
fix menu
Alexander Smirnov [Mon, 11 Mar 2024 13:24:35 +0000 (16:24 +0300)]
add pgsql config to db.php
Alexander Smirnov [Tue, 5 Mar 2024 16:08:30 +0000 (19:08 +0300)]
add /shipment/add
filippov [Wed, 28 Feb 2024 18:19:49 +0000 (18:19 +0000)]
Merge branch 'feature_smirnov_2024_02_28_chdir_include' into 'develop'
new way of including old project files
See merge request gitlab-instance-
71cad6d6/yii_erp24!24
Alexander Smirnov [Wed, 28 Feb 2024 08:59:13 +0000 (11:59 +0300)]
<? to <?php
Alexander Smirnov [Wed, 28 Feb 2024 08:55:57 +0000 (11:55 +0300)]
<? to <?php
Alexander Smirnov [Wed, 28 Feb 2024 08:41:33 +0000 (11:41 +0300)]
new way of including old project files
filippov [Thu, 22 Feb 2024 19:22:20 +0000 (19:22 +0000)]
Merge branch 'feature_filippov_20240222_change_url_action' into 'develop'
add change_url_action
See merge request gitlab-instance-
71cad6d6/yii_erp24!23
filippov [Thu, 22 Feb 2024 18:12:58 +0000 (18:12 +0000)]
Merge branch 'feature_filippov_20240222_short_tag_fix' into 'develop'
short tag fix
See merge request gitlab-instance-
71cad6d6/yii_erp24!22
Aleksey Filippov [Thu, 22 Feb 2024 11:34:55 +0000 (14:34 +0300)]
short tag fix
Aleksey Filippov [Thu, 22 Feb 2024 10:26:00 +0000 (13:26 +0300)]
short tag fix
filippov [Wed, 21 Feb 2024 19:03:30 +0000 (19:03 +0000)]
Merge branch 'feature_smirnov_2024_02_21_menu_loading_without_api2' into 'develop'
menu loading without api2
See merge request gitlab-instance-
71cad6d6/yii_erp24!21
filippov [Wed, 21 Feb 2024 19:02:48 +0000 (19:02 +0000)]
Merge branch 'feature_smirnov_2024_01_10_pure_php_moving_to_yii_with_ar' into 'develop'
Feature smirnov 2024 01 10 pure php moving to yii with ar
See merge request gitlab-instance-
71cad6d6/yii_erp24!20
Alexander Smirnov [Wed, 21 Feb 2024 11:11:59 +0000 (14:11 +0300)]
menu loading without api2
Alexander Smirnov [Fri, 16 Feb 2024 10:10:14 +0000 (13:10 +0300)]
replace pdo with ar in shipment/fields-data2
filippov [Fri, 9 Feb 2024 21:26:06 +0000 (21:26 +0000)]
Merge branch 'feature_chirkov_migration_to_pgsql' into 'develop'
migration to pgsql
See merge request gitlab-instance-
71cad6d6/yii_erp24!19
kirostumm [Fri, 9 Feb 2024 11:08:03 +0000 (14:08 +0300)]
migrate
kirostumm [Fri, 9 Feb 2024 11:01:19 +0000 (14:01 +0300)]
migrate
kirostumm [Fri, 9 Feb 2024 10:56:58 +0000 (13:56 +0300)]
migrate
Alexander Smirnov [Mon, 5 Feb 2024 14:56:11 +0000 (17:56 +0300)]
replace pdo with ar in shipment/division, fields
Alexander Smirnov [Thu, 25 Jan 2024 08:34:15 +0000 (11:34 +0300)]
replace pdo with ar in store-polnogram-logi
Alexander Smirnov [Thu, 25 Jan 2024 08:05:49 +0000 (11:05 +0300)]
replace pdo with ar in polnogram
Alexander Smirnov [Tue, 23 Jan 2024 08:42:55 +0000 (11:42 +0300)]
replace pdo with ar in uni, uni2
filippov [Thu, 11 Jan 2024 20:14:21 +0000 (20:14 +0000)]
Merge branch 'feature_smirnov_2024_01_10_pure_php_moving_to_yii_pravki' into 'develop'
Feature smirnov 2024 01 10 pure php moving to yii pravki
See merge request gitlab-instance-
71cad6d6/yii_erp24!18
filippov [Wed, 10 Jan 2024 16:50:19 +0000 (16:50 +0000)]
Merge branch 'feature_chirkov_module_orders_ajax_create_check_json' into 'develop'
api orders update
See merge request gitlab-instance-
71cad6d6/yii_erp24!17
Alexander Smirnov [Wed, 10 Jan 2024 16:43:26 +0000 (19:43 +0300)]
add /bonus/write_off during moving pure php to yii
filippov [Wed, 10 Jan 2024 16:40:30 +0000 (16:40 +0000)]
Merge branch 'feature_chirkov_modul_api' into 'develop'
api integrations update
See merge request gitlab-instance-
71cad6d6/yii_erp24!16
Alexander Smirnov [Wed, 10 Jan 2024 15:54:54 +0000 (18:54 +0300)]
add /user-events/edit during moving pure php to yii
Alexander Smirnov [Wed, 10 Jan 2024 15:24:17 +0000 (18:24 +0300)]
fixes shipment during moving pure php to yii
kirostumm [Wed, 10 Jan 2024 08:56:23 +0000 (11:56 +0300)]
api orders update
kirostumm [Wed, 10 Jan 2024 08:50:11 +0000 (11:50 +0300)]
api orders update
kirostumm [Wed, 10 Jan 2024 07:05:47 +0000 (10:05 +0300)]
api integrations update
filippov [Fri, 29 Dec 2023 18:52:56 +0000 (18:52 +0000)]
Merge branch 'feature_smirnov_2023_12_29_move_cron_1c_to_yii' into 'develop'
add cron/1c during moving pure php to yii
See merge request gitlab-instance-
71cad6d6/yii_erp24!15
filippov [Fri, 29 Dec 2023 17:32:43 +0000 (17:32 +0000)]
Merge branch 'bugfix_smirnov_amo_sync_crm' into 'develop'
add missing file amo_sync_crm.php
See merge request gitlab-instance-
71cad6d6/yii_erp24!14
filippov [Fri, 29 Dec 2023 16:53:11 +0000 (16:53 +0000)]
Merge branch 'feature_filippov_20231208_edit_yii_project' into 'develop'
Feature filippov
20231208 edit yii project
See merge request gitlab-instance-
71cad6d6/yii_erp24!13
Alexander Smirnov [Fri, 29 Dec 2023 10:20:58 +0000 (13:20 +0300)]
add cron/1c during moving pure php to yii
Alexander Smirnov [Fri, 29 Dec 2023 09:40:32 +0000 (12:40 +0300)]
add missing file amo_sync_crm.php
Aleksey Filippov [Fri, 29 Dec 2023 09:03:10 +0000 (12:03 +0300)]
Merge branch 'develop' into feature_filippov_20231208_edit_yii_project
# Conflicts:
# erp24/models/LoginForm.php
Aleksey Filippov [Fri, 29 Dec 2023 09:02:01 +0000 (12:02 +0300)]
правки
Aleksey Filippov [Fri, 29 Dec 2023 08:36:45 +0000 (11:36 +0300)]
правки
filippov [Thu, 28 Dec 2023 22:55:09 +0000 (22:55 +0000)]
Merge branch 'feature_smirnov_2023_12_26_move_api1_to_yii' into 'develop'
Feature smirnov 2023 12 26 move api1 to yii
See merge request gitlab-instance-
71cad6d6/yii_erp24!12
filippov [Thu, 28 Dec 2023 22:53:26 +0000 (22:53 +0000)]
Merge branch 'feature_chirkov_module_orders' into 'develop'
Модуль orders
See merge request gitlab-instance-
71cad6d6/yii_erp24!11
Alexander Smirnov [Thu, 28 Dec 2023 15:02:25 +0000 (18:02 +0300)]
add cron/import-amo-in-crm during moving api1 to yii
kirostumm [Thu, 28 Dec 2023 12:28:15 +0000 (15:28 +0300)]
amo amo amo amo
Alexander Smirnov [Thu, 28 Dec 2023 08:52:00 +0000 (11:52 +0300)]
add cron/1c-check-1day during moving api1 to yii
Alexander Smirnov [Thu, 28 Dec 2023 08:44:19 +0000 (11:44 +0300)]
add cron/bonus-users-sale-update during moving api1 to yii
Alexander Smirnov [Wed, 27 Dec 2023 19:05:30 +0000 (22:05 +0300)]
add cron/cloudpayments-region during moving api1 to yii
Alexander Smirnov [Wed, 27 Dec 2023 18:28:11 +0000 (21:28 +0300)]
add WIP cron/export-catalog during moving api1 to yii
Alexander Smirnov [Wed, 27 Dec 2023 15:18:33 +0000 (18:18 +0300)]
add cron/balances-history during moving api1 to yii
kirostumm [Wed, 27 Dec 2023 14:43:25 +0000 (17:43 +0300)]
Страница с заказами
Alexander Smirnov [Wed, 27 Dec 2023 14:13:35 +0000 (17:13 +0300)]
add cron/custom-1c-cron during moving api1 to yii
Alexander Smirnov [Wed, 27 Dec 2023 14:06:53 +0000 (17:06 +0300)]
add cron/1c-sellers during moving api1 to yii
Alexander Smirnov [Wed, 27 Dec 2023 13:55:39 +0000 (16:55 +0300)]
add cron/domru-cams during moving api1 to yii
Alexander Smirnov [Wed, 27 Dec 2023 12:57:12 +0000 (15:57 +0300)]
add cron/cloudpayments during moving api1 to yii
Alexander Smirnov [Wed, 27 Dec 2023 12:49:47 +0000 (15:49 +0300)]
add cron/1c and cron/amo142 during moving api1 to yii
kirostumm [Tue, 26 Dec 2023 12:13:03 +0000 (15:13 +0300)]
Страница с заказами
filippov [Fri, 22 Dec 2023 16:10:24 +0000 (16:10 +0000)]
Merge branch 'feature_smirnov_2023_12_21_bonus_stat' into 'develop'
Feature smirnov 2023 12 21 bonus stat
See merge request gitlab-instance-
71cad6d6/yii_erp24!10
Alexander Smirnov [Thu, 21 Dec 2023 13:36:13 +0000 (16:36 +0300)]
add write-offs/index and comments during moving from pure php to yii
Alexander Smirnov [Thu, 21 Dec 2023 10:48:11 +0000 (13:48 +0300)]
add bonus/users during moving from pure php to yii
projects / erp24_rep / yii-erp24 / .git / log