]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
Aleksey Filippov [Tue, 4 Jun 2024 09:26:31 +0000 (09:26 +0000)]
Merge branch 'feature_filippov_20240604_add_gitignore_api2_runtime' into 'develop'
add gitignore
See merge request gitlab-instance/yii-erp24!168
Aleksey Filippov [Tue, 4 Jun 2024 09:21:12 +0000 (12:21 +0300)]
add gitignore
Aleksey Filippov [Tue, 4 Jun 2024 09:09:18 +0000 (09:09 +0000)]
Merge branch 'feature_filippov_20240604_fix_get_products_1c_for_write_offs_doc' into 'develop'
Правки по выводу списка товаров в создании документов списания
See merge request gitlab-instance/yii-erp24!167
Aleksey Filippov [Tue, 4 Jun 2024 09:08:14 +0000 (12:08 +0300)]
Правки по выводу списка товаров в создании документов списания
Aleksey Filippov [Mon, 3 Jun 2024 11:47:15 +0000 (11:47 +0000)]
Merge branch 'bug_smirnov_2024_06_03_catalog_update_limit_pgsql' into 'develop'
fix bug
See merge request gitlab-instance/yii-erp24!166
Alexander Smirnov [Mon, 3 Jun 2024 11:41:37 +0000 (14:41 +0300)]
fix part 002
Alexander Smirnov [Mon, 3 Jun 2024 11:00:33 +0000 (14:00 +0300)]
fix bug
Aleksey Filippov [Fri, 31 May 2024 13:02:48 +0000 (13:02 +0000)]
Merge branch 'feature_smirnov_erp-40_delete_employee_on_shift_after_30_minutes' into 'develop'
del old employee on shift in initial and rejected state
See merge request gitlab-instance/yii-erp24!162
Aleksey Filippov [Fri, 31 May 2024 12:36:26 +0000 (12:36 +0000)]
Merge branch 'bug_smirnov_erp-35_empty_parameter_part4' into 'develop'
fix part 004
See merge request gitlab-instance/yii-erp24!165
Alexander Smirnov [Fri, 31 May 2024 09:53:23 +0000 (12:53 +0300)]
fix part 006
Alexander Smirnov [Fri, 31 May 2024 09:41:40 +0000 (12:41 +0300)]
fix part005
Alexander Smirnov [Fri, 31 May 2024 09:33:09 +0000 (12:33 +0300)]
fix part 004
Aleksey Filippov [Fri, 31 May 2024 09:24:39 +0000 (09:24 +0000)]
Merge branch 'feature_smirnov_erp-23_add_write_offs_type' into 'develop'
add new write_offs_type
See merge request gitlab-instance/yii-erp24!157
Aleksey Filippov [Fri, 31 May 2024 09:13:36 +0000 (09:13 +0000)]
Merge branch 'bug_smirnov_erp-35_default_parameter_before_required_part3' into 'develop'
fix
See merge request gitlab-instance/yii-erp24!159
Aleksey Filippov [Fri, 31 May 2024 05:19:23 +0000 (05:19 +0000)]
Merge branch 'bug_smirnov_2024_05_30_expired-bonuses_fix2' into 'develop'
fix for nullable date_start
See merge request gitlab-instance/yii-erp24!163
Aleksey Filippov [Thu, 30 May 2024 18:29:55 +0000 (18:29 +0000)]
Merge branch 'feature_filippov_20240530_edit_add_bonus_logic' into 'develop'
Перенос проверки кода от клиента в блок списания бонусов
See merge request gitlab-instance/yii-erp24!164
Aleksey Filippov [Thu, 30 May 2024 18:28:58 +0000 (21:28 +0300)]
Перенос проверки кода от клиента в блок списания бонусов
Alexander Smirnov [Thu, 30 May 2024 16:04:43 +0000 (19:04 +0300)]
fix for nullable date_start
Alexander Smirnov [Thu, 30 May 2024 15:58:18 +0000 (18:58 +0300)]
del old employee on shift in initial and rejected state
Aleksey Filippov [Thu, 30 May 2024 14:31:46 +0000 (14:31 +0000)]
Merge branch 'bug_smirnov_2024_05_30_expired-bonuses_fix' into 'develop'
Bug smirnov 2024 05 30 expired bonuses fix
See merge request gitlab-instance/yii-erp24!161
Alexander Smirnov [Thu, 30 May 2024 14:17:35 +0000 (17:17 +0300)]
fix
Alexander Smirnov [Wed, 29 May 2024 16:04:38 +0000 (19:04 +0300)]
fix
Aleksey Filippov [Wed, 29 May 2024 14:58:35 +0000 (14:58 +0000)]
Merge branch 'bug_smirnov_erp-35_default_parameter_before_required_part2' into 'develop'
fix
See merge request gitlab-instance/yii-erp24!158
Alexander Smirnov [Wed, 29 May 2024 14:56:51 +0000 (17:56 +0300)]
fix
Alexander Smirnov [Wed, 29 May 2024 13:24:31 +0000 (16:24 +0300)]
fix comment
Aleksey Filippov [Wed, 29 May 2024 13:16:13 +0000 (13:16 +0000)]
Merge branch 'bug_smirnov_erp-35_default_parameter_before_required' into 'develop'
fix bug
See merge request gitlab-instance/yii-erp24!155
Alexander Smirnov [Wed, 29 May 2024 12:49:44 +0000 (15:49 +0300)]
add new write_offs_type
Alexander Smirnov [Tue, 28 May 2024 19:31:42 +0000 (22:31 +0300)]
fix bug
Aleksey Filippov [Tue, 28 May 2024 19:05:16 +0000 (19:05 +0000)]
Merge branch 'bug_smirnov_erp-35_check_if_error_text_present' into 'develop'
fix if errorText present
See merge request gitlab-instance/yii-erp24!154
Alexander Smirnov [Tue, 28 May 2024 18:37:23 +0000 (21:37 +0300)]
fix if errorText present
Aleksey Filippov [Mon, 27 May 2024 14:47:19 +0000 (14:47 +0000)]
Merge branch 'bug_smirnov_erp-12_new_bonus_count_fix' into 'develop'
fix newBonusCount and repeatBonusCount
See merge request gitlab-instance/yii-erp24!153
Alexander Smirnov [Mon, 27 May 2024 14:24:26 +0000 (17:24 +0300)]
fix newBonusCount and repeatBonusCount
Aleksey Filippov [Mon, 27 May 2024 11:11:35 +0000 (11:11 +0000)]
Merge branch 'bug_smirnov_erp-12_phone_equals_0' into 'develop'
fix bonusUserCount
See merge request gitlab-instance/yii-erp24!152
Aleksey Filippov [Fri, 24 May 2024 10:41:01 +0000 (10:41 +0000)]
Merge branch 'bug_smirnov_2024_05_24_city_store_index' into 'develop'
return city-store/index.js from old project
See merge request gitlab-instance/yii-erp24!151
Alexander Smirnov [Fri, 24 May 2024 10:33:02 +0000 (13:33 +0300)]
return city-store/index.js from old project
Alexander Smirnov [Fri, 24 May 2024 09:32:38 +0000 (12:32 +0300)]
fix bonusUserCount
Aleksey Filippov [Thu, 23 May 2024 12:13:57 +0000 (12:13 +0000)]
Merge branch 'bugfix_smirnov_2024_05_23_erp_24_no_products_in_provider' into 'develop'
fix part 022 no products in provider
See merge request gitlab-instance/yii-erp24!150
Alexander Smirnov [Thu, 23 May 2024 12:11:37 +0000 (15:11 +0300)]
fix part 022 add message about lack of products
Alexander Smirnov [Thu, 23 May 2024 11:50:23 +0000 (14:50 +0300)]
fix part 022 no products in provider
Aleksey Filippov [Thu, 23 May 2024 11:08:01 +0000 (11:08 +0000)]
Merge branch 'bugfix_smirnov_2024_05_20_shipment_fields_calculation_data_fix' into 'develop'
fix part 001
See merge request gitlab-instance/yii-erp24!145
Alexander Smirnov [Thu, 23 May 2024 11:03:19 +0000 (14:03 +0300)]
fix part 021 remove debug info
Aleksey Filippov [Thu, 23 May 2024 06:07:06 +0000 (06:07 +0000)]
Merge branch 'feature_20240523_gitignore_add' into 'develop'
правка добавил папку json в gitignore
See merge request gitlab-instance/yii-erp24!148
Aleksey Filippov [Thu, 23 May 2024 06:06:31 +0000 (09:06 +0300)]
правка добавил папку json в gitignore
Alexander Smirnov [Wed, 22 May 2024 14:16:40 +0000 (17:16 +0300)]
fix part 021
Alexander Smirnov [Wed, 22 May 2024 13:07:03 +0000 (16:07 +0300)]
fix part 020
Aleksey Filippov [Wed, 22 May 2024 12:43:39 +0000 (12:43 +0000)]
Merge branch 'feature_smirnov_2024_05_22_disable_1000per5000_script' into 'develop'
disable 1000per5000 script
See merge request gitlab-instance/yii-erp24!147
Alexander Smirnov [Wed, 22 May 2024 12:14:46 +0000 (15:14 +0300)]
disable 1000per5000 script
Alexander Smirnov [Wed, 22 May 2024 10:47:31 +0000 (13:47 +0300)]
fix part 019
Aleksey Filippov [Wed, 22 May 2024 07:16:18 +0000 (07:16 +0000)]
Merge branch 'feature_filipppov_20240522_domru_cams_upload_fix' into 'develop'
правка по загрузке данных о посетителях с камер
See merge request gitlab-instance/yii-erp24!146
Aleksey Filippov [Wed, 22 May 2024 07:15:11 +0000 (10:15 +0300)]
правка по загрузке данных о посетителях с камер
Alexander Smirnov [Tue, 21 May 2024 19:50:35 +0000 (22:50 +0300)]
fix part 018
Alexander Smirnov [Tue, 21 May 2024 19:35:48 +0000 (22:35 +0300)]
fix part 017
Alexander Smirnov [Tue, 21 May 2024 19:12:31 +0000 (22:12 +0300)]
fix part 016
Alexander Smirnov [Tue, 21 May 2024 18:26:07 +0000 (21:26 +0300)]
fix part 015
Alexander Smirnov [Tue, 21 May 2024 18:12:31 +0000 (21:12 +0300)]
fix part 014
Alexander Smirnov [Tue, 21 May 2024 11:40:59 +0000 (14:40 +0300)]
fix part 013 remove misleading if conditions
Alexander Smirnov [Tue, 21 May 2024 11:37:42 +0000 (14:37 +0300)]
fix part 012 fix default
Alexander Smirnov [Tue, 21 May 2024 11:34:39 +0000 (14:34 +0300)]
fix part 011 ad stacktrace
Alexander Smirnov [Tue, 21 May 2024 11:26:36 +0000 (14:26 +0300)]
fix part 011 echo fieldsRows and data_up
Alexander Smirnov [Tue, 21 May 2024 08:00:42 +0000 (11:00 +0300)]
fix part 010
Alexander Smirnov [Mon, 20 May 2024 15:02:18 +0000 (18:02 +0300)]
fix part 009
Alexander Smirnov [Mon, 20 May 2024 14:58:29 +0000 (17:58 +0300)]
fix part 008
Alexander Smirnov [Mon, 20 May 2024 14:54:59 +0000 (17:54 +0300)]
fix part 007
Alexander Smirnov [Mon, 20 May 2024 14:50:20 +0000 (17:50 +0300)]
fix part 006
Alexander Smirnov [Mon, 20 May 2024 14:45:56 +0000 (17:45 +0300)]
fix part 005
Alexander Smirnov [Mon, 20 May 2024 14:42:26 +0000 (17:42 +0300)]
fix part 004
Alexander Smirnov [Mon, 20 May 2024 14:39:12 +0000 (17:39 +0300)]
fix part 003
Alexander Smirnov [Mon, 20 May 2024 14:32:51 +0000 (17:32 +0300)]
fix part 002
Alexander Smirnov [Mon, 20 May 2024 14:21:51 +0000 (17:21 +0300)]
fix part 001
Aleksey Filippov [Mon, 20 May 2024 11:13:00 +0000 (11:13 +0000)]
Merge branch 'bugfix_smirnov_2024_05_20_shipment_fields_fix' into 'develop'
Bugfix smirnov 2024 05 20 shipment fields fix
See merge request gitlab-instance/yii-erp24!144
Alexander Smirnov [Mon, 20 May 2024 09:52:46 +0000 (12:52 +0300)]
fix
Aleksey Filippov [Mon, 20 May 2024 07:43:00 +0000 (07:43 +0000)]
Merge branch 'bugfix_smirnov_2024_05_16_1000_per_5000_fix' into 'develop'
Bugfix smirnov 2024 05 16 1000 per 5000 fix
See merge request gitlab-instance/yii-erp24!143
Alexander Smirnov [Sun, 19 May 2024 15:28:25 +0000 (18:28 +0300)]
fix ajax-update-step
Alexander Smirnov [Sat, 18 May 2024 14:47:53 +0000 (17:47 +0300)]
fix
Aleksey Filippov [Fri, 17 May 2024 15:32:16 +0000 (15:32 +0000)]
Merge branch 'bugfix_smirnov_2024_05_17_api3_search_item_item_site_fix' into 'develop'
fix
See merge request gitlab-instance/yii-erp24!142
Alexander Smirnov [Fri, 17 May 2024 15:22:30 +0000 (18:22 +0300)]
fix
Aleksey Filippov [Fri, 17 May 2024 09:45:05 +0000 (09:45 +0000)]
Merge branch 'bugfix_smirnov_2024_05_17_shipment_calculation_data_function_shipment_fix' into 'develop'
fix
See merge request gitlab-instance/yii-erp24!141
Alexander Smirnov [Fri, 17 May 2024 09:43:06 +0000 (12:43 +0300)]
fix
Aleksey Filippov [Fri, 17 May 2024 09:32:13 +0000 (09:32 +0000)]
Merge branch 'bugfix_smirnov_2024_05_17_shipment_calculation_data_fix' into 'develop'
fix supplier calculation data
See merge request gitlab-instance/yii-erp24!140
Alexander Smirnov [Fri, 17 May 2024 09:27:47 +0000 (12:27 +0300)]
fix supplier calculation data
Aleksey Filippov [Fri, 17 May 2024 08:00:04 +0000 (08:00 +0000)]
Merge branch 'bugfix_smirnov_2024_05_16_shipment_calculate_data' into 'develop'
fix data calculation among fields
See merge request gitlab-instance/yii-erp24!139
Aleksey Filippov [Fri, 17 May 2024 07:59:42 +0000 (07:59 +0000)]
Merge branch 'bugfix_smirnov_2024_05_16_newsletters_script' into 'develop'
fix newsletters
See merge request gitlab-instance/yii-erp24!138
Alexander Smirnov [Fri, 17 May 2024 07:53:16 +0000 (10:53 +0300)]
fix sales sql query for pgsql
Alexander Smirnov [Thu, 16 May 2024 17:59:59 +0000 (20:59 +0300)]
fix data calculation among fields
Alexander Smirnov [Thu, 16 May 2024 11:46:02 +0000 (14:46 +0300)]
1000 per every 5000 in check
Alexander Smirnov [Thu, 16 May 2024 10:54:41 +0000 (13:54 +0300)]
fix sales
Alexander Smirnov [Thu, 16 May 2024 10:16:01 +0000 (13:16 +0300)]
fix
Alexander Smirnov [Thu, 16 May 2024 09:52:38 +0000 (12:52 +0300)]
fix newsletters users join
Alexander Smirnov [Thu, 16 May 2024 09:35:43 +0000 (12:35 +0300)]
fix newsletters
Aleksey Filippov [Wed, 15 May 2024 18:06:29 +0000 (18:06 +0000)]
Merge branch 'bug_filippov_ERP-19_add_bonus_fix' into 'develop'
правка по добавлению вонусов через api и логирование
See merge request gitlab-instance/yii-erp24!137
Aleksey Filippov [Wed, 15 May 2024 18:05:17 +0000 (18:05 +0000)]
Merge branch 'feature_smirnov_2024_05_15_api2_api3_bonus_sale_date_first_sale' into 'develop'
Feature smirnov 2024 05 15 api2 api3 bonus sale date first sale
See merge request gitlab-instance/yii-erp24!136
Alexander Smirnov [Wed, 15 May 2024 18:04:23 +0000 (21:04 +0300)]
fix
Aleksey Filippov [Wed, 15 May 2024 17:43:52 +0000 (20:43 +0300)]
правка по добавлению вонусов через api и логирование
Alexander Smirnov [Wed, 15 May 2024 16:23:24 +0000 (19:23 +0300)]
fix report show(-weeks) using date_first_sale
Alexander Smirnov [Wed, 15 May 2024 16:16:21 +0000 (19:16 +0300)]
remove operation_sale where both should be accepted
Alexander Smirnov [Wed, 15 May 2024 16:12:28 +0000 (19:12 +0300)]
set date_first_sale in apis
Alexander Smirnov [Wed, 15 May 2024 16:11:08 +0000 (19:11 +0300)]
migrate date_first_sale
Aleksey Filippov [Tue, 14 May 2024 09:43:45 +0000 (09:43 +0000)]
Merge branch 'feature_filippov_ERP-14_fix_save_status_employee_on_shift' into 'develop'
правка по изменению статуса заявки
See merge request gitlab-instance/yii-erp24!135
Aleksey Filippov [Tue, 14 May 2024 09:38:19 +0000 (12:38 +0300)]
правка по изменению статуса заявки
Aleksey Filippov [Mon, 13 May 2024 20:20:49 +0000 (20:20 +0000)]
Merge branch 'feature_filippov_20240513_logo_fix' into 'develop'
логотип картинка fix 404
See merge request gitlab-instance/yii-erp24!134
projects / erp24_rep / yii-erp24 / .git / log