Merge pull request #449 release-v4.8.0 into master

2024-12-19 09:24:17 +09:00 · 2024-12-19 09:24:17 +09:00 · 6a28baf983
commit 6a28baf983
parent 2b2077cbfc 4534922103
35 changed files with 186 additions and 181 deletions
--- a/s3/config/SAP/monthly_check_day_list.config
+++ b/s3/config/SAP/monthly_check_day_list.config
@ -1,12 +1,12 @@
-2024/01/03
+2025/01/03
-2024/02/03
+2025/02/03
-2024/03/03
+2025/03/03
-2024/04/03
+2025/04/03
-2024/05/03
+2025/05/03
-2024/06/03
+2025/06/03
-2024/07/03
+2025/07/03
-2024/08/03
+2025/08/03
-2024/09/03
+2025/09/03
-2024/10/03
+2025/10/03
-2024/11/03
+2025/11/03
-2024/12/03
+2025/12/03
--- a/s3/config/crm/object_info/crm_object_list_diff.json
+++ b/s3/config/crm/object_info/crm_object_list_diff.json
@ -415,7 +415,9 @@
                "keywords__c",
                "original_material_approved_in_veritas__c",
                "trade_team__c",
-                "Publish_Method_vod__c"
+                "Publish_Method_vod__c",
                "MSJ_Key_Presentation__c",
                "MSJ_CLM_Report_Name__c"
            ],
            "is_skip": false,
            "is_update_last_fetch_datetime": true
--- a/s3/config/jskult/calendar/jskult_holiday_list.txt
+++ b/s3/config/jskult/calendar/jskult_holiday_list.txt
@ -1,125 +1,3 @@
 2023/12/02
 2023/12/03
 2023/12/09
 2023/12/10
 2023/12/16
 2023/12/17
 2023/12/23
 2023/12/24
 2023/12/29
 2023/12/30
 2023/12/31
 2024/01/01
 2024/01/02
 2024/01/03
 2024/01/06
 2024/01/07
 2024/01/08
 2024/01/13
 2024/01/14
 2024/01/20
 2024/01/21
 2024/01/27
 2024/01/28
 2024/02/03
 2024/02/04
 2024/02/10
 2024/02/11
 2024/02/12
 2024/02/17
 2024/02/18
 2024/02/23
 2024/02/24
 2024/02/25
 2024/03/02
 2024/03/03
 2024/03/09
 2024/03/10
 2024/03/16
 2024/03/17
 2024/03/20
 2024/03/23
 2024/03/24
 2024/03/30
 2024/03/31
 2024/04/06
 2024/04/07
 2024/04/13
 2024/04/14
 2024/04/20
 2024/04/21
 2024/04/27
 2024/04/28
 2024/04/29
 2024/05/03
 2024/05/04
 2024/05/05
 2024/05/06
 2024/05/11
 2024/05/12
 2024/05/18
 2024/05/19
 2024/05/25
 2024/05/26
 2024/06/01
 2024/06/02
 2024/06/08
 2024/06/09
 2024/06/15
 2024/06/16
 2024/06/22
 2024/06/23
 2024/06/29
 2024/06/30
 2024/07/06
 2024/07/07
 2024/07/13
 2024/07/14
 2024/07/15
 2024/07/20
 2024/07/21
 2024/07/27
 2024/07/28
 2024/08/03
 2024/08/04
 2024/08/10
 2024/08/11
 2024/08/12
 2024/08/17
 2024/08/18
 2024/08/24
 2024/08/25
 2024/08/31
 2024/09/01
 2024/09/07
 2024/09/08
 2024/09/14
 2024/09/15
 2024/09/16
 2024/09/21
 2024/09/22
 2024/09/23
 2024/09/28
 2024/09/29
 2024/10/05
 2024/10/06
 2024/10/12
 2024/10/13
 2024/10/14
 2024/10/19
 2024/10/20
 2024/10/26
 2024/10/27
 2024/11/02
 2024/11/03
 2024/11/04
 2024/11/09
 2024/11/10
 2024/11/16
 2024/11/17
 2024/11/23
 2024/11/24
 2024/11/30
 2024/12/01
 2024/12/07
 2024/12/08
@ -131,3 +9,127 @@
 2024/12/29
 2024/12/30
 2024/12/31
 2025/01/01
 2025/01/02
 2025/01/03
 2025/01/04
 2025/01/05
 2025/01/11
 2025/01/12
 2025/01/13
 2025/01/18
 2025/01/19
 2025/01/25
 2025/01/26
 2025/02/01
 2025/02/02
 2025/02/08
 2025/02/09
 2025/02/11
 2025/02/15
 2025/02/16
 2025/02/22
 2025/02/23
 2025/02/24
 2025/03/01
 2025/03/02
 2025/03/08
 2025/03/09
 2025/03/15
 2025/03/16
 2025/03/20
 2025/03/22
 2025/03/23
 2025/03/29
 2025/03/30
 2025/04/05
 2025/04/06
 2025/04/12
 2025/04/13
 2025/04/19
 2025/04/20
 2025/04/26
 2025/04/27
 2025/04/29
 2025/05/03
 2025/05/04
 2025/05/05
 2025/05/06
 2025/05/10
 2025/05/11
 2025/05/17
 2025/05/18
 2025/05/24
 2025/05/25
 2025/05/31
 2025/06/01
 2025/06/07
 2025/06/08
 2025/06/14
 2025/06/15
 2025/06/21
 2025/06/22
 2025/06/28
 2025/06/29
 2025/07/05
 2025/07/06
 2025/07/12
 2025/07/13
 2025/07/19
 2025/07/20
 2025/07/21
 2025/07/26
 2025/07/27
 2025/08/02
 2025/08/03
 2025/08/09
 2025/08/10
 2025/08/11
 2025/08/16
 2025/08/17
 2025/08/23
 2025/08/24
 2025/08/30
 2025/08/31
 2025/09/06
 2025/09/07
 2025/09/13
 2025/09/14
 2025/09/15
 2025/09/20
 2025/09/21
 2025/09/23
 2025/09/27
 2025/09/28
 2025/10/04
 2025/10/05
 2025/10/11
 2025/10/12
 2025/10/13
 2025/10/18
 2025/10/19
 2025/10/25
 2025/10/26
 2025/11/01
 2025/11/02
 2025/11/03
 2025/11/08
 2025/11/09
 2025/11/15
 2025/11/16
 2025/11/22
 2025/11/23
 2025/11/24
 2025/11/29
 2025/11/30
 2025/12/06
 2025/12/07
 2025/12/13
 2025/12/14
 2025/12/20
 2025/12/21
 2025/12/27
 2025/12/28
 2025/12/29
 2025/12/30
 2025/12/31
--- a/s3/config/jskult/calendar/jskult_wholesaler_stock_input_day_list.txt
+++ b/s3/config/jskult/calendar/jskult_wholesaler_stock_input_day_list.txt
@ -1,13 +1,13 @@
 2023/12/14
 2024/01/18
 2024/02/15
 2024/03/14
 2024/04/12
 2024/05/16
 2024/06/14
 2024/07/12
 2024/08/15
 2024/09/13
 2024/10/15
 2024/11/15
 2024/12/13
 2025/01/20
 2025/02/17
 2025/03/14
 2025/04/14
 2025/05/16
 2025/06/13
 2025/07/14
 2025/08/15
 2025/09/12
 2025/10/15
 2025/11/17
 2025/12/12
--- a/s3/data/crm/settings/CRM_Clm_Presentation_vod__c.txt
+++ b/s3/data/crm/settings/CRM_Clm_Presentation_vod__c.txt
@ -4,10 +4,10 @@ utf-8
 "
 CRLF
 1
-47
+49
-Id,OwnerId,IsDeleted,Name,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Mobile_ID_vod__c,Presentation_Id_vod__c,Product_vod__c,Default_Presentation_vod__c,Training_vod__c,ParentId_vod__c,Hidden_vod__c,Type_vod__c,Approved_vod__c,Copied_From_vod__c,Copy_Date_vod__c,Survey_vod__c,Original_Record_ID_vod__c,Directory_vod__c,End_Date_vod__c,Start_Date_vod__c,Status_vod__c,VExternal_Id_vod__c,Vault_DNS_vod__c,Vault_Doc_Id_vod__c,Vault_External_Id_vod__c,Vault_GUID_vod__c,Vault_Last_Modified_Date_Time_vod__c,Version_vod__c,Enable_Survey_Overlay_vod__c,Description_vod__c,Keywords_vod__c,Content_Channel_vod__c,business_function__c,ewizard_link__c,keywords__c,original_material_approved_in_veritas__c,trade_team__c,Publish_Method_vod__c
+Id,OwnerId,IsDeleted,Name,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Mobile_ID_vod__c,Presentation_Id_vod__c,Product_vod__c,Default_Presentation_vod__c,Training_vod__c,ParentId_vod__c,Hidden_vod__c,Type_vod__c,Approved_vod__c,Copied_From_vod__c,Copy_Date_vod__c,Survey_vod__c,Original_Record_ID_vod__c,Directory_vod__c,End_Date_vod__c,Start_Date_vod__c,Status_vod__c,VExternal_Id_vod__c,Vault_DNS_vod__c,Vault_Doc_Id_vod__c,Vault_External_Id_vod__c,Vault_GUID_vod__c,Vault_Last_Modified_Date_Time_vod__c,Version_vod__c,Enable_Survey_Overlay_vod__c,Description_vod__c,Keywords_vod__c,Content_Channel_vod__c,business_function__c,ewizard_link__c,keywords__c,original_material_approved_in_veritas__c,trade_team__c,Publish_Method_vod__c,MSJ_Key_Presentation__c,MSJ_CLM_Report_Name__c
-Id,OwnerId,IsDeleted,Name,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Mobile_ID_vod__c,Presentation_Id_vod__c,Product_vod__c,Default_Presentation_vod__c,Training_vod__c,ParentId_vod__c,Hidden_vod__c,Type_vod__c,Approved_vod__c,Copied_From_vod__c,Copy_Date_vod__c,Survey_vod__c,Original_Record_ID_vod__c,Directory_vod__c,End_Date_vod__c,Start_Date_vod__c,Status_vod__c,VExternal_Id_vod__c,Vault_DNS_vod__c,Vault_Doc_Id_vod__c,Vault_External_Id_vod__c,Vault_GUID_vod__c,Vault_Last_Modified_Date_Time_vod__c,Version_vod__c,Enable_Survey_Overlay_vod__c,Description_vod__c,Keywords_vod__c,Content_Channel_vod__c,business_function__c,ewizard_link__c,keywords__c,original_material_approved_in_veritas__c,trade_team__c,Publish_Method_vod__c
+Id,OwnerId,IsDeleted,Name,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Mobile_ID_vod__c,Presentation_Id_vod__c,Product_vod__c,Default_Presentation_vod__c,Training_vod__c,ParentId_vod__c,Hidden_vod__c,Type_vod__c,Approved_vod__c,Copied_From_vod__c,Copy_Date_vod__c,Survey_vod__c,Original_Record_ID_vod__c,Directory_vod__c,End_Date_vod__c,Start_Date_vod__c,Status_vod__c,VExternal_Id_vod__c,Vault_DNS_vod__c,Vault_Doc_Id_vod__c,Vault_External_Id_vod__c,Vault_GUID_vod__c,Vault_Last_Modified_Date_Time_vod__c,Version_vod__c,Enable_Survey_Overlay_vod__c,Description_vod__c,Keywords_vod__c,Content_Channel_vod__c,business_function__c,ewizard_link__c,keywords__c,original_material_approved_in_veritas__c,trade_team__c,Publish_Method_vod__c,MSJ_Key_Presentation__c,MSJ_CLM_Report_Name__c
 src02.crm_Clm_Presentation_vod__c
 org02.crm_Clm_Presentation_vod__c
-
+CRM_Clm_Presentation_vod__c_ex.sql
--- a/s3/data/crm/settings/CRM_Clm_Presentation_vod__c_ex.sql
+++ b/s3/data/crm/settings/CRM_Clm_Presentation_vod__c_ex.sql
@ -0,0 +1 @@
 CALL internal02.crm_history('src02.crm_Clm_Presentation_vod__c', 'SystemModstamp');
--- a/s3/data/encise/settings/CITFD_Merck01.txt
+++ b/s3/data/encise/settings/CITFD_Merck01.txt
@ -1,6 +1,6 @@
 ensice
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/CITFD_Merck06.txt
+++ b/s3/data/encise/settings/CITFD_Merck06.txt
@ -1,6 +1,6 @@
 ensice
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/CITFD_Merck07.txt
+++ b/s3/data/encise/settings/CITFD_Merck07.txt
@ -1,6 +1,6 @@
 ensice
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/CITFD_Merck10.txt
+++ b/s3/data/encise/settings/CITFD_Merck10.txt
@ -1,6 +1,6 @@
 ensice
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/CITFM_PROADD.txt
+++ b/s3/data/encise/settings/CITFM_PROADD.txt
@ -1,6 +1,6 @@
 ensice
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/CITFM_PROLST.txt
+++ b/s3/data/encise/settings/CITFM_PROLST.txt
@ -1,6 +1,6 @@
 ensice
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/CITFM_REGION.txt
+++ b/s3/data/encise/settings/CITFM_REGION.txt
@ -1,6 +1,6 @@
 ensice
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/CITFM_SEGMNT.txt
+++ b/s3/data/encise/settings/CITFM_SEGMNT.txt
@ -1,6 +1,6 @@
 ensice
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/CITQD_Merck01.txt
+++ b/s3/data/encise/settings/CITQD_Merck01.txt
@ -1,6 +1,6 @@
 ensice
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/CITQD_Merck06.txt
+++ b/s3/data/encise/settings/CITQD_Merck06.txt
@ -1,6 +1,6 @@
 ensice
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/CITQD_Merck07.txt
+++ b/s3/data/encise/settings/CITQD_Merck07.txt
@ -1,6 +1,6 @@
 ensice
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/CITQD_Merck10.txt
+++ b/s3/data/encise/settings/CITQD_Merck10.txt
@ -1,6 +1,6 @@
 ensice
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/CITQM_PROADD.txt
+++ b/s3/data/encise/settings/CITQM_PROADD.txt
@ -1,6 +1,6 @@
 ensice
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/CITQM_PROLST.txt
+++ b/s3/data/encise/settings/CITQM_PROLST.txt
@ -1,6 +1,6 @@
 ensice
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/CITQM_REGION.txt
+++ b/s3/data/encise/settings/CITQM_REGION.txt
@ -1,6 +1,6 @@
 ensice
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/CITQM_SEGMNT.txt
+++ b/s3/data/encise/settings/CITQM_SEGMNT.txt
@ -1,6 +1,6 @@
 ensice
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/CLUFD_Merck02.txt
+++ b/s3/data/encise/settings/CLUFD_Merck02.txt
@ -1,6 +1,6 @@
 ensice
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/CLUFD_Merck03.txt
+++ b/s3/data/encise/settings/CLUFD_Merck03.txt
@ -1,6 +1,6 @@
 ensice
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/CLUFD_Merck04.txt
+++ b/s3/data/encise/settings/CLUFD_Merck04.txt
@ -1,6 +1,6 @@
 ensice
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/CLUFM_CLUMST.txt
+++ b/s3/data/encise/settings/CLUFM_CLUMST.txt
@ -1,6 +1,6 @@
 ensice
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/CLUFM_PROADD.txt
+++ b/s3/data/encise/settings/CLUFM_PROADD.txt
@ -1,6 +1,6 @@
 encise
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/CLUFM_PROLST.txt
+++ b/s3/data/encise/settings/CLUFM_PROLST.txt
@ -1,6 +1,6 @@
 ensice
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/MST_BRAND.txt
+++ b/s3/data/encise/settings/MST_BRAND.txt
@ -1,6 +1,6 @@
 ensice
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/NATFD.txt
+++ b/s3/data/encise/settings/NATFD.txt
@ -1,6 +1,6 @@
 ensice
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/NATFM_PROADD.txt
+++ b/s3/data/encise/settings/NATFM_PROADD.txt
@ -1,6 +1,6 @@
 encise
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/NATFM_SEGMNT.txt
+++ b/s3/data/encise/settings/NATFM_SEGMNT.txt
@ -1,6 +1,6 @@
 ensice
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/NATQD.txt
+++ b/s3/data/encise/settings/NATQD.txt
@ -1,6 +1,6 @@
 ensice
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/NATQM_PROADD.txt
+++ b/s3/data/encise/settings/NATQM_PROADD.txt
@ -1,6 +1,6 @@
 encise
 ,
-cp932
+utf-8
 "
 CRLF
 1
--- a/s3/data/encise/settings/NATQM_SEGMNT.txt
+++ b/s3/data/encise/settings/NATQM_SEGMNT.txt
@ -1,6 +1,6 @@
 ensice
 ,
-cp932
+utf-8
 "
 CRLF
 1
 /01/03
 /02/03
 /03/03
 /04/03
 /05/03
 /06/03
 /07/03
 /08/03
 /09/03
 /10/03
 /11/03
 /12/03
-/12/02
-/12/03
-/12/09
-/12/10
-/12/16
-/12/17
-/12/23
-/12/24
-/12/29
-/12/30
-/12/31
-/01/01
-/01/02
-/01/03
-/01/06
-/01/07
-/01/08
-/01/13
-/01/14
-/01/20
-/01/21
-/01/27
-/01/28
-/02/03
-/02/04
-/02/10
-/02/11
-/02/12
-/02/17
-/02/18
-/02/23
-/02/24
-/02/25
-/03/02
-/03/03
-/03/09
-/03/10
-/03/16
-/03/17
-/03/20
-/03/23
-/03/24
-/03/30
-/03/31
-/04/06
-/04/07
-/04/13
-/04/14
-/04/20
-/04/21
-/04/27
-/04/28
-/04/29
-/05/03
-/05/04
-/05/05
-/05/06
-/05/11
-/05/12
-/05/18
-/05/19
-/05/25
-/05/26
-/06/01
-/06/02
-/06/08
-/06/09
-/06/15
-/06/16
-/06/22
-/06/23
-/06/29
-/06/30
-/07/06
-/07/07
-/07/13
-/07/14
-/07/15
-/07/20
-/07/21
-/07/27
-/07/28
-/08/03
-/08/04
-/08/10
-/08/11
-/08/12
-/08/17
-/08/18
-/08/24
-/08/25
-/08/31
-/09/01
-/09/07
-/09/08
-/09/14
-/09/15
-/09/16
-/09/21
-/09/22
-/09/23
-/09/28
-/09/29
-/10/05
-/10/06
-/10/12
-/10/13
-/10/14
-/10/19
-/10/20
-/10/26
-/10/27
-/11/02
-/11/03
-/11/04
-/11/09
-/11/10
-/11/16
-/11/17
-/11/23
-/11/24
-/11/30
 /12/01
 /12/07
 /12/08
 /12/29
 /12/30
 /12/31
+/01/01
+/01/02
+/01/03
+/01/04
+/01/05
+/01/11
+/01/12
+/01/13
+/01/18
+/01/19
+/01/25
+/01/26
+/02/01
+/02/02
+/02/08
+/02/09
+/02/11
+/02/15
+/02/16
+/02/22
+/02/23
+/02/24
+/03/01
+/03/02
+/03/08
+/03/09
+/03/15
+/03/16
+/03/20
+/03/22
+/03/23
+/03/29
+/03/30
+/04/05
+/04/06
+/04/12
+/04/13
+/04/19
+/04/20
+/04/26
+/04/27
+/04/29
+/05/03
+/05/04
+/05/05
+/05/06
+/05/10
+/05/11
+/05/17
+/05/18
+/05/24
+/05/25
+/05/31
+/06/01
+/06/07
+/06/08
+/06/14
+/06/15
+/06/21
+/06/22
+/06/28
+/06/29
+/07/05
+/07/06
+/07/12
+/07/13
+/07/19
+/07/20
+/07/21
+/07/26
+/07/27
+/08/02
+/08/03
+/08/09
+/08/10
+/08/11
+/08/16
+/08/17
+/08/23
+/08/24
+/08/30
+/08/31
+/09/06
+/09/07
+/09/13
+/09/14
+/09/15
+/09/20
+/09/21
+/09/23
+/09/27
+/09/28
+/10/04
+/10/05
+/10/11
+/10/12
+/10/13
+/10/18
+/10/19
+/10/25
+/10/26
+/11/01
+/11/02
+/11/03
+/11/08
+/11/09
+/11/15
+/11/16
+/11/22
+/11/23
+/11/24
+/11/29
+/11/30
+/12/06
+/12/07
+/12/13
+/12/14
+/12/20
+/12/21
+/12/27
+/12/28
+/12/29
+/12/30
+/12/31
-/12/14
-/01/18
-/02/15
-/03/14
-/04/12
-/05/16
-/06/14
-/07/12
-/08/15
-/09/13
-/10/15
-/11/15
 /12/13
+/01/20
+/02/17
+/03/14
+/04/14
+/05/16
+/06/13
+/07/14
+/08/15
+/09/12
+/10/15
+/11/17
+/12/12
		`@ -0,0 +1 @@`
							`CALL internal02.crm_history('src02.crm_Clm_Presentation_vod__c', 'SystemModstamp');`