diff --git a/ec2/README.md b/ec2/README.md
new file mode 100644
index 00000000..0dda354b
--- /dev/null
+++ b/ec2/README.md
@@ -0,0 +1,62 @@
+# EC2インスタンス管理資材
+
+## NLBゲートウェイ インスタンス 起動スクリプト
+
+### 目的
+
+Merck様のDB接続経路としてのNLBから、Auroraデータベースに踏み台アクセスを行うため、ゲートウェイの機能を提供するEC2インスタンスを稼働している。
+EC2インスタンス内では、NLBからの任意のポートをAuroraデータベースのポートにフォワーディングするために、`socat`プロセスを動かす必要がある。
+`socat`プロセスを動かすためのコマンドと、EC2インスタンス起動時にプロセスを実行するためのsystemdの設定を配置している。
+
+### フォルダ構成
+
+```txt
+.
+├── README.md -- 当ファイル
+└── gateway
+ ├── staging -- ステージング環境用設定
+ │ ├── public1-1 -- ap-northeast-1aのインスタンス要設定
+ │ │ ├── socat-dbconnection-1a.service -- systemdにsocatプロセスを登録するためのファイル
+ │ │ └── socat-portforwarding-1a.sh -- socatでAuroraデータベースにポートフォワーディングするためのシェルスクリプト
+ │ └── public2-1 -- ap-northeast-1dのインスタンス要設定
+ │ ├── socat-dbconnection-1d.service
+ │ └── socat-portforwarding-1d.sh
+ │
+ ├── product -- 本番環境用設定
+ │ ├── public1-1
+ │ │ ├── socat-dbconnection-1a.service
+ │ │ └── socat-portforwarding-1a.sh
+ │ └── public2-1
+ │ ├── socat-dbconnection-1d.service
+ │ └── socat-portforwarding-1d.sh
+```
+
+### ファイル配置方法(両環境共通)
+
+- 対象のゲートウェイEC2インスタンスにログインする
+ - セッションマネージャーでログインした場合は、`ec2-user`に切り替えること(`sudo su --login ec2-user`)
+- 以下の操作を実行し、`socat`プロセスを起動するシェルスクリプトを配置する。
+ - **ap-northeast-1aのインスタンス(public-1-1)の場合**
+ - `sudo vi /opt/socat-portforwarding-1a.sh`コマンドを実行する。
+ - `ec2/gateway/<環境名>/public-1-1/socat-portforwarding-1a.sh`の内容をコピペして保存する。
+ - `sudo chmod 774 /opt/socat-portforwarding-1a.sh`コマンドを実行する。
+ - **ap-northeast-1dのインスタンス(public-2-1)の場合**
+ - `sudo vi /opt/socat-portforwarding-1d.sh`コマンドを実行する。
+ - `ec2/gateway/<環境名>/public-2-1/socat-portforwarding-1d.sh`の内容をコピペして保存する。
+ - `sudo chmod 774 /opt/socat-portforwarding-1d.sh`コマンドを実行する。
+- 以下の操作を実行し、`socat`プロセスを常駐させるためのサービス設定ファイルを配置する。
+ - **ap-northeast-1aのインスタンス(public-1-1)の場合**
+ - `sudo vi /etc/systemd/system/socat-dbconnection-1a.service`コマンドを実行する。
+ - `ec2/gateway/<環境名>/public-1-1/socat-dbconnection-1a.service`の内容をコピペして保存する。
+ - `sudo chmod 774 /etc/systemd/system/socat-dbconnection-1a.service`コマンドを実行する。
+ - **ap-northeast-1dのインスタンス(public-2-1)の場合**
+ - `sudo vi /etc/systemd/system/socat-dbconnection-1d.service`コマンドを実行する。
+ - `ec2/gateway/<環境名>/public-2-1/socat-dbconnection-1d.service`の内容をコピペして保存する。
+ - `sudo chmod 774 /etc/systemd/system/socat-dbconnection-1d.service`コマンドを実行する。
+- 以下の操作を実行し、`socat`プロセスを起動するスクリプトをsystemdに登録する
+ - **ap-northeast-1aのインスタンス(public-1-1)の場合**
+ - `sudo systemctl enable socat-dbconnection-1a.service`コマンドを実行し、サービスを有効化する。
+ - `sudo systemctl status socat-dbconnection-1a.service`コマンドを実行し、サービスのステータスを確認する。`enabled;`となっていればOK
+ - **ap-northeast-1dのインスタンス(public-2-1)の場合**
+ - `sudo systemctl enable socat-dbconnection-1d.service`コマンドを実行し、サービスを有効化する。
+ - `sudo systemctl status socat-dbconnection-1d.service`コマンドを実行し、サービスのステータスを確認する。`enabled;`となっていればOK
diff --git a/ec2/gateway/product/public1-1/socat-dbconnection-1a.service b/ec2/gateway/product/public1-1/socat-dbconnection-1a.service
new file mode 100644
index 00000000..551ac04d
--- /dev/null
+++ b/ec2/gateway/product/public1-1/socat-dbconnection-1a.service
@@ -0,0 +1,10 @@
+[Unit]
+Description = socat-dbconnection-1a
+
+[Service]
+ExecStart = /opt/socat-portforwarding-1a.sh
+Type = oneshot
+RemainAfterExit = yes
+
+[Install]
+WantedBy = default.target
\ No newline at end of file
diff --git a/ec2/gateway/product/public1-1/socat-portforwarding-1a.sh b/ec2/gateway/product/public1-1/socat-portforwarding-1a.sh
new file mode 100644
index 00000000..c257a075
--- /dev/null
+++ b/ec2/gateway/product/public1-1/socat-portforwarding-1a.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+socat tcp4-listen:40001,reuseaddr,fork TCP:mbj-newdwh2021-product-dbcluster-instance-1.chs11qsgoyix.ap-northeast-1.rds.amazonaws.com:3306 &
+socat tcp4-listen:50001,reuseaddr,fork TCP:mbj-newdwh2021-product-dbcluster.cluster-chs11qsgoyix.ap-northeast-1.rds.amazonaws.com:3306 &
\ No newline at end of file
diff --git a/ec2/gateway/product/public2-1/socat-dbconnection-1d.service b/ec2/gateway/product/public2-1/socat-dbconnection-1d.service
new file mode 100644
index 00000000..a7f9be7c
--- /dev/null
+++ b/ec2/gateway/product/public2-1/socat-dbconnection-1d.service
@@ -0,0 +1,10 @@
+[Unit]
+Description = socat-dbconnection-1d
+
+[Service]
+ExecStart = /opt/socat-portforwarding-1d.sh
+Type = oneshot
+RemainAfterExit = yes
+
+[Install]
+WantedBy = default.target
\ No newline at end of file
diff --git a/ec2/gateway/product/public2-1/socat-portforwarding-1d.sh b/ec2/gateway/product/public2-1/socat-portforwarding-1d.sh
new file mode 100644
index 00000000..0f1d2747
--- /dev/null
+++ b/ec2/gateway/product/public2-1/socat-portforwarding-1d.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+socat tcp4-listen:40001,reuseaddr,fork TCP:mbj-newdwh2021-product-dbcluster-instance-1-ap-northeast-1d.chs11qsgoyix.ap-northeast-1.rds.amazonaws.com:3306 &
+socat tcp4-listen:50001,reuseaddr,fork TCP:mbj-newdwh2021-product-dbcluster.cluster-chs11qsgoyix.ap-northeast-1.rds.amazonaws.com:3306 &
\ No newline at end of file
diff --git a/ec2/gateway/staging/public1-1/socat-dbconnection-1a.service b/ec2/gateway/staging/public1-1/socat-dbconnection-1a.service
new file mode 100644
index 00000000..551ac04d
--- /dev/null
+++ b/ec2/gateway/staging/public1-1/socat-dbconnection-1a.service
@@ -0,0 +1,10 @@
+[Unit]
+Description = socat-dbconnection-1a
+
+[Service]
+ExecStart = /opt/socat-portforwarding-1a.sh
+Type = oneshot
+RemainAfterExit = yes
+
+[Install]
+WantedBy = default.target
\ No newline at end of file
diff --git a/ec2/gateway/staging/public1-1/socat-portforwarding-1a.sh b/ec2/gateway/staging/public1-1/socat-portforwarding-1a.sh
new file mode 100644
index 00000000..7ae1aa37
--- /dev/null
+++ b/ec2/gateway/staging/public1-1/socat-portforwarding-1a.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+socat tcp4-listen:40001,reuseaddr,fork TCP:mbj-newdwh2021-staging-dbcluster-instance-1.chs11qsgoyix.ap-northeast-1.rds.amazonaws.com:3306 &
+socat tcp4-listen:50001,reuseaddr,fork TCP:mbj-newdwh2021-staging-dbcluster.cluster-chs11qsgoyix.ap-northeast-1.rds.amazonaws.com:3306 &
\ No newline at end of file
diff --git a/ec2/gateway/staging/public2-1/socat-dbconnection-1d.service b/ec2/gateway/staging/public2-1/socat-dbconnection-1d.service
new file mode 100644
index 00000000..a7f9be7c
--- /dev/null
+++ b/ec2/gateway/staging/public2-1/socat-dbconnection-1d.service
@@ -0,0 +1,10 @@
+[Unit]
+Description = socat-dbconnection-1d
+
+[Service]
+ExecStart = /opt/socat-portforwarding-1d.sh
+Type = oneshot
+RemainAfterExit = yes
+
+[Install]
+WantedBy = default.target
\ No newline at end of file
diff --git a/ec2/gateway/staging/public2-1/socat-portforwarding-1d.sh b/ec2/gateway/staging/public2-1/socat-portforwarding-1d.sh
new file mode 100644
index 00000000..2560a8a2
--- /dev/null
+++ b/ec2/gateway/staging/public2-1/socat-portforwarding-1d.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+socat tcp4-listen:40001,reuseaddr,fork TCP:mbj-newdwh2021-staging-dbcluster-instance-1-ap-northeast-1d.chs11qsgoyix.ap-northeast-1.rds.amazonaws.com:3306 &
+socat tcp4-listen:50001,reuseaddr,fork TCP:mbj-newdwh2021-staging-dbcluster.cluster-chs11qsgoyix.ap-northeast-1.rds.amazonaws.com:3306 &
\ No newline at end of file
diff --git a/ecs/crm-datafetch/Pipfile b/ecs/crm-datafetch/Pipfile
index 51d5c180..818d16a8 100644
--- a/ecs/crm-datafetch/Pipfile
+++ b/ecs/crm-datafetch/Pipfile
@@ -11,7 +11,7 @@ test = "pytest tests/"
[packages]
boto3 = "*"
-simple-salesforce = "==1.12.4"
+simple-salesforce = "==1.12.6"
tenacity = "*"
[dev-packages]
diff --git a/ecs/crm-datafetch/Pipfile.lock b/ecs/crm-datafetch/Pipfile.lock
index bf84ceab..492eb3be 100644
--- a/ecs/crm-datafetch/Pipfile.lock
+++ b/ecs/crm-datafetch/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "79301fd70f05a7e9d84a96c82c8ca7d17d7c476a666f204bbde8ac46acf2c400"
+ "sha256": "08f06257be4b6fbfc76618bf1838231dca39c9548e2583cd6436bc7fb5f26f7b"
},
"pipfile-spec": 6,
"requires": {
@@ -26,19 +26,19 @@
},
"boto3": {
"hashes": [
- "sha256:33c6a7aeab316f7e0b3ad8552afe95a4a10bfd58519d00741c4d4f3047da8382",
- "sha256:9352f6d61f15c789231a5d608613f03425059072ed862c32e1ed102b17206abf"
+ "sha256:0b307f685875e9c7857ce21c0d3050d8d4f3778455a6852d5f98ac75194b400e",
+ "sha256:65b808e4cf1af8c2f405382d53656a0d92eee8f85c7388c43d64c7a5571b065f"
],
"index": "pypi",
- "version": "==1.35.40"
+ "version": "==1.35.47"
},
"botocore": {
"hashes": [
- "sha256:072cc47f29cb1de4fa77ce6632e4f0480af29b70816973ff415fbaa3f50bd1db",
- "sha256:547e0a983856c7d7aeaa30fca2a283873c57c07366cd806d2d639856341b3c31"
+ "sha256:05f4493119a96799ff84d43e78691efac3177e1aec8840cca99511de940e342a",
+ "sha256:f8f703463d3cd8b6abe2bedc443a7ab29f0e2ff1588a2e83164b108748645547"
],
"markers": "python_version >= '3.8'",
- "version": "==1.35.40"
+ "version": "==1.35.47"
},
"certifi": {
"hashes": [
@@ -234,36 +234,36 @@
},
"cryptography": {
"hashes": [
- "sha256:014f58110f53237ace6a408b5beb6c427b64e084eb451ef25a28308270086494",
- "sha256:1bbcce1a551e262dfbafb6e6252f1ae36a248e615ca44ba302df077a846a8806",
- "sha256:203e92a75716d8cfb491dc47c79e17d0d9207ccffcbcb35f598fbe463ae3444d",
- "sha256:27e613d7077ac613e399270253259d9d53872aaf657471473ebfc9a52935c062",
- "sha256:2bd51274dcd59f09dd952afb696bf9c61a7a49dfc764c04dd33ef7a6b502a1e2",
- "sha256:38926c50cff6f533f8a2dae3d7f19541432610d114a70808f0926d5aaa7121e4",
- "sha256:511f4273808ab590912a93ddb4e3914dfd8a388fed883361b02dea3791f292e1",
- "sha256:58d4e9129985185a06d849aa6df265bdd5a74ca6e1b736a77959b498e0505b85",
- "sha256:5b43d1ea6b378b54a1dc99dd8a2b5be47658fe9a7ce0a58ff0b55f4b43ef2b84",
- "sha256:61ec41068b7b74268fa86e3e9e12b9f0c21fcf65434571dbb13d954bceb08042",
- "sha256:666ae11966643886c2987b3b721899d250855718d6d9ce41b521252a17985f4d",
- "sha256:68aaecc4178e90719e95298515979814bda0cbada1256a4485414860bd7ab962",
- "sha256:7c05650fe8023c5ed0d46793d4b7d7e6cd9c04e68eabe5b0aeea836e37bdcec2",
- "sha256:80eda8b3e173f0f247f711eef62be51b599b5d425c429b5d4ca6a05e9e856baa",
- "sha256:8385d98f6a3bf8bb2d65a73e17ed87a3ba84f6991c155691c51112075f9ffc5d",
- "sha256:88cce104c36870d70c49c7c8fd22885875d950d9ee6ab54df2745f83ba0dc365",
- "sha256:9d3cdb25fa98afdd3d0892d132b8d7139e2c087da1712041f6b762e4f807cc96",
- "sha256:a575913fb06e05e6b4b814d7f7468c2c660e8bb16d8d5a1faf9b33ccc569dd47",
- "sha256:ac119bb76b9faa00f48128b7f5679e1d8d437365c5d26f1c2c3f0da4ce1b553d",
- "sha256:c1332724be35d23a854994ff0b66530119500b6053d0bd3363265f7e5e77288d",
- "sha256:d03a475165f3134f773d1388aeb19c2d25ba88b6a9733c5c590b9ff7bbfa2e0c",
- "sha256:d75601ad10b059ec832e78823b348bfa1a59f6b8d545db3a24fd44362a1564cb",
- "sha256:de41fd81a41e53267cb020bb3a7212861da53a7d39f863585d13ea11049cf277",
- "sha256:e710bf40870f4db63c3d7d929aa9e09e4e7ee219e703f949ec4073b4294f6172",
- "sha256:ea25acb556320250756e53f9e20a4177515f012c9eaea17eb7587a8c4d8ae034",
- "sha256:f98bf604c82c416bc829e490c700ca1553eafdf2912a91e23a79d97d9801372a",
- "sha256:fba1007b3ef89946dbbb515aeeb41e30203b004f0b4b00e5e16078b518563289"
+ "sha256:0c580952eef9bf68c4747774cde7ec1d85a6e61de97281f2dba83c7d2c806362",
+ "sha256:0f996e7268af62598f2fc1204afa98a3b5712313a55c4c9d434aef49cadc91d4",
+ "sha256:1ec0bcf7e17c0c5669d881b1cd38c4972fade441b27bda1051665faaa89bdcaa",
+ "sha256:281c945d0e28c92ca5e5930664c1cefd85efe80e5c0d2bc58dd63383fda29f83",
+ "sha256:2ce6fae5bdad59577b44e4dfed356944fbf1d925269114c28be377692643b4ff",
+ "sha256:315b9001266a492a6ff443b61238f956b214dbec9910a081ba5b6646a055a805",
+ "sha256:443c4a81bb10daed9a8f334365fe52542771f25aedaf889fd323a853ce7377d6",
+ "sha256:4a02ded6cd4f0a5562a8887df8b3bd14e822a90f97ac5e544c162899bc467664",
+ "sha256:53a583b6637ab4c4e3591a15bc9db855b8d9dee9a669b550f311480acab6eb08",
+ "sha256:63efa177ff54aec6e1c0aefaa1a241232dcd37413835a9b674b6e3f0ae2bfd3e",
+ "sha256:74f57f24754fe349223792466a709f8e0c093205ff0dca557af51072ff47ab18",
+ "sha256:7e1ce50266f4f70bf41a2c6dc4358afadae90e2a1e5342d3c08883df1675374f",
+ "sha256:81ef806b1fef6b06dcebad789f988d3b37ccaee225695cf3e07648eee0fc6b73",
+ "sha256:846da004a5804145a5f441b8530b4bf35afbf7da70f82409f151695b127213d5",
+ "sha256:8ac43ae87929a5982f5948ceda07001ee5e83227fd69cf55b109144938d96984",
+ "sha256:9762ea51a8fc2a88b70cf2995e5675b38d93bf36bd67d91721c309df184f49bd",
+ "sha256:a2a431ee15799d6db9fe80c82b055bae5a752bef645bba795e8e52687c69efe3",
+ "sha256:bf7a1932ac4176486eab36a19ed4c0492da5d97123f1406cf15e41b05e787d2e",
+ "sha256:c2e6fc39c4ab499049df3bdf567f768a723a5e8464816e8f009f121a5a9f4405",
+ "sha256:cbeb489927bd7af4aa98d4b261af9a5bc025bd87f0e3547e11584be9e9427be2",
+ "sha256:d03b5621a135bffecad2c73e9f4deb1a0f977b9a8ffe6f8e002bf6c9d07b918c",
+ "sha256:d56e96520b1020449bbace2b78b603442e7e378a9b3bd68de65c782db1507995",
+ "sha256:df6b6c6d742395dd77a23ea3728ab62f98379eff8fb61be2744d4679ab678f73",
+ "sha256:e1be4655c7ef6e1bbe6b5d0403526601323420bcf414598955968c9ef3eb7d16",
+ "sha256:f18c716be16bc1fea8e95def49edf46b82fccaa88587a45f8dc0ff6ab5d8e0a7",
+ "sha256:f46304d6f0c6ab8e52770addfa2fc41e6629495548862279641972b6215451cd",
+ "sha256:f7b178f11ed3664fd0e995a47ed2b5ff0a12d893e41dd0494f406d1cf555cab7"
],
- "markers": "python_version >= '3.7'",
- "version": "==43.0.1"
+ "markers": "python_full_version >= '3.7.0'",
+ "version": "==43.0.3"
},
"idna": {
"hashes": [
@@ -433,6 +433,14 @@
"markers": "python_version >= '3.6'",
"version": "==5.3.0"
},
+ "more-itertools": {
+ "hashes": [
+ "sha256:037b0d3203ce90cca8ab1defbbdac29d5f993fc20131f3664dc8d6acfa872aef",
+ "sha256:5482bfef7849c25dc3c6dd53a6173ae4795da2a41a80faea6700d9f5846c5da6"
+ ],
+ "markers": "python_version >= '3.8'",
+ "version": "==10.5.0"
+ },
"platformdirs": {
"hashes": [
"sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907",
@@ -450,6 +458,9 @@
"version": "==2.22"
},
"pyjwt": {
+ "extras": [
+ "crypto"
+ ],
"hashes": [
"sha256:3b02fb0f44517787776cf48f2ae25d8e14f300e6d7545a4315cee571a415e850",
"sha256:7e1e5b56cc735432a7369cbfa0efe50fa113ebecdc04ae6922deba8b84582d0c"
@@ -505,11 +516,11 @@
},
"simple-salesforce": {
"hashes": [
- "sha256:87f1ac1363987ebf9b7a66ac9e7395534ec3f5a9545e08b664cb695dc085b1ac",
- "sha256:e9205f8041226c8273f020448c7fbd37999d481d25edd67f9bf86dc159cd3939"
+ "sha256:66c74bee88d09ace46e4fc9c2f6b47c0d012817a764f70a5455d6dc2c7ed635c",
+ "sha256:77590606c781905f6b75430562951dd2b062438da7f55fca2b61e4cde31df15b"
],
"index": "pypi",
- "version": "==1.12.4"
+ "version": "==1.12.6"
},
"six": {
"hashes": [
@@ -527,6 +538,14 @@
"index": "pypi",
"version": "==9.0.0"
},
+ "typing-extensions": {
+ "hashes": [
+ "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d",
+ "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"
+ ],
+ "markers": "python_version >= '3.8'",
+ "version": "==4.12.2"
+ },
"urllib3": {
"hashes": [
"sha256:0ed14ccfbf1c30a9072c7ca157e4319b70d65f623e91e7b32fadb2853431016e",
@@ -537,11 +556,11 @@
},
"zeep": {
"hashes": [
- "sha256:26a1658057411fb331ee0602633c31b5c754ff1d7b9b38a15e83737597c080eb",
- "sha256:4bafaf1997a46b5560c5e928f2bc1b04f04c31dad121ecbe1e952f23aee4c19e"
+ "sha256:a637aa7eedb6330bb27e8c94c5233ddf23553904323adf9398f8cf5025acb216",
+ "sha256:f45385e9e1b09d5550e0f51ab9fa7c6842713cab7194139372fd82a99c56a06e"
],
"markers": "python_version >= '3.8'",
- "version": "==4.3.0"
+ "version": "==4.3.1"
}
},
"develop": {
@@ -555,19 +574,19 @@
},
"boto3": {
"hashes": [
- "sha256:33c6a7aeab316f7e0b3ad8552afe95a4a10bfd58519d00741c4d4f3047da8382",
- "sha256:9352f6d61f15c789231a5d608613f03425059072ed862c32e1ed102b17206abf"
+ "sha256:0b307f685875e9c7857ce21c0d3050d8d4f3778455a6852d5f98ac75194b400e",
+ "sha256:65b808e4cf1af8c2f405382d53656a0d92eee8f85c7388c43d64c7a5571b065f"
],
"index": "pypi",
- "version": "==1.35.40"
+ "version": "==1.35.47"
},
"botocore": {
"hashes": [
- "sha256:072cc47f29cb1de4fa77ce6632e4f0480af29b70816973ff415fbaa3f50bd1db",
- "sha256:547e0a983856c7d7aeaa30fca2a283873c57c07366cd806d2d639856341b3c31"
+ "sha256:05f4493119a96799ff84d43e78691efac3177e1aec8840cca99511de940e342a",
+ "sha256:f8f703463d3cd8b6abe2bedc443a7ab29f0e2ff1588a2e83164b108748645547"
],
"markers": "python_version >= '3.8'",
- "version": "==1.35.40"
+ "version": "==1.35.47"
},
"certifi": {
"hashes": [
@@ -766,104 +785,104 @@
"toml"
],
"hashes": [
- "sha256:04f2189716e85ec9192df307f7c255f90e78b6e9863a03223c3b998d24a3c6c6",
- "sha256:0c6c0f4d53ef603397fc894a895b960ecd7d44c727df42a8d500031716d4e8d2",
- "sha256:0ca37993206402c6c35dc717f90d4c8f53568a8b80f0bf1a1b2b334f4d488fba",
- "sha256:12f9515d875859faedb4144fd38694a761cd2a61ef9603bf887b13956d0bbfbb",
- "sha256:1990b1f4e2c402beb317840030bb9f1b6a363f86e14e21b4212e618acdfce7f6",
- "sha256:2341a78ae3a5ed454d524206a3fcb3cec408c2a0c7c2752cd78b606a2ff15af4",
- "sha256:23bb63ae3f4c645d2d82fa22697364b0046fbafb6261b258a58587441c5f7bd0",
- "sha256:27bd5f18d8f2879e45724b0ce74f61811639a846ff0e5c0395b7818fae87aec6",
- "sha256:2dc7d6b380ca76f5e817ac9eef0c3686e7834c8346bef30b041a4ad286449990",
- "sha256:331b200ad03dbaa44151d74daeb7da2cf382db424ab923574f6ecca7d3b30de3",
- "sha256:365defc257c687ce3e7d275f39738dcd230777424117a6c76043459db131dd43",
- "sha256:37be7b5ea3ff5b7c4a9db16074dc94523b5f10dd1f3b362a827af66a55198175",
- "sha256:3c2e6fa98032fec8282f6b27e3f3986c6e05702828380618776ad794e938f53a",
- "sha256:40e8b1983080439d4802d80b951f4a93d991ef3261f69e81095a66f86cf3c3c6",
- "sha256:43517e1f6b19f610a93d8227e47790722c8bf7422e46b365e0469fc3d3563d97",
- "sha256:43b32a06c47539fe275106b376658638b418c7cfdfff0e0259fbf877e845f14b",
- "sha256:43d6a66e33b1455b98fc7312b124296dad97a2e191c80320587234a77b1b736e",
- "sha256:4c59d6a4a4633fad297f943c03d0d2569867bd5372eb5684befdff8df8522e39",
- "sha256:52ac29cc72ee7e25ace7807249638f94c9b6a862c56b1df015d2b2e388e51dbd",
- "sha256:54356a76b67cf8a3085818026bb556545ebb8353951923b88292556dfa9f812d",
- "sha256:583049c63106c0555e3ae3931edab5669668bbef84c15861421b94e121878d3f",
- "sha256:6d99198203f0b9cb0b5d1c0393859555bc26b548223a769baf7e321a627ed4fc",
- "sha256:6da42bbcec130b188169107ecb6ee7bd7b4c849d24c9370a0c884cf728d8e976",
- "sha256:6e484e479860e00da1f005cd19d1c5d4a813324e5951319ac3f3eefb497cc549",
- "sha256:70a6756ce66cd6fe8486c775b30889f0dc4cb20c157aa8c35b45fd7868255c5c",
- "sha256:70d24936ca6c15a3bbc91ee9c7fc661132c6f4c9d42a23b31b6686c05073bde5",
- "sha256:71967c35828c9ff94e8c7d405469a1fb68257f686bca7c1ed85ed34e7c2529c4",
- "sha256:79644f68a6ff23b251cae1c82b01a0b51bc40c8468ca9585c6c4b1aeee570e0b",
- "sha256:87cd2e29067ea397a47e352efb13f976eb1b03e18c999270bb50589323294c6e",
- "sha256:8d4c6ea0f498c7c79111033a290d060c517853a7bcb2f46516f591dab628ddd3",
- "sha256:9134032f5aa445ae591c2ba6991d10136a1f533b1d2fa8f8c21126468c5025c6",
- "sha256:921fbe13492caf6a69528f09d5d7c7d518c8d0e7b9f6701b7719715f29a71e6e",
- "sha256:99670790f21a96665a35849990b1df447993880bb6463a0a1d757897f30da929",
- "sha256:9975442f2e7a5cfcf87299c26b5a45266ab0696348420049b9b94b2ad3d40234",
- "sha256:99ded130555c021d99729fabd4ddb91a6f4cc0707df4b1daf912c7850c373b13",
- "sha256:a3328c3e64ea4ab12b85999eb0779e6139295bbf5485f69d42cf794309e3d007",
- "sha256:a4fb91d5f72b7e06a14ff4ae5be625a81cd7e5f869d7a54578fc271d08d58ae3",
- "sha256:aa23ce39661a3e90eea5f99ec59b763b7d655c2cada10729ed920a38bfc2b167",
- "sha256:aac7501ae73d4a02f4b7ac8fcb9dc55342ca98ffb9ed9f2dfb8a25d53eda0e4d",
- "sha256:ab84a8b698ad5a6c365b08061920138e7a7dd9a04b6feb09ba1bfae68346ce6d",
- "sha256:b4adeb878a374126f1e5cf03b87f66279f479e01af0e9a654cf6d1509af46c40",
- "sha256:b9853509b4bf57ba7b1f99b9d866c422c9c5248799ab20e652bbb8a184a38181",
- "sha256:bb7d5fe92bd0dc235f63ebe9f8c6e0884f7360f88f3411bfed1350c872ef2054",
- "sha256:bca4c8abc50d38f9773c1ec80d43f3768df2e8576807d1656016b9d3eeaa96fd",
- "sha256:c222958f59b0ae091f4535851cbb24eb57fc0baea07ba675af718fb5302dddb2",
- "sha256:c30e42ea11badb147f0d2e387115b15e2bd8205a5ad70d6ad79cf37f6ac08c91",
- "sha256:c3a79f56dee9136084cf84a6c7c4341427ef36e05ae6415bf7d787c96ff5eaa3",
- "sha256:c51ef82302386d686feea1c44dbeef744585da16fcf97deea2a8d6c1556f519b",
- "sha256:c77326300b839c44c3e5a8fe26c15b7e87b2f32dfd2fc9fee1d13604347c9b38",
- "sha256:d33a785ea8354c480515e781554d3be582a86297e41ccbea627a5c632647f2cd",
- "sha256:d546cfa78844b8b9c1c0533de1851569a13f87449897bbc95d698d1d3cb2a30f",
- "sha256:da29ceabe3025a1e5a5aeeb331c5b1af686daab4ff0fb4f83df18b1180ea83e2",
- "sha256:df8c05a0f574d480947cba11b947dc41b1265d721c3777881da2fb8d3a1ddfba",
- "sha256:e266af4da2c1a4cbc6135a570c64577fd3e6eb204607eaff99d8e9b710003c6f",
- "sha256:e279f3db904e3b55f520f11f983cc8dc8a4ce9b65f11692d4718ed021ec58b83",
- "sha256:ea52bd218d4ba260399a8ae4bb6b577d82adfc4518b93566ce1fddd4a49d1dce",
- "sha256:ebec65f5068e7df2d49466aab9128510c4867e532e07cb6960075b27658dca38",
- "sha256:ec1e3b40b82236d100d259854840555469fad4db64f669ab817279eb95cd535c",
- "sha256:ee77c7bef0724165e795b6b7bf9c4c22a9b8468a6bdb9c6b4281293c6b22a90f",
- "sha256:f263b18692f8ed52c8de7f40a0751e79015983dbd77b16906e5b310a39d3ca21",
- "sha256:f7b26757b22faf88fcf232f5f0e62f6e0fd9e22a8a5d0d5016888cdfe1f6c1c4",
- "sha256:f7ddb920106bbbbcaf2a274d56f46956bf56ecbde210d88061824a95bdd94e92"
+ "sha256:00a1d69c112ff5149cabe60d2e2ee948752c975d95f1e1096742e6077affd376",
+ "sha256:023bf8ee3ec6d35af9c1c6ccc1d18fa69afa1cb29eaac57cb064dbb262a517f9",
+ "sha256:0294ca37f1ba500667b1aef631e48d875ced93ad5e06fa665a3295bdd1d95111",
+ "sha256:06babbb8f4e74b063dbaeb74ad68dfce9186c595a15f11f5d5683f748fa1d172",
+ "sha256:0809082ee480bb8f7416507538243c8863ac74fd8a5d2485c46f0f7499f2b491",
+ "sha256:0b3fb02fe73bed561fa12d279a417b432e5b50fe03e8d663d61b3d5990f29546",
+ "sha256:0b58c672d14f16ed92a48db984612f5ce3836ae7d72cdd161001cc54512571f2",
+ "sha256:0bcd1069e710600e8e4cf27f65c90c7843fa8edfb4520fb0ccb88894cad08b11",
+ "sha256:1032e178b76a4e2b5b32e19d0fd0abbce4b58e77a1ca695820d10e491fa32b08",
+ "sha256:11a223a14e91a4693d2d0755c7a043db43d96a7450b4f356d506c2562c48642c",
+ "sha256:12394842a3a8affa3ba62b0d4ab7e9e210c5e366fbac3e8b2a68636fb19892c2",
+ "sha256:182e6cd5c040cec0a1c8d415a87b67ed01193ed9ad458ee427741c7d8513d963",
+ "sha256:1d5b8007f81b88696d06f7df0cb9af0d3b835fe0c8dbf489bad70b45f0e45613",
+ "sha256:1f76846299ba5c54d12c91d776d9605ae33f8ae2b9d1d3c3703cf2db1a67f2c0",
+ "sha256:27fb4a050aaf18772db513091c9c13f6cb94ed40eacdef8dad8411d92d9992db",
+ "sha256:29155cd511ee058e260db648b6182c419422a0d2e9a4fa44501898cf918866cf",
+ "sha256:29fc0f17b1d3fea332f8001d4558f8214af7f1d87a345f3a133c901d60347c73",
+ "sha256:2b6b4c83d8e8ea79f27ab80778c19bc037759aea298da4b56621f4474ffeb117",
+ "sha256:2fdef0d83a2d08d69b1f2210a93c416d54e14d9eb398f6ab2f0a209433db19e1",
+ "sha256:3c65d37f3a9ebb703e710befdc489a38683a5b152242664b973a7b7b22348a4e",
+ "sha256:4f704f0998911abf728a7783799444fcbbe8261c4a6c166f667937ae6a8aa522",
+ "sha256:51b44306032045b383a7a8a2c13878de375117946d68dcb54308111f39775a25",
+ "sha256:53d202fd109416ce011578f321460795abfe10bb901b883cafd9b3ef851bacfc",
+ "sha256:58809e238a8a12a625c70450b48e8767cff9eb67c62e6154a642b21ddf79baea",
+ "sha256:5915fcdec0e54ee229926868e9b08586376cae1f5faa9bbaf8faf3561b393d52",
+ "sha256:5beb1ee382ad32afe424097de57134175fea3faf847b9af002cc7895be4e2a5a",
+ "sha256:5f8ae553cba74085db385d489c7a792ad66f7f9ba2ee85bfa508aeb84cf0ba07",
+ "sha256:5fbd612f8a091954a0c8dd4c0b571b973487277d26476f8480bfa4b2a65b5d06",
+ "sha256:6bd818b7ea14bc6e1f06e241e8234508b21edf1b242d49831831a9450e2f35fa",
+ "sha256:6f01ba56b1c0e9d149f9ac85a2f999724895229eb36bd997b61e62999e9b0901",
+ "sha256:73d2b73584446e66ee633eaad1a56aad577c077f46c35ca3283cd687b7715b0b",
+ "sha256:7bb92c539a624cf86296dd0c68cd5cc286c9eef2d0c3b8b192b604ce9de20a17",
+ "sha256:8165b796df0bd42e10527a3f493c592ba494f16ef3c8b531288e3d0d72c1f6f0",
+ "sha256:862264b12ebb65ad8d863d51f17758b1684560b66ab02770d4f0baf2ff75da21",
+ "sha256:8902dd6a30173d4ef09954bfcb24b5d7b5190cf14a43170e386979651e09ba19",
+ "sha256:8cf717ee42012be8c0cb205dbbf18ffa9003c4cbf4ad078db47b95e10748eec5",
+ "sha256:8ed9281d1b52628e81393f5eaee24a45cbd64965f41857559c2b7ff19385df51",
+ "sha256:99b41d18e6b2a48ba949418db48159d7a2e81c5cc290fc934b7d2380515bd0e3",
+ "sha256:9cb7fa111d21a6b55cbf633039f7bc2749e74932e3aa7cb7333f675a58a58bf3",
+ "sha256:a181e99301a0ae128493a24cfe5cfb5b488c4e0bf2f8702091473d033494d04f",
+ "sha256:a413a096c4cbac202433c850ee43fa326d2e871b24554da8327b01632673a076",
+ "sha256:a6b1e54712ba3474f34b7ef7a41e65bd9037ad47916ccb1cc78769bae324c01a",
+ "sha256:ade3ca1e5f0ff46b678b66201f7ff477e8fa11fb537f3b55c3f0568fbfe6e718",
+ "sha256:b0ac3d42cb51c4b12df9c5f0dd2f13a4f24f01943627120ec4d293c9181219ba",
+ "sha256:b369ead6527d025a0fe7bd3864e46dbee3aa8f652d48df6174f8d0bac9e26e0e",
+ "sha256:b57b768feb866f44eeed9f46975f3d6406380275c5ddfe22f531a2bf187eda27",
+ "sha256:b8d3a03d9bfcaf5b0141d07a88456bb6a4c3ce55c080712fec8418ef3610230e",
+ "sha256:bc66f0bf1d7730a17430a50163bb264ba9ded56739112368ba985ddaa9c3bd09",
+ "sha256:bf20494da9653f6410213424f5f8ad0ed885e01f7e8e59811f572bdb20b8972e",
+ "sha256:c48167910a8f644671de9f2083a23630fbf7a1cb70ce939440cd3328e0919f70",
+ "sha256:c481b47f6b5845064c65a7bc78bc0860e635a9b055af0df46fdf1c58cebf8e8f",
+ "sha256:c7c8b95bf47db6d19096a5e052ffca0a05f335bc63cef281a6e8fe864d450a72",
+ "sha256:c9b8e184898ed014884ca84c70562b4a82cbc63b044d366fedc68bc2b2f3394a",
+ "sha256:cc8ff50b50ce532de2fa7a7daae9dd12f0a699bfcd47f20945364e5c31799fef",
+ "sha256:d541423cdd416b78626b55f123412fcf979d22a2c39fce251b350de38c15c15b",
+ "sha256:dab4d16dfef34b185032580e2f2f89253d302facba093d5fa9dbe04f569c4f4b",
+ "sha256:dacbc52de979f2823a819571f2e3a350a7e36b8cb7484cdb1e289bceaf35305f",
+ "sha256:df57bdbeffe694e7842092c5e2e0bc80fff7f43379d465f932ef36f027179806",
+ "sha256:ed8fe9189d2beb6edc14d3ad19800626e1d9f2d975e436f84e19efb7fa19469b",
+ "sha256:f3ddf056d3ebcf6ce47bdaf56142af51bb7fad09e4af310241e9db7a3a8022e1",
+ "sha256:f8fe4984b431f8621ca53d9380901f62bfb54ff759a1348cd140490ada7b693c",
+ "sha256:fe439416eb6380de434886b00c859304338f8b19f6f54811984f3420a2e03858"
],
"markers": "python_version >= '3.9'",
- "version": "==7.6.3"
+ "version": "==7.6.4"
},
"cryptography": {
"hashes": [
- "sha256:014f58110f53237ace6a408b5beb6c427b64e084eb451ef25a28308270086494",
- "sha256:1bbcce1a551e262dfbafb6e6252f1ae36a248e615ca44ba302df077a846a8806",
- "sha256:203e92a75716d8cfb491dc47c79e17d0d9207ccffcbcb35f598fbe463ae3444d",
- "sha256:27e613d7077ac613e399270253259d9d53872aaf657471473ebfc9a52935c062",
- "sha256:2bd51274dcd59f09dd952afb696bf9c61a7a49dfc764c04dd33ef7a6b502a1e2",
- "sha256:38926c50cff6f533f8a2dae3d7f19541432610d114a70808f0926d5aaa7121e4",
- "sha256:511f4273808ab590912a93ddb4e3914dfd8a388fed883361b02dea3791f292e1",
- "sha256:58d4e9129985185a06d849aa6df265bdd5a74ca6e1b736a77959b498e0505b85",
- "sha256:5b43d1ea6b378b54a1dc99dd8a2b5be47658fe9a7ce0a58ff0b55f4b43ef2b84",
- "sha256:61ec41068b7b74268fa86e3e9e12b9f0c21fcf65434571dbb13d954bceb08042",
- "sha256:666ae11966643886c2987b3b721899d250855718d6d9ce41b521252a17985f4d",
- "sha256:68aaecc4178e90719e95298515979814bda0cbada1256a4485414860bd7ab962",
- "sha256:7c05650fe8023c5ed0d46793d4b7d7e6cd9c04e68eabe5b0aeea836e37bdcec2",
- "sha256:80eda8b3e173f0f247f711eef62be51b599b5d425c429b5d4ca6a05e9e856baa",
- "sha256:8385d98f6a3bf8bb2d65a73e17ed87a3ba84f6991c155691c51112075f9ffc5d",
- "sha256:88cce104c36870d70c49c7c8fd22885875d950d9ee6ab54df2745f83ba0dc365",
- "sha256:9d3cdb25fa98afdd3d0892d132b8d7139e2c087da1712041f6b762e4f807cc96",
- "sha256:a575913fb06e05e6b4b814d7f7468c2c660e8bb16d8d5a1faf9b33ccc569dd47",
- "sha256:ac119bb76b9faa00f48128b7f5679e1d8d437365c5d26f1c2c3f0da4ce1b553d",
- "sha256:c1332724be35d23a854994ff0b66530119500b6053d0bd3363265f7e5e77288d",
- "sha256:d03a475165f3134f773d1388aeb19c2d25ba88b6a9733c5c590b9ff7bbfa2e0c",
- "sha256:d75601ad10b059ec832e78823b348bfa1a59f6b8d545db3a24fd44362a1564cb",
- "sha256:de41fd81a41e53267cb020bb3a7212861da53a7d39f863585d13ea11049cf277",
- "sha256:e710bf40870f4db63c3d7d929aa9e09e4e7ee219e703f949ec4073b4294f6172",
- "sha256:ea25acb556320250756e53f9e20a4177515f012c9eaea17eb7587a8c4d8ae034",
- "sha256:f98bf604c82c416bc829e490c700ca1553eafdf2912a91e23a79d97d9801372a",
- "sha256:fba1007b3ef89946dbbb515aeeb41e30203b004f0b4b00e5e16078b518563289"
+ "sha256:0c580952eef9bf68c4747774cde7ec1d85a6e61de97281f2dba83c7d2c806362",
+ "sha256:0f996e7268af62598f2fc1204afa98a3b5712313a55c4c9d434aef49cadc91d4",
+ "sha256:1ec0bcf7e17c0c5669d881b1cd38c4972fade441b27bda1051665faaa89bdcaa",
+ "sha256:281c945d0e28c92ca5e5930664c1cefd85efe80e5c0d2bc58dd63383fda29f83",
+ "sha256:2ce6fae5bdad59577b44e4dfed356944fbf1d925269114c28be377692643b4ff",
+ "sha256:315b9001266a492a6ff443b61238f956b214dbec9910a081ba5b6646a055a805",
+ "sha256:443c4a81bb10daed9a8f334365fe52542771f25aedaf889fd323a853ce7377d6",
+ "sha256:4a02ded6cd4f0a5562a8887df8b3bd14e822a90f97ac5e544c162899bc467664",
+ "sha256:53a583b6637ab4c4e3591a15bc9db855b8d9dee9a669b550f311480acab6eb08",
+ "sha256:63efa177ff54aec6e1c0aefaa1a241232dcd37413835a9b674b6e3f0ae2bfd3e",
+ "sha256:74f57f24754fe349223792466a709f8e0c093205ff0dca557af51072ff47ab18",
+ "sha256:7e1ce50266f4f70bf41a2c6dc4358afadae90e2a1e5342d3c08883df1675374f",
+ "sha256:81ef806b1fef6b06dcebad789f988d3b37ccaee225695cf3e07648eee0fc6b73",
+ "sha256:846da004a5804145a5f441b8530b4bf35afbf7da70f82409f151695b127213d5",
+ "sha256:8ac43ae87929a5982f5948ceda07001ee5e83227fd69cf55b109144938d96984",
+ "sha256:9762ea51a8fc2a88b70cf2995e5675b38d93bf36bd67d91721c309df184f49bd",
+ "sha256:a2a431ee15799d6db9fe80c82b055bae5a752bef645bba795e8e52687c69efe3",
+ "sha256:bf7a1932ac4176486eab36a19ed4c0492da5d97123f1406cf15e41b05e787d2e",
+ "sha256:c2e6fc39c4ab499049df3bdf567f768a723a5e8464816e8f009f121a5a9f4405",
+ "sha256:cbeb489927bd7af4aa98d4b261af9a5bc025bd87f0e3547e11584be9e9427be2",
+ "sha256:d03b5621a135bffecad2c73e9f4deb1a0f977b9a8ffe6f8e002bf6c9d07b918c",
+ "sha256:d56e96520b1020449bbace2b78b603442e7e378a9b3bd68de65c782db1507995",
+ "sha256:df6b6c6d742395dd77a23ea3728ab62f98379eff8fb61be2744d4679ab678f73",
+ "sha256:e1be4655c7ef6e1bbe6b5d0403526601323420bcf414598955968c9ef3eb7d16",
+ "sha256:f18c716be16bc1fea8e95def49edf46b82fccaa88587a45f8dc0ff6ab5d8e0a7",
+ "sha256:f46304d6f0c6ab8e52770addfa2fc41e6629495548862279641972b6215451cd",
+ "sha256:f7b178f11ed3664fd0e995a47ed2b5ff0a12d893e41dd0494f406d1cf555cab7"
],
- "markers": "python_version >= '3.7'",
- "version": "==43.0.1"
+ "markers": "python_full_version >= '3.7.0'",
+ "version": "==43.0.3"
},
"exceptiongroup": {
"hashes": [
@@ -894,7 +913,7 @@
"sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3",
"sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"
],
- "markers": "python_version >= '3.7'",
+ "markers": "python_full_version >= '3.7.0'",
"version": "==2.0.0"
},
"jinja2": {
@@ -902,7 +921,7 @@
"sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369",
"sha256:bc5dd2abb727a5319567b7a813e6a2e7318c39f4f487cfe6c89c6f9c7d25197d"
],
- "markers": "python_version >= '3.7'",
+ "markers": "python_full_version >= '3.7.0'",
"version": "==3.1.4"
},
"jmespath": {
@@ -915,70 +934,70 @@
},
"markupsafe": {
"hashes": [
- "sha256:0778de17cff1acaeccc3ff30cd99a3fd5c50fc58ad3d6c0e0c4c58092b859396",
- "sha256:0f84af7e813784feb4d5e4ff7db633aba6c8ca64a833f61d8e4eade234ef0c38",
- "sha256:17b2aea42a7280db02ac644db1d634ad47dcc96faf38ab304fe26ba2680d359a",
- "sha256:242d6860f1fd9191aef5fae22b51c5c19767f93fb9ead4d21924e0bcb17619d8",
- "sha256:244dbe463d5fb6d7ce161301a03a6fe744dac9072328ba9fc82289238582697b",
- "sha256:26627785a54a947f6d7336ce5963569b5d75614619e75193bdb4e06e21d447ad",
- "sha256:2a4b34a8d14649315c4bc26bbfa352663eb51d146e35eef231dd739d54a5430a",
- "sha256:2ae99f31f47d849758a687102afdd05bd3d3ff7dbab0a8f1587981b58a76152a",
- "sha256:312387403cd40699ab91d50735ea7a507b788091c416dd007eac54434aee51da",
- "sha256:3341c043c37d78cc5ae6e3e305e988532b072329639007fd408a476642a89fd6",
- "sha256:33d1c36b90e570ba7785dacd1faaf091203d9942bc036118fab8110a401eb1a8",
- "sha256:3e683ee4f5d0fa2dde4db77ed8dd8a876686e3fc417655c2ece9a90576905344",
- "sha256:3ffb4a8e7d46ed96ae48805746755fadd0909fea2306f93d5d8233ba23dda12a",
- "sha256:40621d60d0e58aa573b68ac5e2d6b20d44392878e0bfc159012a5787c4e35bc8",
- "sha256:40f1e10d51c92859765522cbd79c5c8989f40f0419614bcdc5015e7b6bf97fc5",
- "sha256:45d42d132cff577c92bfba536aefcfea7e26efb975bd455db4e6602f5c9f45e7",
- "sha256:48488d999ed50ba8d38c581d67e496f955821dc183883550a6fbc7f1aefdc170",
- "sha256:4935dd7883f1d50e2ffecca0aa33dc1946a94c8f3fdafb8df5c330e48f71b132",
- "sha256:4c2d64fdba74ad16138300815cfdc6ab2f4647e23ced81f59e940d7d4a1469d9",
- "sha256:4c8817557d0de9349109acb38b9dd570b03cc5014e8aabf1cbddc6e81005becd",
- "sha256:4ffaaac913c3f7345579db4f33b0020db693f302ca5137f106060316761beea9",
- "sha256:5a4cb365cb49b750bdb60b846b0c0bc49ed62e59a76635095a179d440540c346",
- "sha256:62fada2c942702ef8952754abfc1a9f7658a4d5460fabe95ac7ec2cbe0d02abc",
- "sha256:67c519635a4f64e495c50e3107d9b4075aec33634272b5db1cde839e07367589",
- "sha256:6a54c43d3ec4cf2a39f4387ad044221c66a376e58c0d0e971d47c475ba79c6b5",
- "sha256:7044312a928a66a4c2a22644147bc61a199c1709712069a344a3fb5cfcf16915",
- "sha256:730d86af59e0e43ce277bb83970530dd223bf7f2a838e086b50affa6ec5f9295",
- "sha256:800100d45176652ded796134277ecb13640c1a537cad3b8b53da45aa96330453",
- "sha256:80fcbf3add8790caddfab6764bde258b5d09aefbe9169c183f88a7410f0f6dea",
- "sha256:82b5dba6eb1bcc29cc305a18a3c5365d2af06ee71b123216416f7e20d2a84e5b",
- "sha256:852dc840f6d7c985603e60b5deaae1d89c56cb038b577f6b5b8c808c97580f1d",
- "sha256:8ad4ad1429cd4f315f32ef263c1342166695fad76c100c5d979c45d5570ed58b",
- "sha256:8ae369e84466aa70f3154ee23c1451fda10a8ee1b63923ce76667e3077f2b0c4",
- "sha256:93e8248d650e7e9d49e8251f883eed60ecbc0e8ffd6349e18550925e31bd029b",
- "sha256:973a371a55ce9ed333a3a0f8e0bcfae9e0d637711534bcb11e130af2ab9334e7",
- "sha256:9ba25a71ebf05b9bb0e2ae99f8bc08a07ee8e98c612175087112656ca0f5c8bf",
- "sha256:a10860e00ded1dd0a65b83e717af28845bb7bd16d8ace40fe5531491de76b79f",
- "sha256:a4792d3b3a6dfafefdf8e937f14906a51bd27025a36f4b188728a73382231d91",
- "sha256:a7420ceda262dbb4b8d839a4ec63d61c261e4e77677ed7c66c99f4e7cb5030dd",
- "sha256:ad91738f14eb8da0ff82f2acd0098b6257621410dcbd4df20aaa5b4233d75a50",
- "sha256:b6a387d61fe41cdf7ea95b38e9af11cfb1a63499af2759444b99185c4ab33f5b",
- "sha256:b954093679d5750495725ea6f88409946d69cfb25ea7b4c846eef5044194f583",
- "sha256:bbde71a705f8e9e4c3e9e33db69341d040c827c7afa6789b14c6e16776074f5a",
- "sha256:beeebf760a9c1f4c07ef6a53465e8cfa776ea6a2021eda0d0417ec41043fe984",
- "sha256:c91b394f7601438ff79a4b93d16be92f216adb57d813a78be4446fe0f6bc2d8c",
- "sha256:c97ff7fedf56d86bae92fa0a646ce1a0ec7509a7578e1ed238731ba13aabcd1c",
- "sha256:cb53e2a99df28eee3b5f4fea166020d3ef9116fdc5764bc5117486e6d1211b25",
- "sha256:cbf445eb5628981a80f54087f9acdbf84f9b7d862756110d172993b9a5ae81aa",
- "sha256:d06b24c686a34c86c8c1fba923181eae6b10565e4d80bdd7bc1c8e2f11247aa4",
- "sha256:d98e66a24497637dd31ccab090b34392dddb1f2f811c4b4cd80c230205c074a3",
- "sha256:db15ce28e1e127a0013dfb8ac243a8e392db8c61eae113337536edb28bdc1f97",
- "sha256:db842712984e91707437461930e6011e60b39136c7331e971952bb30465bc1a1",
- "sha256:e24bfe89c6ac4c31792793ad9f861b8f6dc4546ac6dc8f1c9083c7c4f2b335cd",
- "sha256:e81c52638315ff4ac1b533d427f50bc0afc746deb949210bc85f05d4f15fd772",
- "sha256:e9393357f19954248b00bed7c56f29a25c930593a77630c719653d51e7669c2a",
- "sha256:ee3941769bd2522fe39222206f6dd97ae83c442a94c90f2b7a25d847d40f4729",
- "sha256:f31ae06f1328595d762c9a2bf29dafd8621c7d3adc130cbb46278079758779ca",
- "sha256:f94190df587738280d544971500b9cafc9b950d32efcb1fba9ac10d84e6aa4e6",
- "sha256:fa7d686ed9883f3d664d39d5a8e74d3c5f63e603c2e3ff0abcba23eac6542635",
- "sha256:fb532dd9900381d2e8f48172ddc5a59db4c445a11b9fab40b3b786da40d3b56b",
- "sha256:fe32482b37b4b00c7a52a07211b479653b7fe4f22b2e481b9a9b099d8a430f2f"
+ "sha256:0bff5e0ae4ef2e1ae4fdf2dfd5b76c75e5c2fa4132d05fc1b0dabcd20c7e28c4",
+ "sha256:0f4ca02bea9a23221c0182836703cbf8930c5e9454bacce27e767509fa286a30",
+ "sha256:1225beacc926f536dc82e45f8a4d68502949dc67eea90eab715dea3a21c1b5f0",
+ "sha256:131a3c7689c85f5ad20f9f6fb1b866f402c445b220c19fe4308c0b147ccd2ad9",
+ "sha256:15ab75ef81add55874e7ab7055e9c397312385bd9ced94920f2802310c930396",
+ "sha256:1a9d3f5f0901fdec14d8d2f66ef7d035f2157240a433441719ac9a3fba440b13",
+ "sha256:1c99d261bd2d5f6b59325c92c73df481e05e57f19837bdca8413b9eac4bd8028",
+ "sha256:1e084f686b92e5b83186b07e8a17fc09e38fff551f3602b249881fec658d3eca",
+ "sha256:2181e67807fc2fa785d0592dc2d6206c019b9502410671cc905d132a92866557",
+ "sha256:2cb8438c3cbb25e220c2ab33bb226559e7afb3baec11c4f218ffa7308603c832",
+ "sha256:3169b1eefae027567d1ce6ee7cae382c57fe26e82775f460f0b2778beaad66c0",
+ "sha256:3809ede931876f5b2ec92eef964286840ed3540dadf803dd570c3b7e13141a3b",
+ "sha256:38a9ef736c01fccdd6600705b09dc574584b89bea478200c5fbf112a6b0d5579",
+ "sha256:3d79d162e7be8f996986c064d1c7c817f6df3a77fe3d6859f6f9e7be4b8c213a",
+ "sha256:444dcda765c8a838eaae23112db52f1efaf750daddb2d9ca300bcae1039adc5c",
+ "sha256:48032821bbdf20f5799ff537c7ac3d1fba0ba032cfc06194faffa8cda8b560ff",
+ "sha256:4aa4e5faecf353ed117801a068ebab7b7e09ffb6e1d5e412dc852e0da018126c",
+ "sha256:52305740fe773d09cffb16f8ed0427942901f00adedac82ec8b67752f58a1b22",
+ "sha256:569511d3b58c8791ab4c2e1285575265991e6d8f8700c7be0e88f86cb0672094",
+ "sha256:57cb5a3cf367aeb1d316576250f65edec5bb3be939e9247ae594b4bcbc317dfb",
+ "sha256:5b02fb34468b6aaa40dfc198d813a641e3a63b98c2b05a16b9f80b7ec314185e",
+ "sha256:6381026f158fdb7c72a168278597a5e3a5222e83ea18f543112b2662a9b699c5",
+ "sha256:6af100e168aa82a50e186c82875a5893c5597a0c1ccdb0d8b40240b1f28b969a",
+ "sha256:6c89876f41da747c8d3677a2b540fb32ef5715f97b66eeb0c6b66f5e3ef6f59d",
+ "sha256:6e296a513ca3d94054c2c881cc913116e90fd030ad1c656b3869762b754f5f8a",
+ "sha256:70a87b411535ccad5ef2f1df5136506a10775d267e197e4cf531ced10537bd6b",
+ "sha256:7e94c425039cde14257288fd61dcfb01963e658efbc0ff54f5306b06054700f8",
+ "sha256:846ade7b71e3536c4e56b386c2a47adf5741d2d8b94ec9dc3e92e5e1ee1e2225",
+ "sha256:88416bd1e65dcea10bc7569faacb2c20ce071dd1f87539ca2ab364bf6231393c",
+ "sha256:88b49a3b9ff31e19998750c38e030fc7bb937398b1f78cfa599aaef92d693144",
+ "sha256:8c4e8c3ce11e1f92f6536ff07154f9d49677ebaaafc32db9db4620bc11ed480f",
+ "sha256:8e06879fc22a25ca47312fbe7c8264eb0b662f6db27cb2d3bbbc74b1df4b9b87",
+ "sha256:9025b4018f3a1314059769c7bf15441064b2207cb3f065e6ea1e7359cb46db9d",
+ "sha256:93335ca3812df2f366e80509ae119189886b0f3c2b81325d39efdb84a1e2ae93",
+ "sha256:9778bd8ab0a994ebf6f84c2b949e65736d5575320a17ae8984a77fab08db94cf",
+ "sha256:9e2d922824181480953426608b81967de705c3cef4d1af983af849d7bd619158",
+ "sha256:a123e330ef0853c6e822384873bef7507557d8e4a082961e1defa947aa59ba84",
+ "sha256:a904af0a6162c73e3edcb969eeeb53a63ceeb5d8cf642fade7d39e7963a22ddb",
+ "sha256:ad10d3ded218f1039f11a75f8091880239651b52e9bb592ca27de44eed242a48",
+ "sha256:b424c77b206d63d500bcb69fa55ed8d0e6a3774056bdc4839fc9298a7edca171",
+ "sha256:b5a6b3ada725cea8a5e634536b1b01c30bcdcd7f9c6fff4151548d5bf6b3a36c",
+ "sha256:ba8062ed2cf21c07a9e295d5b8a2a5ce678b913b45fdf68c32d95d6c1291e0b6",
+ "sha256:ba9527cdd4c926ed0760bc301f6728ef34d841f405abf9d4f959c478421e4efd",
+ "sha256:bbcb445fa71794da8f178f0f6d66789a28d7319071af7a496d4d507ed566270d",
+ "sha256:bcf3e58998965654fdaff38e58584d8937aa3096ab5354d493c77d1fdd66d7a1",
+ "sha256:c0ef13eaeee5b615fb07c9a7dadb38eac06a0608b41570d8ade51c56539e509d",
+ "sha256:cabc348d87e913db6ab4aa100f01b08f481097838bdddf7c7a84b7575b7309ca",
+ "sha256:cdb82a876c47801bb54a690c5ae105a46b392ac6099881cdfb9f6e95e4014c6a",
+ "sha256:cfad01eed2c2e0c01fd0ecd2ef42c492f7f93902e39a42fc9ee1692961443a29",
+ "sha256:d16a81a06776313e817c951135cf7340a3e91e8c1ff2fac444cfd75fffa04afe",
+ "sha256:d8213e09c917a951de9d09ecee036d5c7d36cb6cb7dbaece4c71a60d79fb9798",
+ "sha256:e07c3764494e3776c602c1e78e298937c3315ccc9043ead7e685b7f2b8d47b3c",
+ "sha256:e17c96c14e19278594aa4841ec148115f9c7615a47382ecb6b82bd8fea3ab0c8",
+ "sha256:e444a31f8db13eb18ada366ab3cf45fd4b31e4db1236a4448f68778c1d1a5a2f",
+ "sha256:e6a2a455bd412959b57a172ce6328d2dd1f01cb2135efda2e4576e8a23fa3b0f",
+ "sha256:eaa0a10b7f72326f1372a713e73c3f739b524b3af41feb43e4921cb529f5929a",
+ "sha256:eb7972a85c54febfb25b5c4b4f3af4dcc731994c7da0d8a0b4a6eb0640e1d178",
+ "sha256:ee55d3edf80167e48ea11a923c7386f4669df67d7994554387f84e7d8b0a2bf0",
+ "sha256:f3818cb119498c0678015754eba762e0d61e5b52d34c8b13d770f0719f7b1d79",
+ "sha256:f8b3d067f2e40fe93e1ccdd6b2e1d16c43140e76f02fb1319a05cf2b79d99430",
+ "sha256:fcabf5ff6eea076f859677f5f0b6b5c1a51e70a376b0579e0eadef8db48c6b50"
],
"markers": "python_version >= '3.9'",
- "version": "==3.0.1"
+ "version": "==3.0.2"
},
"mccabe": {
"hashes": [
@@ -990,11 +1009,11 @@
},
"moto": {
"hashes": [
- "sha256:165a291ac0b983f53a09f67f9841f72214c5a1b0c56392d88f7035a6a8718fca",
- "sha256:6b56b7bb5675d60e79890c9867e446f29d7a5be02051238b8df079f649270130"
+ "sha256:8a7ad2f53a2e6cc9db2ff65c0e0d4b5d7e78bc00b825c9e1ff6cc394371e76e9",
+ "sha256:8e25401f7d7910e19a732b417e0d503ef86cf4de9114a273dd62679a42f3be1c"
],
"index": "pypi",
- "version": "==5.0.17"
+ "version": "==5.0.18"
},
"packaging": {
"hashes": [
@@ -1193,11 +1212,11 @@
},
"xmltodict": {
"hashes": [
- "sha256:338c8431e4fc554517651972d62f06958718f6262b04316917008e8fd677a6b0",
- "sha256:3ef4a7b71c08f19047fcbea572e1d7f4207ab269da1565b5d40e9823d3894e63"
+ "sha256:201e7c28bb210e374999d1dde6382923ab0ed1a8a5faeece48ab525b7810a553",
+ "sha256:20cc7d723ed729276e808f26fb6b3599f786cbc37e06c65e192ba77c40f20aac"
],
"markers": "python_version >= '3.6'",
- "version": "==0.14.1"
+ "version": "==0.14.2"
}
}
}
diff --git a/ecs/crm-datafetch/tests/aws/test_s3.py b/ecs/crm-datafetch/tests/aws/test_s3.py
index 29734b8b..aad83041 100644
--- a/ecs/crm-datafetch/tests/aws/test_s3.py
+++ b/ecs/crm-datafetch/tests/aws/test_s3.py
@@ -1,7 +1,8 @@
import os
import pytest
-from src.aws.s3 import BackupBucket, ConfigBucket, DataBucket, S3Resource
+
+from src.aws.s3 import BackupBucket, ConfigBucket, DataBucket, S3Client
@pytest.fixture
@@ -15,7 +16,7 @@ def s3_test(s3_client, bucket_name):
yield
-class TestS3Resource:
+class TestS3Client:
def test_get_object(self, s3_test, s3_client, bucket_name):
"""
@@ -31,7 +32,7 @@ class TestS3Resource:
s3_client.put_object(Bucket=bucket_name, Key='hogehoge/test.txt', Body=b'aaaaaaaaaaaaaaa')
# Act
- sut = S3Resource(bucket_name)
+ sut = S3Client(bucket_name)
actual = sut.get_object('hogehoge/test.txt')
# Assert
@@ -48,7 +49,7 @@ class TestS3Resource:
"""
# Arrange
# Act
- sut = S3Resource(bucket_name)
+ sut = S3Client(bucket_name)
with pytest.raises(Exception):
# Assert
sut.get_object('hogehoge/test.txt')
@@ -68,7 +69,7 @@ class TestS3Resource:
with open(file_path, mode='w') as f:
f.write('aaaaaaaaaaaaaaa')
- sut = S3Resource(bucket_name)
+ sut = S3Client(bucket_name)
sut.put_object('hogehoge/test.txt', file_path)
actual = s3_client.get_object(Bucket=bucket_name, Key='hogehoge/test.txt')
@@ -87,7 +88,7 @@ class TestS3Resource:
"""
# Arrange
# Act
- sut = S3Resource(bucket_name)
+ sut = S3Client(bucket_name)
with pytest.raises(Exception):
# Assert
sut.put_object('hogehoge/test.txt', 'aaaaaaaaaaaaaaa')
@@ -108,7 +109,7 @@ class TestS3Resource:
s3_client.create_bucket(Bucket=for_copy_bucket)
s3_client.put_object(Bucket=bucket_name, Key='hogehoge/test.txt', Body=b'aaaaaaaaaaaaaaa')
- sut = S3Resource(bucket_name)
+ sut = S3Client(bucket_name)
sut.copy(bucket_name, 'hogehoge/test.txt', for_copy_bucket, 'test.txt')
actual = s3_client.get_object(Bucket=for_copy_bucket, Key='test.txt')
@@ -125,7 +126,7 @@ class TestS3Resource:
"""
# Arrange
# Act
- sut = S3Resource(bucket_name)
+ sut = S3Client(bucket_name)
with pytest.raises(Exception):
# Assert
sut.copy(bucket_name, 'hogehoge/test.txt', 'for_copy_bucket', 'test.txt')
@@ -140,7 +141,7 @@ class TestS3Resource:
- インスタンス生成時に例外が発生すること
"""
with pytest.raises(Exception) as e:
- S3Resource()
+ S3Client()
assert e.value.args[0] == "__init__() missing 1 required positional argument: 'bucket_name'"
diff --git a/ecs/crm-datafetch/tests/conftest.py b/ecs/crm-datafetch/tests/conftest.py
index b86b29d9..06920f6a 100644
--- a/ecs/crm-datafetch/tests/conftest.py
+++ b/ecs/crm-datafetch/tests/conftest.py
@@ -4,8 +4,7 @@ from datetime import datetime
import boto3
import pytest
-from moto import mock_s3
-from py.xml import html # type: ignore
+from moto import mock_aws
from . import docstring_parser
@@ -21,7 +20,7 @@ def aws_credentials():
@pytest.fixture
def s3_client(aws_credentials):
- with mock_s3():
+ with mock_aws():
conn = boto3.client("s3", region_name="us-east-1")
yield conn
@@ -35,18 +34,18 @@ def pytest_html_report_title(report):
def pytest_html_results_table_header(cells):
del cells[2:]
- cells.insert(3, html.th("Cases"))
- cells.insert(4, html.th("Arranges"))
- cells.insert(5, html.th("Expects"))
- cells.append(html.th("Time", class_="sortable time", col="time"))
+ cells.insert(3, '
Cases | ')
+ cells.insert(4, 'Arranges | ')
+ cells.insert(5, 'Expects | ')
+ cells.append('Time | ')
def pytest_html_results_table_row(report, cells):
del cells[2:]
- cells.insert(3, html.td(html.pre(report.cases))) # 「テスト内容」をレポートに出力
- cells.insert(4, html.td(html.pre(report.arranges))) # 「期待結果」をレポートに出力
- cells.insert(5, html.td(html.pre(report.expects))) # 「期待結果」をレポートに出力
- cells.append(html.td(datetime.now(), class_="col-time")) # ついでに「時間」もレポートに出力
+ cells.insert(3, f'{report.cases} | ') # 「テスト内容」をレポートに出力
+ cells.insert(4, f'{report.arranges} | ') # 「期待結果」をレポートに出力
+ cells.insert(5, f'{report.expects} | ') # 「期待結果」をレポートに出力
+ cells.append(f'{datetime.now()} | ') # ついでに「時間」もレポートに出力
@pytest.hookimpl(hookwrapper=True)
diff --git a/s3/config/crm/object_info/crm_object_list_diff.json b/s3/config/crm/object_info/crm_object_list_diff.json
index 2867100a..d08d1c7f 100644
--- a/s3/config/crm/object_info/crm_object_list_diff.json
+++ b/s3/config/crm/object_info/crm_object_list_diff.json
@@ -414,7 +414,8 @@
"ewizard_link__c",
"keywords__c",
"original_material_approved_in_veritas__c",
- "trade_team__c"
+ "trade_team__c",
+ "Publish_Method_vod__c"
],
"is_skip": false,
"is_update_last_fetch_datetime": true
@@ -628,7 +629,8 @@
"MSJ_DirectMail_Status__c",
"EM_Event_Team_Member_vod__c",
"Group_Name_vod__c",
- "Role_vod__c"
+ "Role_vod__c",
+ "MSJ_Attendee_Media__c"
],
"is_skip": false,
"is_update_last_fetch_datetime": true
@@ -702,7 +704,8 @@
"trade_team__c",
"MSJ_Start_Date__c",
"MSJ_End_Date__c",
- "MSJ_Strategic_Message__c"
+ "MSJ_Strategic_Message__c",
+ "Media_Type_vod__c"
],
"is_skip": false,
"is_update_last_fetch_datetime": true
@@ -1332,7 +1335,6 @@
"PermissionsMergeTopics",
"PermissionsSubscribeToLightningReports",
"PermissionsManagePvtRptsAndDashbds",
- "PermissionsAllowLightningLogin",
"PermissionsCampaignInfluence2",
"PermissionsViewDataAssessment",
"PermissionsCanApproveFeedPost",
@@ -1367,12 +1369,10 @@
"PermissionsApexRestServices",
"PermissionsEnableCommunityAppLauncher",
"PermissionsGiveRecognitionBadge",
- "PermissionsAllowObjectDetection",
"PermissionsSalesforceIQInternal",
"PermissionsUseMySearch",
"PermissionsLtngPromoReserved01UserPerm",
"PermissionsManageSubscriptions",
- "PermissionsAllowObjectDetectionTraining",
"PermissionsManageSurveys",
"PermissionsUseAssistantDialog",
"PermissionsUseQuerySuggestions",
@@ -1418,11 +1418,12 @@
"PermissionsNativeWebviewScrolling",
"PermissionsViewDeveloperName",
"PermissionsBypassMFAForUiLogins",
- "PermissionsClientSecretRotation",
"PermissionsUpdateReportTypeReferences",
"PermissionsAccessToServiceProcess",
"PermissionsManageOrchInstsAndWorkItems",
"PermissionsCMSECEAuthoringAccess",
+ "PermissionsManageDataspaceScope",
+ "PermissionsConfigureDataspaceScope",
"PermissionsEnableIPFSUpload",
"PermissionsEnableBCTransactionPolling",
"PermissionsFSCArcGraphCommunityUser",
@@ -1502,6 +1503,7 @@
"VExternal_Id_vod__c",
"Viewport_Height_vod__c",
"Viewport_Width_vod__c",
+ "Medical_Event_vod__c",
"Color_vod__c",
"Icon_vod__c",
"MCD_Primary_Key_vod__c",
@@ -1649,7 +1651,8 @@
"MSJ_Hospital_Name_Disp__c",
"MSJ_Hospital__c",
"MSJ_Chatbot_Check__c",
- "MSJ_File_Attached__c"
+ "MSJ_File_Attached__c",
+ "MSJ_Incoming_Call_Date__c"
],
"is_skip": false,
"is_update_last_fetch_datetime": true
@@ -1804,7 +1807,6 @@
"UserPreferencesShowFaxToGuestUsers",
"UserPreferencesShowStreetAddressToGuestUsers",
"UserPreferencesLightningExperiencePreferred",
- "UserPreferencesPreviewLightning",
"UserPreferencesHideEndUserOnboardingAssistantModal",
"UserPreferencesHideLightningMigrationModal",
"UserPreferencesHideSfxWelcomeMat",
@@ -1915,9 +1917,7 @@
"MS_Outlook_Last_Push_Activity_vod__c",
"Enable_MS_Outlook_Calendar_vod__c",
"Last_iPad_Updates_Applied_vod__c",
- "Last_iPhone_Updates_Applied_vod__c",
- "UserPreferencesHideInvoicesRedirectConfirmation",
- "UserPreferencesHideStatementsRedirectConfirmation"
+ "Last_iPhone_Updates_Applied_vod__c"
],
"is_skip": false,
"is_update_last_fetch_datetime": true
@@ -2658,7 +2658,8 @@
"MSJ_Title__c",
"MSJ_XLK_Segment__c",
"MSJ_Main_Treatment_Plan__c",
- "MSJ_Optimal_Visiting_Hours__c"
+ "MSJ_Optimal_Visiting_Hours__c",
+ "MSJ_CA_Primary_Parent_Update_Date__c"
],
"is_skip": false,
"is_update_last_fetch_datetime": true
@@ -3131,7 +3132,8 @@
"Email_Source_vod__c",
"Subject_vod__c",
"User_Input_Text_vod__c",
- "Email_Group_Id_vod__c"
+ "Email_Group_Id_vod__c",
+ "List_Unsubscribe_Header_vod__c"
],
"is_skip": false,
"is_update_last_fetch_datetime": true
@@ -3186,7 +3188,8 @@
"Category_vod__c",
"MSJ_Data_Id__c",
"MSJ_Reason_unformatted__c",
- "MSJ_reason_id__c"
+ "MSJ_reason_id__c",
+ "MSJ_use_case__c"
],
"is_skip": false,
"is_update_last_fetch_datetime": true
diff --git a/s3/data/crm/settings/CRM_Child_Account_vod__c.txt b/s3/data/crm/settings/CRM_Child_Account_vod__c.txt
index ce397749..cc9e0716 100644
--- a/s3/data/crm/settings/CRM_Child_Account_vod__c.txt
+++ b/s3/data/crm/settings/CRM_Child_Account_vod__c.txt
@@ -4,9 +4,9 @@ utf-8
"
CRLF
1
-59
-Id,IsDeleted,Name,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Parent_Account_vod__c,Child_Account_vod__c,External_ID_vod__c,Mobile_ID_vod__c,Primary_vod__c,Copy_Address_vod__c,Child_Name_vod__c,Parent_Name_vod__c,Parent_Child_Name_vod__c,Account_Code__c,Child_Department__c,Child_Role__c,Child_Title__c,Child_Remark__c,MSJ_1C_segment__c,MSJ_BU_FE__c,MSJ_BU_ONC__c,MSJ_BVC_Segment__c,MSJ_CE_segment__c,MSJ_Child_Account_Link__c,MSJ_DCF_DR_Code__c,MSJ_DCF_HP_Code__c,MSJ_DR_Change_Log__c,MSJ_Delete__c,MSJ_Department__c,MSJ_EB_CRC_Segment__c,MSJ_EB_HN_Segment__c,MSJ_EB_H_N_LA_Segment__c,MSJ_EB_H_N_RM_Segment__c,MSJ_External_ID__c,MSJ_Fax__c,MSJ_GF2_segment__c,MSJ_GF_segment__c,MSJ_KOL_LOL__c,MSJ_KOL__c,MSJ_ONC_HP_Segment__c,MSJ_OPTIN_target__c,MSJ_OV_segment__c,MSJ_Parent_Child_Name__c,MSJ_Phone__c,MSJ_Remark__c,MSJ_Target_Call_Num__c,MSJ_Tech_segment__c,MSJ_Title__c,MSJ_XLK_Segment__c,MSJ_Main_Treatment_Plan__c,MSJ_Optimal_Visiting_Hours__c
-Id,IsDeleted,Name,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Parent_Account_vod__c,Child_Account_vod__c,External_ID_vod__c,Mobile_ID_vod__c,Primary_vod__c,Copy_Address_vod__c,Child_Name_vod__c,Parent_Name_vod__c,Parent_Child_Name_vod__c,Account_Code__c,Child_Department__c,Child_Role__c,Child_Title__c,Child_Remark__c,MSJ_1C_segment__c,MSJ_BU_FE__c,MSJ_BU_ONC__c,MSJ_BVC_Segment__c,MSJ_CE_segment__c,MSJ_Child_Account_Link__c,MSJ_DCF_DR_Code__c,MSJ_DCF_HP_Code__c,MSJ_DR_Change_Log__c,MSJ_Delete__c,MSJ_Department__c,MSJ_EB_CRC_Segment__c,MSJ_EB_HN_Segment__c,MSJ_EB_H_N_LA_Segment__c,MSJ_EB_H_N_RM_Segment__c,MSJ_External_ID__c,MSJ_Fax__c,MSJ_GF2_segment__c,MSJ_GF_segment__c,MSJ_KOL_LOL__c,MSJ_KOL__c,MSJ_ONC_HP_Segment__c,MSJ_OPTIN_target__c,MSJ_OV_segment__c,MSJ_Parent_Child_Name__c,MSJ_Phone__c,MSJ_Remark__c,MSJ_Target_Call_Num__c,MSJ_Tech_segment__c,MSJ_Title__c,MSJ_XLK_Segment__c,MSJ_Main_Treatment_Plan__c,MSJ_Optimal_Visiting_Hours__c
+60
+Id,IsDeleted,Name,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Parent_Account_vod__c,Child_Account_vod__c,External_ID_vod__c,Mobile_ID_vod__c,Primary_vod__c,Copy_Address_vod__c,Child_Name_vod__c,Parent_Name_vod__c,Parent_Child_Name_vod__c,Account_Code__c,Child_Department__c,Child_Role__c,Child_Title__c,Child_Remark__c,MSJ_1C_segment__c,MSJ_BU_FE__c,MSJ_BU_ONC__c,MSJ_BVC_Segment__c,MSJ_CE_segment__c,MSJ_Child_Account_Link__c,MSJ_DCF_DR_Code__c,MSJ_DCF_HP_Code__c,MSJ_DR_Change_Log__c,MSJ_Delete__c,MSJ_Department__c,MSJ_EB_CRC_Segment__c,MSJ_EB_HN_Segment__c,MSJ_EB_H_N_LA_Segment__c,MSJ_EB_H_N_RM_Segment__c,MSJ_External_ID__c,MSJ_Fax__c,MSJ_GF2_segment__c,MSJ_GF_segment__c,MSJ_KOL_LOL__c,MSJ_KOL__c,MSJ_ONC_HP_Segment__c,MSJ_OPTIN_target__c,MSJ_OV_segment__c,MSJ_Parent_Child_Name__c,MSJ_Phone__c,MSJ_Remark__c,MSJ_Target_Call_Num__c,MSJ_Tech_segment__c,MSJ_Title__c,MSJ_XLK_Segment__c,MSJ_Main_Treatment_Plan__c,MSJ_Optimal_Visiting_Hours__c,MSJ_CA_Primary_Parent_Update_Date__c
+Id,IsDeleted,Name,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Parent_Account_vod__c,Child_Account_vod__c,External_ID_vod__c,Mobile_ID_vod__c,Primary_vod__c,Copy_Address_vod__c,Child_Name_vod__c,Parent_Name_vod__c,Parent_Child_Name_vod__c,Account_Code__c,Child_Department__c,Child_Role__c,Child_Title__c,Child_Remark__c,MSJ_1C_segment__c,MSJ_BU_FE__c,MSJ_BU_ONC__c,MSJ_BVC_Segment__c,MSJ_CE_segment__c,MSJ_Child_Account_Link__c,MSJ_DCF_DR_Code__c,MSJ_DCF_HP_Code__c,MSJ_DR_Change_Log__c,MSJ_Delete__c,MSJ_Department__c,MSJ_EB_CRC_Segment__c,MSJ_EB_HN_Segment__c,MSJ_EB_H_N_LA_Segment__c,MSJ_EB_H_N_RM_Segment__c,MSJ_External_ID__c,MSJ_Fax__c,MSJ_GF2_segment__c,MSJ_GF_segment__c,MSJ_KOL_LOL__c,MSJ_KOL__c,MSJ_ONC_HP_Segment__c,MSJ_OPTIN_target__c,MSJ_OV_segment__c,MSJ_Parent_Child_Name__c,MSJ_Phone__c,MSJ_Remark__c,MSJ_Target_Call_Num__c,MSJ_Tech_segment__c,MSJ_Title__c,MSJ_XLK_Segment__c,MSJ_Main_Treatment_Plan__c,MSJ_Optimal_Visiting_Hours__c,MSJ_CA_Primary_Parent_Update_Date__c
src02.crm_Child_Account_vod__c
org02.crm_Child_Account_vod__c
CRM_Child_Account_vod__c_ex.sql
diff --git a/s3/data/crm/settings/CRM_Clm_Presentation_vod__c.txt b/s3/data/crm/settings/CRM_Clm_Presentation_vod__c.txt
index d8bf1999..2b616874 100644
--- a/s3/data/crm/settings/CRM_Clm_Presentation_vod__c.txt
+++ b/s3/data/crm/settings/CRM_Clm_Presentation_vod__c.txt
@@ -4,9 +4,9 @@ utf-8
"
CRLF
1
-46
-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
-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
+47
+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
src02.crm_Clm_Presentation_vod__c
org02.crm_Clm_Presentation_vod__c
diff --git a/s3/data/crm/settings/CRM_Event_Attendee_vod__c.txt b/s3/data/crm/settings/CRM_Event_Attendee_vod__c.txt
index 6551bcbb..9d3fe011 100644
--- a/s3/data/crm/settings/CRM_Event_Attendee_vod__c.txt
+++ b/s3/data/crm/settings/CRM_Event_Attendee_vod__c.txt
@@ -4,9 +4,9 @@ utf-8
"
CRLF
1
-36
-Id,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,Attendee_vod__c,User_vod__c,Medical_Event_vod__c,Attendee_Type_vod__c,Status_vod__c,Contact_vod__c,Attendee_Name_vod__c,Account_vod__c,Start_Date_vod__c,Signature_vod__c,Signature_Datetime_vod__c,MSJ_Copy_Account_Type__c,MSJ_Evaluation__c,MSJ_Hospital__c,MSJ_Role__c,Mobile_ID_vod__c,MSJ_Evaluation_Comment__c,Position_vod__c,Talk_Title_vod__c,MSJ_Attendee_Reaction__c,MSJ_Registration__c,MSJ_DirectMail_Status__c,EM_Event_Team_Member_vod__c,Group_Name_vod__c,Role_vod__c
-Id,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,Attendee_vod__c,User_vod__c,Medical_Event_vod__c,Attendee_Type_vod__c,Status_vod__c,Contact_vod__c,Attendee_Name_vod__c,Account_vod__c,Start_Date_vod__c,Signature_vod__c,Signature_Datetime_vod__c,MSJ_Copy_Account_Type__c,MSJ_Evaluation__c,MSJ_Hospital__c,MSJ_Role__c,Mobile_ID_vod__c,MSJ_Evaluation_Comment__c,Position_vod__c,Talk_Title_vod__c,MSJ_Attendee_Reaction__c,MSJ_Registration__c,MSJ_DirectMail_Status__c,EM_Event_Team_Member_vod__c,Group_Name_vod__c,Role_vod__c
+37
+Id,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,Attendee_vod__c,User_vod__c,Medical_Event_vod__c,Attendee_Type_vod__c,Status_vod__c,Contact_vod__c,Attendee_Name_vod__c,Account_vod__c,Start_Date_vod__c,Signature_vod__c,Signature_Datetime_vod__c,MSJ_Copy_Account_Type__c,MSJ_Evaluation__c,MSJ_Hospital__c,MSJ_Role__c,Mobile_ID_vod__c,MSJ_Evaluation_Comment__c,Position_vod__c,Talk_Title_vod__c,MSJ_Attendee_Reaction__c,MSJ_Registration__c,MSJ_DirectMail_Status__c,EM_Event_Team_Member_vod__c,Group_Name_vod__c,Role_vod__c,MSJ_Attendee_Media__c
+Id,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,Attendee_vod__c,User_vod__c,Medical_Event_vod__c,Attendee_Type_vod__c,Status_vod__c,Contact_vod__c,Attendee_Name_vod__c,Account_vod__c,Start_Date_vod__c,Signature_vod__c,Signature_Datetime_vod__c,MSJ_Copy_Account_Type__c,MSJ_Evaluation__c,MSJ_Hospital__c,MSJ_Role__c,Mobile_ID_vod__c,MSJ_Evaluation_Comment__c,Position_vod__c,Talk_Title_vod__c,MSJ_Attendee_Reaction__c,MSJ_Registration__c,MSJ_DirectMail_Status__c,EM_Event_Team_Member_vod__c,Group_Name_vod__c,Role_vod__c,MSJ_Attendee_Media__c
src02c.crm_Event_Attendee_vod__c
org02.crm_Event_Attendee_vod__c
diff --git a/s3/data/crm/settings/CRM_Key_Message_vod__c.txt b/s3/data/crm/settings/CRM_Key_Message_vod__c.txt
index d4feb972..2eab4178 100644
--- a/s3/data/crm/settings/CRM_Key_Message_vod__c.txt
+++ b/s3/data/crm/settings/CRM_Key_Message_vod__c.txt
@@ -4,9 +4,9 @@ utf-8
"
CRLF
1
-51
-Id,OwnerId,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Description_vod__c,Product_vod__c,Product_Strategy_vod__c,Display_Order_vod__c,Active_vod__c,Category_vod__c,Vehicle_vod__c,CLM_ID_vod__c,Custom_Reaction_vod__c,Slide_Version_vod__c,Language_vod__c,Media_File_CRC_vod__c,Media_File_Name_vod__c,Media_File_Size_vod__c,Segment_vod__c,Disable_Actions_vod__c,VExternal_Id_vod__c,CDN_Path_vod__c,Status_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,Is_Shared_Resource_vod__c,iOS_Viewer_vod__c,iOS_Resolution_vod__c,approved_for_distribution_date__c,approved_for_use_date__c,business_function__c,ewizard_link__c,expiration_date__c,keywords__c,trade_team__c,MSJ_Start_Date__c,MSJ_End_Date__c,MSJ_Strategic_Message__c
-Id,OwnerId,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Description_vod__c,Product_vod__c,Product_Strategy_vod__c,Display_Order_vod__c,Active_vod__c,Category_vod__c,Vehicle_vod__c,CLM_ID_vod__c,Custom_Reaction_vod__c,Slide_Version_vod__c,Language_vod__c,Media_File_CRC_vod__c,Media_File_Name_vod__c,Media_File_Size_vod__c,Segment_vod__c,Disable_Actions_vod__c,VExternal_Id_vod__c,CDN_Path_vod__c,Status_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,Is_Shared_Resource_vod__c,iOS_Viewer_vod__c,iOS_Resolution_vod__c,approved_for_distribution_date__c,approved_for_use_date__c,business_function__c,ewizard_link__c,expiration_date__c,keywords__c,trade_team__c,MSJ_Start_Date__c,MSJ_End_Date__c,MSJ_Strategic_Message__c
+52
+Id,OwnerId,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Description_vod__c,Product_vod__c,Product_Strategy_vod__c,Display_Order_vod__c,Active_vod__c,Category_vod__c,Vehicle_vod__c,CLM_ID_vod__c,Custom_Reaction_vod__c,Slide_Version_vod__c,Language_vod__c,Media_File_CRC_vod__c,Media_File_Name_vod__c,Media_File_Size_vod__c,Segment_vod__c,Disable_Actions_vod__c,VExternal_Id_vod__c,CDN_Path_vod__c,Status_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,Is_Shared_Resource_vod__c,iOS_Viewer_vod__c,iOS_Resolution_vod__c,approved_for_distribution_date__c,approved_for_use_date__c,business_function__c,ewizard_link__c,expiration_date__c,keywords__c,trade_team__c,MSJ_Start_Date__c,MSJ_End_Date__c,MSJ_Strategic_Message__c,Media_Type_vod__c
+Id,OwnerId,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Description_vod__c,Product_vod__c,Product_Strategy_vod__c,Display_Order_vod__c,Active_vod__c,Category_vod__c,Vehicle_vod__c,CLM_ID_vod__c,Custom_Reaction_vod__c,Slide_Version_vod__c,Language_vod__c,Media_File_CRC_vod__c,Media_File_Name_vod__c,Media_File_Size_vod__c,Segment_vod__c,Disable_Actions_vod__c,VExternal_Id_vod__c,CDN_Path_vod__c,Status_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,Is_Shared_Resource_vod__c,iOS_Viewer_vod__c,iOS_Resolution_vod__c,approved_for_distribution_date__c,approved_for_use_date__c,business_function__c,ewizard_link__c,expiration_date__c,keywords__c,trade_team__c,MSJ_Start_Date__c,MSJ_End_Date__c,MSJ_Strategic_Message__c,Media_Type_vod__c
src02.crm_Key_Message_vod__c
org02.crm_Key_Message_vod__c
diff --git a/s3/data/crm/settings/CRM_Medical_Inquiry_vod__c.txt b/s3/data/crm/settings/CRM_Medical_Inquiry_vod__c.txt
index 1750b9e3..e8741512 100644
--- a/s3/data/crm/settings/CRM_Medical_Inquiry_vod__c.txt
+++ b/s3/data/crm/settings/CRM_Medical_Inquiry_vod__c.txt
@@ -4,9 +4,9 @@ utf-8
"
CRLF
1
-69
-Id,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Account_vod__c,Address_Line_1_vod__c,Address_Line_2_vod__c,City_vod__c,Delivery_Method_vod__c,Email_vod__c,Fax_Number_vod__c,Inquiry_Text__c,Lock_vod__c,Mobile_ID_vod__c,Phone_Number_vod__c,Product__c,Rush_Delivery__c,Signature_Date_vod__c,Signature_vod__c,State_vod__c,Status_vod__c,Zip_vod__c,zvod_Delivery_Method_vod__c,zvod_Disclaimer_vod__c,Submitted_By_Mobile_vod__c,Disclaimer_vod__c,Entity_Reference_Id_vod__c,Call2_vod__c,Country_vod__c,Override_Lock_vod__c,MSJ_Department__c,MSJ_Doctor_Name__c,MSJ_Hospital_Name__c,MSJ_Indication__c,MSJ_Inquiry_Assignment__c,MSJ_Inquiry_Date__c,MSJ_Inquiry_Input_Manager__c,MSJ_Inquiry_Input_User__c,MSJ_MSL_Manager__c,MSJ_Notice_to_MR__c,MSJ_Person_in_charge_1__c,MSJ_Person_in_charge_2__c,MSJ_Product_for_MEC__c,MSJ_Product_for_MR__c,MSJ_Reply_Date__c,MSJ_Reply_User__c,MSJ_Reply__c,MSJ_Title__c,MSJ_AE_Infomation__c,MSJ_FAQ_Number_Report__c,MSJ_Return_Call_Report__c,MSJ_Inquiry_Origin_Report__c,MSJ_AE_Report__c,MSJ_Background__c,MSJ_MSL_Support__c,MSJ_Material_Requirement__c,MSJ_Hospital_Name_Disp__c,MSJ_Hospital__c,MSJ_Chatbot_Check__c,MSJ_File_Attached__c
-Id,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Account_vod__c,Address_Line_1_vod__c,Address_Line_2_vod__c,City_vod__c,Delivery_Method_vod__c,Email_vod__c,Fax_Number_vod__c,Inquiry_Text__c,Lock_vod__c,Mobile_ID_vod__c,Phone_Number_vod__c,Product__c,Rush_Delivery__c,Signature_Date_vod__c,Signature_vod__c,State_vod__c,Status_vod__c,Zip_vod__c,zvod_Delivery_Method_vod__c,zvod_Disclaimer_vod__c,Submitted_By_Mobile_vod__c,Disclaimer_vod__c,Entity_Reference_Id_vod__c,Call2_vod__c,Country_vod__c,Override_Lock_vod__c,MSJ_Department__c,MSJ_Doctor_Name__c,MSJ_Hospital_Name__c,MSJ_Indication__c,MSJ_Inquiry_Assignment__c,MSJ_Inquiry_Date__c,MSJ_Inquiry_Input_Manager__c,MSJ_Inquiry_Input_User__c,MSJ_MSL_Manager__c,MSJ_Notice_to_MR__c,MSJ_Person_in_charge_1__c,MSJ_Person_in_charge_2__c,MSJ_Product_for_MEC__c,MSJ_Product_for_MR__c,MSJ_Reply_Date__c,MSJ_Reply_User__c,MSJ_Reply__c,MSJ_Title__c,MSJ_AE_Infomation__c,MSJ_FAQ_Number_Report__c,MSJ_Return_Call_Report__c,MSJ_Inquiry_Origin_Report__c,MSJ_AE_Report__c,MSJ_Background__c,MSJ_MSL_Support__c,MSJ_Material_Requirement__c,MSJ_Hospital_Name_Disp__c,MSJ_Hospital__c,MSJ_Chatbot_Check__c,MSJ_File_Attached__c
+70
+Id,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Account_vod__c,Address_Line_1_vod__c,Address_Line_2_vod__c,City_vod__c,Delivery_Method_vod__c,Email_vod__c,Fax_Number_vod__c,Inquiry_Text__c,Lock_vod__c,Mobile_ID_vod__c,Phone_Number_vod__c,Product__c,Rush_Delivery__c,Signature_Date_vod__c,Signature_vod__c,State_vod__c,Status_vod__c,Zip_vod__c,zvod_Delivery_Method_vod__c,zvod_Disclaimer_vod__c,Submitted_By_Mobile_vod__c,Disclaimer_vod__c,Entity_Reference_Id_vod__c,Call2_vod__c,Country_vod__c,Override_Lock_vod__c,MSJ_Department__c,MSJ_Doctor_Name__c,MSJ_Hospital_Name__c,MSJ_Indication__c,MSJ_Inquiry_Assignment__c,MSJ_Inquiry_Date__c,MSJ_Inquiry_Input_Manager__c,MSJ_Inquiry_Input_User__c,MSJ_MSL_Manager__c,MSJ_Notice_to_MR__c,MSJ_Person_in_charge_1__c,MSJ_Person_in_charge_2__c,MSJ_Product_for_MEC__c,MSJ_Product_for_MR__c,MSJ_Reply_Date__c,MSJ_Reply_User__c,MSJ_Reply__c,MSJ_Title__c,MSJ_AE_Infomation__c,MSJ_FAQ_Number_Report__c,MSJ_Return_Call_Report__c,MSJ_Inquiry_Origin_Report__c,MSJ_AE_Report__c,MSJ_Background__c,MSJ_MSL_Support__c,MSJ_Material_Requirement__c,MSJ_Hospital_Name_Disp__c,MSJ_Hospital__c,MSJ_Chatbot_Check__c,MSJ_File_Attached__c,MSJ_Incoming_Call_Date__c
+Id,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Account_vod__c,Address_Line_1_vod__c,Address_Line_2_vod__c,City_vod__c,Delivery_Method_vod__c,Email_vod__c,Fax_Number_vod__c,Inquiry_Text__c,Lock_vod__c,Mobile_ID_vod__c,Phone_Number_vod__c,Product__c,Rush_Delivery__c,Signature_Date_vod__c,Signature_vod__c,State_vod__c,Status_vod__c,Zip_vod__c,zvod_Delivery_Method_vod__c,zvod_Disclaimer_vod__c,Submitted_By_Mobile_vod__c,Disclaimer_vod__c,Entity_Reference_Id_vod__c,Call2_vod__c,Country_vod__c,Override_Lock_vod__c,MSJ_Department__c,MSJ_Doctor_Name__c,MSJ_Hospital_Name__c,MSJ_Indication__c,MSJ_Inquiry_Assignment__c,MSJ_Inquiry_Date__c,MSJ_Inquiry_Input_Manager__c,MSJ_Inquiry_Input_User__c,MSJ_MSL_Manager__c,MSJ_Notice_to_MR__c,MSJ_Person_in_charge_1__c,MSJ_Person_in_charge_2__c,MSJ_Product_for_MEC__c,MSJ_Product_for_MR__c,MSJ_Reply_Date__c,MSJ_Reply_User__c,MSJ_Reply__c,MSJ_Title__c,MSJ_AE_Infomation__c,MSJ_FAQ_Number_Report__c,MSJ_Return_Call_Report__c,MSJ_Inquiry_Origin_Report__c,MSJ_AE_Report__c,MSJ_Background__c,MSJ_MSL_Support__c,MSJ_Material_Requirement__c,MSJ_Hospital_Name_Disp__c,MSJ_Hospital__c,MSJ_Chatbot_Check__c,MSJ_File_Attached__c,MSJ_Incoming_Call_Date__c
src02m.crm_Medical_Inquiry_vod__c
org02.crm_Medical_Inquiry_vod__c
diff --git a/s3/data/crm/settings/CRM_Multichannel_Activity_vod__c.txt b/s3/data/crm/settings/CRM_Multichannel_Activity_vod__c.txt
index 392e3390..0e36481a 100644
--- a/s3/data/crm/settings/CRM_Multichannel_Activity_vod__c.txt
+++ b/s3/data/crm/settings/CRM_Multichannel_Activity_vod__c.txt
@@ -4,9 +4,9 @@ utf-8
"
CRLF
1
-55
-Id,OwnerId,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Account_External_ID_Map_vod__c,Account_vod__c,Call_vod__c,City_vod__c,Client_Name_vod__c,Client_OS_vod__c,Client_Type_vod__c,Country_vod__c,Debug_vod__c,Device_vod__c,IP_Address_vod__c,Multichannel_Activity_vod__c,Referring_Site_vod__c,Region_vod__c,Sent_Email_vod__c,Session_Id_vod__c,Site_vod__c,Start_DateTime_vod__c,Total_Duration_vod__c,URL_vod__c,User_Agent_vod__c,VExternal_Id_vod__c,Viewport_Height_vod__c,Viewport_Width_vod__c,Color_vod__c,Icon_vod__c,MCD_Primary_Key_vod__c,Record_Type_Name_vod__c,MSJ_Date_Opened__c,MSJ_Sent_Date__c,MSJ_Email_Subject__c,MSJ_Opens__c,MSJ_Email_Status__c,MSJ_Activity_Name__c,MSJ_Asset__c,MSJ_CIAM_Account__c,MSJ_Channel__c,MSJ_Content__c,MSJ_Registration_Time__c,MSJ_Related_External_Account_Data__c,MSJ_Tag_Id__c
-Id,OwnerId,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Account_External_ID_Map_vod__c,Account_vod__c,Call_vod__c,City_vod__c,Client_Name_vod__c,Client_OS_vod__c,Client_Type_vod__c,Country_vod__c,Debug_vod__c,Device_vod__c,IP_Address_vod__c,Multichannel_Activity_vod__c,Referring_Site_vod__c,Region_vod__c,Sent_Email_vod__c,Session_Id_vod__c,Site_vod__c,Start_DateTime_vod__c,Total_Duration_vod__c,URL_vod__c,User_Agent_vod__c,VExternal_Id_vod__c,Viewport_Height_vod__c,Viewport_Width_vod__c,Color_vod__c,Icon_vod__c,MCD_Primary_Key_vod__c,Record_Type_Name_vod__c,MSJ_Date_Opened__c,MSJ_Sent_Date__c,MSJ_Email_Subject__c,MSJ_Opens__c,MSJ_Email_Status__c,MSJ_Activity_Name__c,MSJ_Asset__c,MSJ_CIAM_Account__c,MSJ_Channel__c,MSJ_Content__c,MSJ_Registration_Time__c,MSJ_Related_External_Account_Data__c,MSJ_Tag_Id__c
+56
+Id,OwnerId,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Account_External_ID_Map_vod__c,Account_vod__c,Call_vod__c,City_vod__c,Client_Name_vod__c,Client_OS_vod__c,Client_Type_vod__c,Country_vod__c,Debug_vod__c,Device_vod__c,IP_Address_vod__c,Multichannel_Activity_vod__c,Referring_Site_vod__c,Region_vod__c,Sent_Email_vod__c,Session_Id_vod__c,Site_vod__c,Start_DateTime_vod__c,Total_Duration_vod__c,URL_vod__c,User_Agent_vod__c,VExternal_Id_vod__c,Viewport_Height_vod__c,Viewport_Width_vod__c,Medical_Event_vod__c,Color_vod__c,Icon_vod__c,MCD_Primary_Key_vod__c,Record_Type_Name_vod__c,MSJ_Date_Opened__c,MSJ_Sent_Date__c,MSJ_Email_Subject__c,MSJ_Opens__c,MSJ_Email_Status__c,MSJ_Activity_Name__c,MSJ_Asset__c,MSJ_CIAM_Account__c,MSJ_Channel__c,MSJ_Content__c,MSJ_Registration_Time__c,MSJ_Related_External_Account_Data__c,MSJ_Tag_Id__c
+Id,OwnerId,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Account_External_ID_Map_vod__c,Account_vod__c,Call_vod__c,City_vod__c,Client_Name_vod__c,Client_OS_vod__c,Client_Type_vod__c,Country_vod__c,Debug_vod__c,Device_vod__c,IP_Address_vod__c,Multichannel_Activity_vod__c,Referring_Site_vod__c,Region_vod__c,Sent_Email_vod__c,Session_Id_vod__c,Site_vod__c,Start_DateTime_vod__c,Total_Duration_vod__c,URL_vod__c,User_Agent_vod__c,VExternal_Id_vod__c,Viewport_Height_vod__c,Viewport_Width_vod__c,Medical_Event_vod__c,Color_vod__c,Icon_vod__c,MCD_Primary_Key_vod__c,Record_Type_Name_vod__c,MSJ_Date_Opened__c,MSJ_Sent_Date__c,MSJ_Email_Subject__c,MSJ_Opens__c,MSJ_Email_Status__c,MSJ_Activity_Name__c,MSJ_Asset__c,MSJ_CIAM_Account__c,MSJ_Channel__c,MSJ_Content__c,MSJ_Registration_Time__c,MSJ_Related_External_Account_Data__c,MSJ_Tag_Id__c
src02c.crm_Multichannel_Activity_vod__c
org02.crm_Multichannel_Activity_vod__c
diff --git a/s3/data/crm/settings/CRM_Profile.txt b/s3/data/crm/settings/CRM_Profile.txt
index 6eae13fd..34191305 100644
--- a/s3/data/crm/settings/CRM_Profile.txt
+++ b/s3/data/crm/settings/CRM_Profile.txt
@@ -4,9 +4,9 @@ utf-8
"
CRLF
1
-255
-Id,Name,PermissionsEmailSingle,PermissionsEmailMass,PermissionsEditTask,PermissionsEditEvent,PermissionsExportReport,PermissionsImportPersonal,PermissionsDataExport,PermissionsManageUsers,PermissionsEditPublicFilters,PermissionsEditPublicTemplates,PermissionsModifyAllData,PermissionsEditBillingInfo,PermissionsManageCases,PermissionsManageSolutions,PermissionsCustomizeApplication,PermissionsEditReadonlyFields,PermissionsRunReports,PermissionsViewSetup,PermissionsTransferAnyEntity,PermissionsNewReportBuilder,PermissionsManageSelfService,PermissionsManageCssUsers,PermissionsActivateContract,PermissionsApproveContract,PermissionsImportLeads,PermissionsManageLeads,PermissionsTransferAnyLead,PermissionsViewAllData,PermissionsEditPublicDocuments,PermissionsViewEncryptedData,PermissionsEditBrandTemplates,PermissionsEditHtmlTemplates,PermissionsManageTranslation,PermissionsDeleteActivatedContract,PermissionsSendSitRequests,PermissionsApiUserOnly,PermissionsManageRemoteAccess,PermissionsCanUseNewDashboardBuilder,PermissionsManageCategories,PermissionsConvertLeads,PermissionsTestInstanceCreate,PermissionsPasswordNeverExpires,PermissionsUseTeamReassignWizards,PermissionsInstallMultiforce,PermissionsPublishMultiforce,PermissionsEditOppLineItemUnitPrice,PermissionsManageTerritories,PermissionsCreateMultiforce,PermissionsBulkApiHardDelete,PermissionsInboundMigrationToolsUser,PermissionsSolutionImport,PermissionsManageCallCenters,PermissionsManageSynonyms,PermissionsOutboundMigrationToolsUser,PermissionsViewContent,PermissionsManageEmailClientConfig,PermissionsEnableNotifications,PermissionsIsSsoEnabled,PermissionsManageDataIntegrations,PermissionsDistributeFromPersWksp,PermissionsViewDataCategories,PermissionsManageDataCategories,PermissionsAuthorApex,PermissionsManageMobile,PermissionsApiEnabled,PermissionsManageCustomReportTypes,PermissionsEditCaseComments,PermissionsTransferAnyCase,PermissionsContentAdministrator,PermissionsCreateWorkspaces,PermissionsManageContentPermissions,PermissionsManageContentProperties,PermissionsManageContentTypes,PermissionsScheduleJob,PermissionsManageExchangeConfig,PermissionsManageAnalyticSnapshots,PermissionsScheduleReports,PermissionsManageBusinessHourHolidays,PermissionsManageDynamicDashboards,PermissionsManageInteraction,PermissionsViewMyTeamsDashboards,PermissionsResetPasswords,PermissionsFlowUFLRequired,PermissionsActivitiesAccess,PermissionsEmailTemplateManagement,PermissionsEmailAdministration,PermissionsChatterFileLink,PermissionsForceTwoFactor,PermissionsViewEventLogFiles,PermissionsManageNetworks,PermissionsManageAuthProviders,PermissionsRunFlow,PermissionsCreateCustomizeDashboards,PermissionsCreateDashboardFolders,PermissionsViewPublicDashboards,PermissionsManageDashbdsInPubFolders,PermissionsCreateCustomizeReports,PermissionsCreateReportFolders,PermissionsViewPublicReports,PermissionsManageReportsInPubFolders,PermissionsEditMyDashboards,PermissionsEditMyReports,PermissionsViewAllUsers,PermissionsConnectOrgToEnvironmentHub,PermissionsCreateCustomizeFilters,PermissionsContentHubUser,PermissionsGovernNetworks,PermissionsSalesConsole,PermissionsTwoFactorApi,PermissionsDeleteTopics,PermissionsEditTopics,PermissionsCreateTopics,PermissionsAssignTopics,PermissionsIdentityEnabled,PermissionsIdentityConnect,PermissionsContentWorkspaces,PermissionsCustomMobileAppsAccess,PermissionsViewHelpLink,PermissionsManageProfilesPermissionsets,PermissionsAssignPermissionSets,PermissionsManageRoles,PermissionsManageIpAddresses,PermissionsManageSharing,PermissionsManageInternalUsers,PermissionsManagePasswordPolicies,PermissionsManageLoginAccessPolicies,PermissionsManageCustomPermissions,PermissionsStdAutomaticActivityCapture,PermissionsManageTwoFactor,PermissionsDebugApex,PermissionsLightningExperienceUser,PermissionsConfigCustomRecs,PermissionsSubmitMacrosAllowed,PermissionsBulkMacrosAllowed,PermissionsManageSessionPermissionSets,PermissionsCreateAuditFields,PermissionsUpdateWithInactiveOwner,PermissionsManageSandboxes,PermissionsAutomaticActivityCapture,PermissionsImportCustomObjects,PermissionsSalesforceIQInbox,PermissionsDelegatedTwoFactor,PermissionsSelectFilesFromSalesforce,PermissionsModerateNetworkUsers,PermissionsMergeTopics,PermissionsSubscribeToLightningReports,PermissionsManagePvtRptsAndDashbds,PermissionsAllowLightningLogin,PermissionsCampaignInfluence2,PermissionsViewDataAssessment,PermissionsCanApproveFeedPost,PermissionsAllowViewEditConvertedLeads,PermissionsShowCompanyNameAsUserBadge,PermissionsAccessCMC,PermissionsViewHealthCheck,PermissionsManageHealthCheck,PermissionsPackaging2,PermissionsManageCertificates,PermissionsCreateReportInLightning,PermissionsPreventClassicExperience,PermissionsListEmailSend,PermissionsChangeDashboardColors,PermissionsManageRecommendationStrategies,PermissionsManagePropositions,PermissionsSubscribeReportRolesGrps,PermissionsSubscribeDashboardRolesGrps,PermissionsUseWebLink,PermissionsHasUnlimitedNBAExecutions,PermissionsViewOnlyEmbeddedAppUser,PermissionsViewAllActivities,PermissionsSubscribeReportToOtherUsers,PermissionsLightningConsoleAllowedForUser,PermissionsSubscribeReportsRunAsUser,PermissionsSubscribeToLightningDashboards,PermissionsSubscribeDashboardToOtherUsers,PermissionsCreateLtngTempInPub,PermissionsTransactionalEmailSend,PermissionsViewPrivateStaticResources,PermissionsCreateLtngTempFolder,PermissionsApexRestServices,PermissionsEnableCommunityAppLauncher,PermissionsGiveRecognitionBadge,PermissionsAllowObjectDetection,PermissionsSalesforceIQInternal,PermissionsUseMySearch,PermissionsLtngPromoReserved01UserPerm,PermissionsManageSubscriptions,PermissionsAllowObjectDetectionTraining,PermissionsManageSurveys,PermissionsUseAssistantDialog,PermissionsUseQuerySuggestions,PermissionsViewRoles,PermissionsLMOutboundMessagingUserPerm,PermissionsModifyDataClassification,PermissionsPrivacyDataAccess,PermissionsQueryAllFiles,PermissionsModifyMetadata,PermissionsManageCMS,PermissionsSandboxTestingInCommunityApp,PermissionsCanEditPrompts,PermissionsViewUserPII,PermissionsManageHubConnections,PermissionsB2BMarketingAnalyticsUser,PermissionsTraceXdsQueries,PermissionsViewAllCustomSettings,PermissionsViewAllForeignKeyNames,PermissionsHeadlessCMSAccess,PermissionsLMEndMessagingSessionUserPerm,PermissionsConsentApiUpdate,PermissionsAccessContentBuilder,PermissionsAccountSwitcherUser,PermissionsManageC360AConnections,PermissionsManageReleaseUpdates,PermissionsViewAllProfiles,PermissionsSkipIdentityConfirmation,PermissionsSendCustomNotifications,PermissionsPackaging2Delete,PermissionsViewRestrictionAndScopingRules,PermissionsFSCComprehensiveUserAccess,PermissionsManageTrustMeasures,PermissionsViewTrustMeasures,PermissionsIsotopeCToCUser,PermissionsIsotopeAccess,PermissionsIsotopeLEX,PermissionsQuipMetricsAccess,PermissionsQuipUserEngagementMetrics,PermissionsManageExternalConnections,PermissionsAIViewInsightObjects,PermissionsAICreateInsightObjects,PermissionsViewMLModels,PermissionsNativeWebviewScrolling,PermissionsViewDeveloperName,PermissionsBypassMFAForUiLogins,PermissionsClientSecretRotation,PermissionsUpdateReportTypeReferences,PermissionsAccessToServiceProcess,PermissionsManageOrchInstsAndWorkItems,PermissionsCMSECEAuthoringAccess,PermissionsEnableIPFSUpload,PermissionsEnableBCTransactionPolling,PermissionsFSCArcGraphCommunityUser,Type,UserLicenseId,UserType,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,IsSsoEnabled,Description,LastViewedDate,LastReferencedDate
-Id,Name,PermissionsEmailSingle,PermissionsEmailMass,PermissionsEditTask,PermissionsEditEvent,PermissionsExportReport,PermissionsImportPersonal,PermissionsDataExport,PermissionsManageUsers,PermissionsEditPublicFilters,PermissionsEditPublicTemplates,PermissionsModifyAllData,PermissionsEditBillingInfo,PermissionsManageCases,PermissionsManageSolutions,PermissionsCustomizeApplication,PermissionsEditReadonlyFields,PermissionsRunReports,PermissionsViewSetup,PermissionsTransferAnyEntity,PermissionsNewReportBuilder,PermissionsManageSelfService,PermissionsManageCssUsers,PermissionsActivateContract,PermissionsApproveContract,PermissionsImportLeads,PermissionsManageLeads,PermissionsTransferAnyLead,PermissionsViewAllData,PermissionsEditPublicDocuments,PermissionsViewEncryptedData,PermissionsEditBrandTemplates,PermissionsEditHtmlTemplates,PermissionsManageTranslation,PermissionsDeleteActivatedContract,PermissionsSendSitRequests,PermissionsApiUserOnly,PermissionsManageRemoteAccess,PermissionsCanUseNewDashboardBuilder,PermissionsManageCategories,PermissionsConvertLeads,PermissionsTestInstanceCreate,PermissionsPasswordNeverExpires,PermissionsUseTeamReassignWizards,PermissionsInstallMultiforce,PermissionsPublishMultiforce,PermissionsEditOppLineItemUnitPrice,PermissionsManageTerritories,PermissionsCreateMultiforce,PermissionsBulkApiHardDelete,PermissionsInboundMigrationToolsUser,PermissionsSolutionImport,PermissionsManageCallCenters,PermissionsManageSynonyms,PermissionsOutboundMigrationToolsUser,PermissionsViewContent,PermissionsManageEmailClientConfig,PermissionsEnableNotifications,PermissionsIsSsoEnabled,PermissionsManageDataIntegrations,PermissionsDistributeFromPersWksp,PermissionsViewDataCategories,PermissionsManageDataCategories,PermissionsAuthorApex,PermissionsManageMobile,PermissionsApiEnabled,PermissionsManageCustomReportTypes,PermissionsEditCaseComments,PermissionsTransferAnyCase,PermissionsContentAdministrator,PermissionsCreateWorkspaces,PermissionsManageContentPermissions,PermissionsManageContentProperties,PermissionsManageContentTypes,PermissionsScheduleJob,PermissionsManageExchangeConfig,PermissionsManageAnalyticSnapshots,PermissionsScheduleReports,PermissionsManageBusinessHourHolidays,PermissionsManageDynamicDashboards,PermissionsManageInteraction,PermissionsViewMyTeamsDashboards,PermissionsResetPasswords,PermissionsFlowUFLRequired,PermissionsActivitiesAccess,PermissionsEmailTemplateManagement,PermissionsEmailAdministration,PermissionsChatterFileLink,PermissionsForceTwoFactor,PermissionsViewEventLogFiles,PermissionsManageNetworks,PermissionsManageAuthProviders,PermissionsRunFlow,PermissionsCreateCustomizeDashboards,PermissionsCreateDashboardFolders,PermissionsViewPublicDashboards,PermissionsManageDashbdsInPubFolders,PermissionsCreateCustomizeReports,PermissionsCreateReportFolders,PermissionsViewPublicReports,PermissionsManageReportsInPubFolders,PermissionsEditMyDashboards,PermissionsEditMyReports,PermissionsViewAllUsers,PermissionsConnectOrgToEnvironmentHub,PermissionsCreateCustomizeFilters,PermissionsContentHubUser,PermissionsGovernNetworks,PermissionsSalesConsole,PermissionsTwoFactorApi,PermissionsDeleteTopics,PermissionsEditTopics,PermissionsCreateTopics,PermissionsAssignTopics,PermissionsIdentityEnabled,PermissionsIdentityConnect,PermissionsContentWorkspaces,PermissionsCustomMobileAppsAccess,PermissionsViewHelpLink,PermissionsManageProfilesPermissionsets,PermissionsAssignPermissionSets,PermissionsManageRoles,PermissionsManageIpAddresses,PermissionsManageSharing,PermissionsManageInternalUsers,PermissionsManagePasswordPolicies,PermissionsManageLoginAccessPolicies,PermissionsManageCustomPermissions,PermissionsStdAutomaticActivityCapture,PermissionsManageTwoFactor,PermissionsDebugApex,PermissionsLightningExperienceUser,PermissionsConfigCustomRecs,PermissionsSubmitMacrosAllowed,PermissionsBulkMacrosAllowed,PermissionsManageSessionPermissionSets,PermissionsCreateAuditFields,PermissionsUpdateWithInactiveOwner,PermissionsManageSandboxes,PermissionsAutomaticActivityCapture,PermissionsImportCustomObjects,PermissionsSalesforceIQInbox,PermissionsDelegatedTwoFactor,PermissionsSelectFilesFromSalesforce,PermissionsModerateNetworkUsers,PermissionsMergeTopics,PermissionsSubscribeToLightningReports,PermissionsManagePvtRptsAndDashbds,PermissionsAllowLightningLogin,PermissionsCampaignInfluence2,PermissionsViewDataAssessment,PermissionsCanApproveFeedPost,PermissionsAllowViewEditConvertedLeads,PermissionsShowCompanyNameAsUserBadge,PermissionsAccessCMC,PermissionsViewHealthCheck,PermissionsManageHealthCheck,PermissionsPackaging2,PermissionsManageCertificates,PermissionsCreateReportInLightning,PermissionsPreventClassicExperience,PermissionsListEmailSend,PermissionsChangeDashboardColors,PermissionsManageRecommendationStrategies,PermissionsManagePropositions,PermissionsSubscribeReportRolesGrps,PermissionsSubscribeDashboardRolesGrps,PermissionsUseWebLink,PermissionsHasUnlimitedNBAExecutions,PermissionsViewOnlyEmbeddedAppUser,PermissionsViewAllActivities,PermissionsSubscribeReportToOtherUsers,PermissionsLightningConsoleAllowedForUser,PermissionsSubscribeReportsRunAsUser,PermissionsSubscribeToLightningDashboards,PermissionsSubscribeDashboardToOtherUsers,PermissionsCreateLtngTempInPub,PermissionsTransactionalEmailSend,PermissionsViewPrivateStaticResources,PermissionsCreateLtngTempFolder,PermissionsApexRestServices,PermissionsEnableCommunityAppLauncher,PermissionsGiveRecognitionBadge,PermissionsAllowObjectDetection,PermissionsSalesforceIQInternal,PermissionsUseMySearch,PermissionsLtngPromoReserved01UserPerm,PermissionsManageSubscriptions,PermissionsAllowObjectDetectionTraining,PermissionsManageSurveys,PermissionsUseAssistantDialog,PermissionsUseQuerySuggestions,PermissionsViewRoles,PermissionsLMOutboundMessagingUserPerm,PermissionsModifyDataClassification,PermissionsPrivacyDataAccess,PermissionsQueryAllFiles,PermissionsModifyMetadata,PermissionsManageCMS,PermissionsSandboxTestingInCommunityApp,PermissionsCanEditPrompts,PermissionsViewUserPII,PermissionsManageHubConnections,PermissionsB2BMarketingAnalyticsUser,PermissionsTraceXdsQueries,PermissionsViewAllCustomSettings,PermissionsViewAllForeignKeyNames,PermissionsHeadlessCMSAccess,PermissionsLMEndMessagingSessionUserPerm,PermissionsConsentApiUpdate,PermissionsAccessContentBuilder,PermissionsAccountSwitcherUser,PermissionsManageC360AConnections,PermissionsManageReleaseUpdates,PermissionsViewAllProfiles,PermissionsSkipIdentityConfirmation,PermissionsSendCustomNotifications,PermissionsPackaging2Delete,PermissionsViewRestrictionAndScopingRules,PermissionsFSCComprehensiveUserAccess,PermissionsManageTrustMeasures,PermissionsViewTrustMeasures,PermissionsIsotopeCToCUser,PermissionsIsotopeAccess,PermissionsIsotopeLEX,PermissionsQuipMetricsAccess,PermissionsQuipUserEngagementMetrics,PermissionsManageExternalConnections,PermissionsAIViewInsightObjects,PermissionsAICreateInsightObjects,PermissionsViewMLModels,PermissionsNativeWebviewScrolling,PermissionsViewDeveloperName,PermissionsBypassMFAForUiLogins,PermissionsClientSecretRotation,PermissionsUpdateReportTypeReferences,PermissionsAccessToServiceProcess,PermissionsManageOrchInstsAndWorkItems,PermissionsCMSECEAuthoringAccess,PermissionsEnableIPFSUpload,PermissionsEnableBCTransactionPolling,PermissionsFSCArcGraphCommunityUser,Type,UserLicenseId,UserType,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,IsSsoEnabled,Description,LastViewedDate,LastReferencedDate
+253
+Id,Name,PermissionsEmailSingle,PermissionsEmailMass,PermissionsEditTask,PermissionsEditEvent,PermissionsExportReport,PermissionsImportPersonal,PermissionsDataExport,PermissionsManageUsers,PermissionsEditPublicFilters,PermissionsEditPublicTemplates,PermissionsModifyAllData,PermissionsEditBillingInfo,PermissionsManageCases,PermissionsManageSolutions,PermissionsCustomizeApplication,PermissionsEditReadonlyFields,PermissionsRunReports,PermissionsViewSetup,PermissionsTransferAnyEntity,PermissionsNewReportBuilder,PermissionsManageSelfService,PermissionsManageCssUsers,PermissionsActivateContract,PermissionsApproveContract,PermissionsImportLeads,PermissionsManageLeads,PermissionsTransferAnyLead,PermissionsViewAllData,PermissionsEditPublicDocuments,PermissionsViewEncryptedData,PermissionsEditBrandTemplates,PermissionsEditHtmlTemplates,PermissionsManageTranslation,PermissionsDeleteActivatedContract,PermissionsSendSitRequests,PermissionsApiUserOnly,PermissionsManageRemoteAccess,PermissionsCanUseNewDashboardBuilder,PermissionsManageCategories,PermissionsConvertLeads,PermissionsTestInstanceCreate,PermissionsPasswordNeverExpires,PermissionsUseTeamReassignWizards,PermissionsInstallMultiforce,PermissionsPublishMultiforce,PermissionsEditOppLineItemUnitPrice,PermissionsManageTerritories,PermissionsCreateMultiforce,PermissionsBulkApiHardDelete,PermissionsInboundMigrationToolsUser,PermissionsSolutionImport,PermissionsManageCallCenters,PermissionsManageSynonyms,PermissionsOutboundMigrationToolsUser,PermissionsViewContent,PermissionsManageEmailClientConfig,PermissionsEnableNotifications,PermissionsIsSsoEnabled,PermissionsManageDataIntegrations,PermissionsDistributeFromPersWksp,PermissionsViewDataCategories,PermissionsManageDataCategories,PermissionsAuthorApex,PermissionsManageMobile,PermissionsApiEnabled,PermissionsManageCustomReportTypes,PermissionsEditCaseComments,PermissionsTransferAnyCase,PermissionsContentAdministrator,PermissionsCreateWorkspaces,PermissionsManageContentPermissions,PermissionsManageContentProperties,PermissionsManageContentTypes,PermissionsScheduleJob,PermissionsManageExchangeConfig,PermissionsManageAnalyticSnapshots,PermissionsScheduleReports,PermissionsManageBusinessHourHolidays,PermissionsManageDynamicDashboards,PermissionsManageInteraction,PermissionsViewMyTeamsDashboards,PermissionsResetPasswords,PermissionsFlowUFLRequired,PermissionsActivitiesAccess,PermissionsEmailTemplateManagement,PermissionsEmailAdministration,PermissionsChatterFileLink,PermissionsForceTwoFactor,PermissionsViewEventLogFiles,PermissionsManageNetworks,PermissionsManageAuthProviders,PermissionsRunFlow,PermissionsCreateCustomizeDashboards,PermissionsCreateDashboardFolders,PermissionsViewPublicDashboards,PermissionsManageDashbdsInPubFolders,PermissionsCreateCustomizeReports,PermissionsCreateReportFolders,PermissionsViewPublicReports,PermissionsManageReportsInPubFolders,PermissionsEditMyDashboards,PermissionsEditMyReports,PermissionsViewAllUsers,PermissionsConnectOrgToEnvironmentHub,PermissionsCreateCustomizeFilters,PermissionsContentHubUser,PermissionsGovernNetworks,PermissionsSalesConsole,PermissionsTwoFactorApi,PermissionsDeleteTopics,PermissionsEditTopics,PermissionsCreateTopics,PermissionsAssignTopics,PermissionsIdentityEnabled,PermissionsIdentityConnect,PermissionsContentWorkspaces,PermissionsCustomMobileAppsAccess,PermissionsViewHelpLink,PermissionsManageProfilesPermissionsets,PermissionsAssignPermissionSets,PermissionsManageRoles,PermissionsManageIpAddresses,PermissionsManageSharing,PermissionsManageInternalUsers,PermissionsManagePasswordPolicies,PermissionsManageLoginAccessPolicies,PermissionsManageCustomPermissions,PermissionsStdAutomaticActivityCapture,PermissionsManageTwoFactor,PermissionsDebugApex,PermissionsLightningExperienceUser,PermissionsConfigCustomRecs,PermissionsSubmitMacrosAllowed,PermissionsBulkMacrosAllowed,PermissionsManageSessionPermissionSets,PermissionsCreateAuditFields,PermissionsUpdateWithInactiveOwner,PermissionsManageSandboxes,PermissionsAutomaticActivityCapture,PermissionsImportCustomObjects,PermissionsSalesforceIQInbox,PermissionsDelegatedTwoFactor,PermissionsSelectFilesFromSalesforce,PermissionsModerateNetworkUsers,PermissionsMergeTopics,PermissionsSubscribeToLightningReports,PermissionsManagePvtRptsAndDashbds,PermissionsCampaignInfluence2,PermissionsViewDataAssessment,PermissionsCanApproveFeedPost,PermissionsAllowViewEditConvertedLeads,PermissionsShowCompanyNameAsUserBadge,PermissionsAccessCMC,PermissionsViewHealthCheck,PermissionsManageHealthCheck,PermissionsPackaging2,PermissionsManageCertificates,PermissionsCreateReportInLightning,PermissionsPreventClassicExperience,PermissionsListEmailSend,PermissionsChangeDashboardColors,PermissionsManageRecommendationStrategies,PermissionsManagePropositions,PermissionsSubscribeReportRolesGrps,PermissionsSubscribeDashboardRolesGrps,PermissionsUseWebLink,PermissionsHasUnlimitedNBAExecutions,PermissionsViewOnlyEmbeddedAppUser,PermissionsViewAllActivities,PermissionsSubscribeReportToOtherUsers,PermissionsLightningConsoleAllowedForUser,PermissionsSubscribeReportsRunAsUser,PermissionsSubscribeToLightningDashboards,PermissionsSubscribeDashboardToOtherUsers,PermissionsCreateLtngTempInPub,PermissionsTransactionalEmailSend,PermissionsViewPrivateStaticResources,PermissionsCreateLtngTempFolder,PermissionsApexRestServices,PermissionsEnableCommunityAppLauncher,PermissionsGiveRecognitionBadge,PermissionsSalesforceIQInternal,PermissionsUseMySearch,PermissionsLtngPromoReserved01UserPerm,PermissionsManageSubscriptions,PermissionsManageSurveys,PermissionsUseAssistantDialog,PermissionsUseQuerySuggestions,PermissionsViewRoles,PermissionsLMOutboundMessagingUserPerm,PermissionsModifyDataClassification,PermissionsPrivacyDataAccess,PermissionsQueryAllFiles,PermissionsModifyMetadata,PermissionsManageCMS,PermissionsSandboxTestingInCommunityApp,PermissionsCanEditPrompts,PermissionsViewUserPII,PermissionsManageHubConnections,PermissionsB2BMarketingAnalyticsUser,PermissionsTraceXdsQueries,PermissionsViewAllCustomSettings,PermissionsViewAllForeignKeyNames,PermissionsHeadlessCMSAccess,PermissionsLMEndMessagingSessionUserPerm,PermissionsConsentApiUpdate,PermissionsAccessContentBuilder,PermissionsAccountSwitcherUser,PermissionsManageC360AConnections,PermissionsManageReleaseUpdates,PermissionsViewAllProfiles,PermissionsSkipIdentityConfirmation,PermissionsSendCustomNotifications,PermissionsPackaging2Delete,PermissionsViewRestrictionAndScopingRules,PermissionsFSCComprehensiveUserAccess,PermissionsManageTrustMeasures,PermissionsViewTrustMeasures,PermissionsIsotopeCToCUser,PermissionsIsotopeAccess,PermissionsIsotopeLEX,PermissionsQuipMetricsAccess,PermissionsQuipUserEngagementMetrics,PermissionsManageExternalConnections,PermissionsAIViewInsightObjects,PermissionsAICreateInsightObjects,PermissionsViewMLModels,PermissionsNativeWebviewScrolling,PermissionsViewDeveloperName,PermissionsBypassMFAForUiLogins,PermissionsUpdateReportTypeReferences,PermissionsAccessToServiceProcess,PermissionsManageOrchInstsAndWorkItems,PermissionsCMSECEAuthoringAccess,PermissionsManageDataspaceScope,PermissionsConfigureDataspaceScope,PermissionsEnableIPFSUpload,PermissionsEnableBCTransactionPolling,PermissionsFSCArcGraphCommunityUser,Type,UserLicenseId,UserType,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,IsSsoEnabled,Description,LastViewedDate,LastReferencedDate
+Id,Name,PermissionsEmailSingle,PermissionsEmailMass,PermissionsEditTask,PermissionsEditEvent,PermissionsExportReport,PermissionsImportPersonal,PermissionsDataExport,PermissionsManageUsers,PermissionsEditPublicFilters,PermissionsEditPublicTemplates,PermissionsModifyAllData,PermissionsEditBillingInfo,PermissionsManageCases,PermissionsManageSolutions,PermissionsCustomizeApplication,PermissionsEditReadonlyFields,PermissionsRunReports,PermissionsViewSetup,PermissionsTransferAnyEntity,PermissionsNewReportBuilder,PermissionsManageSelfService,PermissionsManageCssUsers,PermissionsActivateContract,PermissionsApproveContract,PermissionsImportLeads,PermissionsManageLeads,PermissionsTransferAnyLead,PermissionsViewAllData,PermissionsEditPublicDocuments,PermissionsViewEncryptedData,PermissionsEditBrandTemplates,PermissionsEditHtmlTemplates,PermissionsManageTranslation,PermissionsDeleteActivatedContract,PermissionsSendSitRequests,PermissionsApiUserOnly,PermissionsManageRemoteAccess,PermissionsCanUseNewDashboardBuilder,PermissionsManageCategories,PermissionsConvertLeads,PermissionsTestInstanceCreate,PermissionsPasswordNeverExpires,PermissionsUseTeamReassignWizards,PermissionsInstallMultiforce,PermissionsPublishMultiforce,PermissionsEditOppLineItemUnitPrice,PermissionsManageTerritories,PermissionsCreateMultiforce,PermissionsBulkApiHardDelete,PermissionsInboundMigrationToolsUser,PermissionsSolutionImport,PermissionsManageCallCenters,PermissionsManageSynonyms,PermissionsOutboundMigrationToolsUser,PermissionsViewContent,PermissionsManageEmailClientConfig,PermissionsEnableNotifications,PermissionsIsSsoEnabled,PermissionsManageDataIntegrations,PermissionsDistributeFromPersWksp,PermissionsViewDataCategories,PermissionsManageDataCategories,PermissionsAuthorApex,PermissionsManageMobile,PermissionsApiEnabled,PermissionsManageCustomReportTypes,PermissionsEditCaseComments,PermissionsTransferAnyCase,PermissionsContentAdministrator,PermissionsCreateWorkspaces,PermissionsManageContentPermissions,PermissionsManageContentProperties,PermissionsManageContentTypes,PermissionsScheduleJob,PermissionsManageExchangeConfig,PermissionsManageAnalyticSnapshots,PermissionsScheduleReports,PermissionsManageBusinessHourHolidays,PermissionsManageDynamicDashboards,PermissionsManageInteraction,PermissionsViewMyTeamsDashboards,PermissionsResetPasswords,PermissionsFlowUFLRequired,PermissionsActivitiesAccess,PermissionsEmailTemplateManagement,PermissionsEmailAdministration,PermissionsChatterFileLink,PermissionsForceTwoFactor,PermissionsViewEventLogFiles,PermissionsManageNetworks,PermissionsManageAuthProviders,PermissionsRunFlow,PermissionsCreateCustomizeDashboards,PermissionsCreateDashboardFolders,PermissionsViewPublicDashboards,PermissionsManageDashbdsInPubFolders,PermissionsCreateCustomizeReports,PermissionsCreateReportFolders,PermissionsViewPublicReports,PermissionsManageReportsInPubFolders,PermissionsEditMyDashboards,PermissionsEditMyReports,PermissionsViewAllUsers,PermissionsConnectOrgToEnvironmentHub,PermissionsCreateCustomizeFilters,PermissionsContentHubUser,PermissionsGovernNetworks,PermissionsSalesConsole,PermissionsTwoFactorApi,PermissionsDeleteTopics,PermissionsEditTopics,PermissionsCreateTopics,PermissionsAssignTopics,PermissionsIdentityEnabled,PermissionsIdentityConnect,PermissionsContentWorkspaces,PermissionsCustomMobileAppsAccess,PermissionsViewHelpLink,PermissionsManageProfilesPermissionsets,PermissionsAssignPermissionSets,PermissionsManageRoles,PermissionsManageIpAddresses,PermissionsManageSharing,PermissionsManageInternalUsers,PermissionsManagePasswordPolicies,PermissionsManageLoginAccessPolicies,PermissionsManageCustomPermissions,PermissionsStdAutomaticActivityCapture,PermissionsManageTwoFactor,PermissionsDebugApex,PermissionsLightningExperienceUser,PermissionsConfigCustomRecs,PermissionsSubmitMacrosAllowed,PermissionsBulkMacrosAllowed,PermissionsManageSessionPermissionSets,PermissionsCreateAuditFields,PermissionsUpdateWithInactiveOwner,PermissionsManageSandboxes,PermissionsAutomaticActivityCapture,PermissionsImportCustomObjects,PermissionsSalesforceIQInbox,PermissionsDelegatedTwoFactor,PermissionsSelectFilesFromSalesforce,PermissionsModerateNetworkUsers,PermissionsMergeTopics,PermissionsSubscribeToLightningReports,PermissionsManagePvtRptsAndDashbds,PermissionsCampaignInfluence2,PermissionsViewDataAssessment,PermissionsCanApproveFeedPost,PermissionsAllowViewEditConvertedLeads,PermissionsShowCompanyNameAsUserBadge,PermissionsAccessCMC,PermissionsViewHealthCheck,PermissionsManageHealthCheck,PermissionsPackaging2,PermissionsManageCertificates,PermissionsCreateReportInLightning,PermissionsPreventClassicExperience,PermissionsListEmailSend,PermissionsChangeDashboardColors,PermissionsManageRecommendationStrategies,PermissionsManagePropositions,PermissionsSubscribeReportRolesGrps,PermissionsSubscribeDashboardRolesGrps,PermissionsUseWebLink,PermissionsHasUnlimitedNBAExecutions,PermissionsViewOnlyEmbeddedAppUser,PermissionsViewAllActivities,PermissionsSubscribeReportToOtherUsers,PermissionsLightningConsoleAllowedForUser,PermissionsSubscribeReportsRunAsUser,PermissionsSubscribeToLightningDashboards,PermissionsSubscribeDashboardToOtherUsers,PermissionsCreateLtngTempInPub,PermissionsTransactionalEmailSend,PermissionsViewPrivateStaticResources,PermissionsCreateLtngTempFolder,PermissionsApexRestServices,PermissionsEnableCommunityAppLauncher,PermissionsGiveRecognitionBadge,PermissionsSalesforceIQInternal,PermissionsUseMySearch,PermissionsLtngPromoReserved01UserPerm,PermissionsManageSubscriptions,PermissionsManageSurveys,PermissionsUseAssistantDialog,PermissionsUseQuerySuggestions,PermissionsViewRoles,PermissionsLMOutboundMessagingUserPerm,PermissionsModifyDataClassification,PermissionsPrivacyDataAccess,PermissionsQueryAllFiles,PermissionsModifyMetadata,PermissionsManageCMS,PermissionsSandboxTestingInCommunityApp,PermissionsCanEditPrompts,PermissionsViewUserPII,PermissionsManageHubConnections,PermissionsB2BMarketingAnalyticsUser,PermissionsTraceXdsQueries,PermissionsViewAllCustomSettings,PermissionsViewAllForeignKeyNames,PermissionsHeadlessCMSAccess,PermissionsLMEndMessagingSessionUserPerm,PermissionsConsentApiUpdate,PermissionsAccessContentBuilder,PermissionsAccountSwitcherUser,PermissionsManageC360AConnections,PermissionsManageReleaseUpdates,PermissionsViewAllProfiles,PermissionsSkipIdentityConfirmation,PermissionsSendCustomNotifications,PermissionsPackaging2Delete,PermissionsViewRestrictionAndScopingRules,PermissionsFSCComprehensiveUserAccess,PermissionsManageTrustMeasures,PermissionsViewTrustMeasures,PermissionsIsotopeCToCUser,PermissionsIsotopeAccess,PermissionsIsotopeLEX,PermissionsQuipMetricsAccess,PermissionsQuipUserEngagementMetrics,PermissionsManageExternalConnections,PermissionsAIViewInsightObjects,PermissionsAICreateInsightObjects,PermissionsViewMLModels,PermissionsNativeWebviewScrolling,PermissionsViewDeveloperName,PermissionsBypassMFAForUiLogins,PermissionsUpdateReportTypeReferences,PermissionsAccessToServiceProcess,PermissionsManageOrchInstsAndWorkItems,PermissionsCMSECEAuthoringAccess,PermissionsManageDataspaceScope,PermissionsConfigureDataspaceScope,PermissionsEnableIPFSUpload,PermissionsEnableBCTransactionPolling,PermissionsFSCArcGraphCommunityUser,Type,UserLicenseId,UserType,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,IsSsoEnabled,Description,LastViewedDate,LastReferencedDate
src02.crm_Profile
org02.crm_Profile
CRM_Profile_ex.sql
diff --git a/s3/data/crm/settings/CRM_Sent_Email_vod__c.txt b/s3/data/crm/settings/CRM_Sent_Email_vod__c.txt
index b9c5fbf1..a8e344e9 100644
--- a/s3/data/crm/settings/CRM_Sent_Email_vod__c.txt
+++ b/s3/data/crm/settings/CRM_Sent_Email_vod__c.txt
@@ -4,9 +4,9 @@ utf-8
"
CRLF
1
-66
-Id,OwnerId,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,LastActivityDate,MayEdit,IsLocked,Account_Email_vod__c,Account_vod__c,Approved_Email_Template_vod__c,Capture_Datetime_vod__c,Detail_Group_vod__c,Email_Config_Values_vod__c,Email_Content2_vod__c,Email_Content_vod__c,Email_Fragments_vod__c,Email_Sent_Date_vod__c,Failure_Msg_vod__c,Last_Activity_Date_vod__c,Last_Device_vod__c,MC_Capture_Datetime_vod__c,Mobile_ID_vod__c,Opened_vod__c,Product_Display_vod__c,Product_vod__c,Sender_Email_vod__c,Status_vod__c,Valid_Consent_Exists_vod__c,Approved_Document_Views_vod__c,Click_Count_vod__c,Last_Click_Date_vod__c,Last_Open_Date_vod__c,Open_Count_vod__c,Receipt_Entity_Type_vod__c,Receipt_Record_Id_vod__c,Territory_vod__c,Call2_vod__c,Medical_Inquiry_vod__c,Parent_Email_vod__c,Related_Transaction_ID_vod__c,Case_vod__c,Key_Message_vod__c,Suggestion_vod__c,EM_Attendee_vod__c,EM_Event_Speaker_vod__c,EM_Event_Team_Member_vod__c,Event_Attendee_vod__c,Event_vod__c,Medical_Event_vod__c,Scheduled_Send_Datetime_vod__c,User_vod__c,Content_Type_vod__c,Bcc_vod__c,Event_Attendee_Mobile_Id_vod__c,Event_Mobile_Id_vod__c,Activity_Tracking_Mode_vod__c,Email_Source_vod__c,Subject_vod__c,User_Input_Text_vod__c,Email_Group_Id_vod__c
-Id,OwnerId,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,LastActivityDate,MayEdit,IsLocked,Account_Email_vod__c,Account_vod__c,Approved_Email_Template_vod__c,Capture_Datetime_vod__c,Detail_Group_vod__c,Email_Config_Values_vod__c,Email_Content2_vod__c,Email_Content_vod__c,Email_Fragments_vod__c,Email_Sent_Date_vod__c,Failure_Msg_vod__c,Last_Activity_Date_vod__c,Last_Device_vod__c,MC_Capture_Datetime_vod__c,Mobile_ID_vod__c,Opened_vod__c,Product_Display_vod__c,Product_vod__c,Sender_Email_vod__c,Status_vod__c,Valid_Consent_Exists_vod__c,Approved_Document_Views_vod__c,Click_Count_vod__c,Last_Click_Date_vod__c,Last_Open_Date_vod__c,Open_Count_vod__c,Receipt_Entity_Type_vod__c,Receipt_Record_Id_vod__c,Territory_vod__c,Call2_vod__c,Medical_Inquiry_vod__c,Parent_Email_vod__c,Related_Transaction_ID_vod__c,Case_vod__c,Key_Message_vod__c,Suggestion_vod__c,EM_Attendee_vod__c,EM_Event_Speaker_vod__c,EM_Event_Team_Member_vod__c,Event_Attendee_vod__c,Event_vod__c,Medical_Event_vod__c,Scheduled_Send_Datetime_vod__c,User_vod__c,Content_Type_vod__c,Bcc_vod__c,Event_Attendee_Mobile_Id_vod__c,Event_Mobile_Id_vod__c,Activity_Tracking_Mode_vod__c,Email_Source_vod__c,Subject_vod__c,User_Input_Text_vod__c,Email_Group_Id_vod__c
+67
+Id,OwnerId,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,LastActivityDate,MayEdit,IsLocked,Account_Email_vod__c,Account_vod__c,Approved_Email_Template_vod__c,Capture_Datetime_vod__c,Detail_Group_vod__c,Email_Config_Values_vod__c,Email_Content2_vod__c,Email_Content_vod__c,Email_Fragments_vod__c,Email_Sent_Date_vod__c,Failure_Msg_vod__c,Last_Activity_Date_vod__c,Last_Device_vod__c,MC_Capture_Datetime_vod__c,Mobile_ID_vod__c,Opened_vod__c,Product_Display_vod__c,Product_vod__c,Sender_Email_vod__c,Status_vod__c,Valid_Consent_Exists_vod__c,Approved_Document_Views_vod__c,Click_Count_vod__c,Last_Click_Date_vod__c,Last_Open_Date_vod__c,Open_Count_vod__c,Receipt_Entity_Type_vod__c,Receipt_Record_Id_vod__c,Territory_vod__c,Call2_vod__c,Medical_Inquiry_vod__c,Parent_Email_vod__c,Related_Transaction_ID_vod__c,Case_vod__c,Key_Message_vod__c,Suggestion_vod__c,EM_Attendee_vod__c,EM_Event_Speaker_vod__c,EM_Event_Team_Member_vod__c,Event_Attendee_vod__c,Event_vod__c,Medical_Event_vod__c,Scheduled_Send_Datetime_vod__c,User_vod__c,Content_Type_vod__c,Bcc_vod__c,Event_Attendee_Mobile_Id_vod__c,Event_Mobile_Id_vod__c,Activity_Tracking_Mode_vod__c,Email_Source_vod__c,Subject_vod__c,User_Input_Text_vod__c,Email_Group_Id_vod__c,List_Unsubscribe_Header_vod__c
+Id,OwnerId,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,LastActivityDate,MayEdit,IsLocked,Account_Email_vod__c,Account_vod__c,Approved_Email_Template_vod__c,Capture_Datetime_vod__c,Detail_Group_vod__c,Email_Config_Values_vod__c,Email_Content2_vod__c,Email_Content_vod__c,Email_Fragments_vod__c,Email_Sent_Date_vod__c,Failure_Msg_vod__c,Last_Activity_Date_vod__c,Last_Device_vod__c,MC_Capture_Datetime_vod__c,Mobile_ID_vod__c,Opened_vod__c,Product_Display_vod__c,Product_vod__c,Sender_Email_vod__c,Status_vod__c,Valid_Consent_Exists_vod__c,Approved_Document_Views_vod__c,Click_Count_vod__c,Last_Click_Date_vod__c,Last_Open_Date_vod__c,Open_Count_vod__c,Receipt_Entity_Type_vod__c,Receipt_Record_Id_vod__c,Territory_vod__c,Call2_vod__c,Medical_Inquiry_vod__c,Parent_Email_vod__c,Related_Transaction_ID_vod__c,Case_vod__c,Key_Message_vod__c,Suggestion_vod__c,EM_Attendee_vod__c,EM_Event_Speaker_vod__c,EM_Event_Team_Member_vod__c,Event_Attendee_vod__c,Event_vod__c,Medical_Event_vod__c,Scheduled_Send_Datetime_vod__c,User_vod__c,Content_Type_vod__c,Bcc_vod__c,Event_Attendee_Mobile_Id_vod__c,Event_Mobile_Id_vod__c,Activity_Tracking_Mode_vod__c,Email_Source_vod__c,Subject_vod__c,User_Input_Text_vod__c,Email_Group_Id_vod__c,List_Unsubscribe_Header_vod__c
src02c.crm_Sent_Email_vod__c
org02.crm_Sent_Email_vod__c
diff --git a/s3/data/crm/settings/CRM_Suggestion_vod__c.txt b/s3/data/crm/settings/CRM_Suggestion_vod__c.txt
index e20d8016..d061b76a 100644
--- a/s3/data/crm/settings/CRM_Suggestion_vod__c.txt
+++ b/s3/data/crm/settings/CRM_Suggestion_vod__c.txt
@@ -4,9 +4,9 @@ utf-8
"
CRLF
1
-48
-Id,OwnerId,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Account_Priority_Score_vod__c,Account_vod__c,Action_Count_vod__c,Actioned_vod__c,Call_Objective_CLM_ID_vod__c,Call_Objective_From_Date_vod__c,Call_Objective_On_By_Default_vod__c,Call_Objective_Record_Type_vod__c,Call_Objective_To_Date_vod__c,Dismiss_Count_vod__c,Dismissed_vod__c,Display_Dismiss_vod__c,Display_Mark_As_Complete_vod__c,Display_Score_vod__c,Email_Template_ID_vod__c,Email_Template_Vault_ID_vod__c,Email_Template_vod__c,Expiration_Date_vod__c,Mark_Complete_Count_vod__c,Marked_As_Complete_vod__c,No_Homepage_vod__c,Planned_Call_Date_vod__c,Posted_Date_vod__c,Priority_vod__c,Reason_vod__c,Record_Type_Name_vod__c,Suggestion_External_Id_vod__c,Suppress_Reason_vod__c,Title_vod__c,Suggestion_Survey_vod__c,Category_vod__c,MSJ_Data_Id__c,MSJ_Reason_unformatted__c,MSJ_reason_id__c
-Id,OwnerId,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Account_Priority_Score_vod__c,Account_vod__c,Action_Count_vod__c,Actioned_vod__c,Call_Objective_CLM_ID_vod__c,Call_Objective_From_Date_vod__c,Call_Objective_On_By_Default_vod__c,Call_Objective_Record_Type_vod__c,Call_Objective_To_Date_vod__c,Dismiss_Count_vod__c,Dismissed_vod__c,Display_Dismiss_vod__c,Display_Mark_As_Complete_vod__c,Display_Score_vod__c,Email_Template_ID_vod__c,Email_Template_Vault_ID_vod__c,Email_Template_vod__c,Expiration_Date_vod__c,Mark_Complete_Count_vod__c,Marked_As_Complete_vod__c,No_Homepage_vod__c,Planned_Call_Date_vod__c,Posted_Date_vod__c,Priority_vod__c,Reason_vod__c,Record_Type_Name_vod__c,Suggestion_External_Id_vod__c,Suppress_Reason_vod__c,Title_vod__c,Suggestion_Survey_vod__c,Category_vod__c,MSJ_Data_Id__c,MSJ_Reason_unformatted__c,MSJ_reason_id__c
+49
+Id,OwnerId,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Account_Priority_Score_vod__c,Account_vod__c,Action_Count_vod__c,Actioned_vod__c,Call_Objective_CLM_ID_vod__c,Call_Objective_From_Date_vod__c,Call_Objective_On_By_Default_vod__c,Call_Objective_Record_Type_vod__c,Call_Objective_To_Date_vod__c,Dismiss_Count_vod__c,Dismissed_vod__c,Display_Dismiss_vod__c,Display_Mark_As_Complete_vod__c,Display_Score_vod__c,Email_Template_ID_vod__c,Email_Template_Vault_ID_vod__c,Email_Template_vod__c,Expiration_Date_vod__c,Mark_Complete_Count_vod__c,Marked_As_Complete_vod__c,No_Homepage_vod__c,Planned_Call_Date_vod__c,Posted_Date_vod__c,Priority_vod__c,Reason_vod__c,Record_Type_Name_vod__c,Suggestion_External_Id_vod__c,Suppress_Reason_vod__c,Title_vod__c,Suggestion_Survey_vod__c,Category_vod__c,MSJ_Data_Id__c,MSJ_Reason_unformatted__c,MSJ_reason_id__c,MSJ_use_case__c
+Id,OwnerId,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Account_Priority_Score_vod__c,Account_vod__c,Action_Count_vod__c,Actioned_vod__c,Call_Objective_CLM_ID_vod__c,Call_Objective_From_Date_vod__c,Call_Objective_On_By_Default_vod__c,Call_Objective_Record_Type_vod__c,Call_Objective_To_Date_vod__c,Dismiss_Count_vod__c,Dismissed_vod__c,Display_Dismiss_vod__c,Display_Mark_As_Complete_vod__c,Display_Score_vod__c,Email_Template_ID_vod__c,Email_Template_Vault_ID_vod__c,Email_Template_vod__c,Expiration_Date_vod__c,Mark_Complete_Count_vod__c,Marked_As_Complete_vod__c,No_Homepage_vod__c,Planned_Call_Date_vod__c,Posted_Date_vod__c,Priority_vod__c,Reason_vod__c,Record_Type_Name_vod__c,Suggestion_External_Id_vod__c,Suppress_Reason_vod__c,Title_vod__c,Suggestion_Survey_vod__c,Category_vod__c,MSJ_Data_Id__c,MSJ_Reason_unformatted__c,MSJ_reason_id__c,MSJ_use_case__c
src02c.crm_Suggestion_vod__c
org02.crm_Suggestion_vod__c
diff --git a/s3/data/crm/settings/CRM_User.txt b/s3/data/crm/settings/CRM_User.txt
index 2023bb99..ef925ae9 100644
--- a/s3/data/crm/settings/CRM_User.txt
+++ b/s3/data/crm/settings/CRM_User.txt
@@ -4,9 +4,9 @@ utf-8
"
CRLF
1
-218
-Id,Username,LastName,FirstName,Name,CompanyName,Division,Department,Title,Street,City,State,PostalCode,Country,Latitude,Longitude,GeocodeAccuracy,Address,Email,EmailPreferencesAutoBcc,EmailPreferencesAutoBccStayInTouch,EmailPreferencesStayInTouchReminder,SenderEmail,SenderName,Signature,StayInTouchSubject,StayInTouchSignature,StayInTouchNote,Phone,Fax,MobilePhone,Alias,CommunityNickname,BadgeText,IsActive,TimeZoneSidKey,UserRoleId,LocaleSidKey,ReceivesInfoEmails,ReceivesAdminInfoEmails,EmailEncodingKey,ProfileId,UserType,LanguageLocaleKey,EmployeeNumber,DelegatedApproverId,ManagerId,LastLoginDate,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,OfflineTrialExpirationDate,OfflinePdaTrialExpirationDate,UserPermissionsMarketingUser,UserPermissionsOfflineUser,UserPermissionsWirelessUser,UserPermissionsAvantgoUser,UserPermissionsCallCenterAutoLogin,UserPermissionsSFContentUser,UserPermissionsInteractionUser,UserPermissionsSupportUser,UserPermissionsChatterAnswersUser,ForecastEnabled,UserPreferencesActivityRemindersPopup,UserPreferencesEventRemindersCheckboxDefault,UserPreferencesTaskRemindersCheckboxDefault,UserPreferencesReminderSoundOff,UserPreferencesDisableAllFeedsEmail,UserPreferencesApexPagesDeveloperMode,UserPreferencesReceiveNoNotificationsAsApprover,UserPreferencesReceiveNotificationsAsDelegatedApprover,UserPreferencesHideCSNGetChatterMobileTask,UserPreferencesHideCSNDesktopTask,UserPreferencesHideChatterOnboardingSplash,UserPreferencesHideSecondChatterOnboardingSplash,UserPreferencesShowTitleToExternalUsers,UserPreferencesShowManagerToExternalUsers,UserPreferencesShowEmailToExternalUsers,UserPreferencesShowWorkPhoneToExternalUsers,UserPreferencesShowMobilePhoneToExternalUsers,UserPreferencesShowFaxToExternalUsers,UserPreferencesShowStreetAddressToExternalUsers,UserPreferencesShowCityToExternalUsers,UserPreferencesShowStateToExternalUsers,UserPreferencesShowPostalCodeToExternalUsers,UserPreferencesShowCountryToExternalUsers,UserPreferencesShowProfilePicToGuestUsers,UserPreferencesShowTitleToGuestUsers,UserPreferencesShowCityToGuestUsers,UserPreferencesShowStateToGuestUsers,UserPreferencesShowPostalCodeToGuestUsers,UserPreferencesShowCountryToGuestUsers,UserPreferencesShowForecastingChangeSignals,UserPreferencesPathAssistantCollapsed,UserPreferencesCacheDiagnostics,UserPreferencesShowEmailToGuestUsers,UserPreferencesShowManagerToGuestUsers,UserPreferencesShowWorkPhoneToGuestUsers,UserPreferencesShowMobilePhoneToGuestUsers,UserPreferencesShowFaxToGuestUsers,UserPreferencesShowStreetAddressToGuestUsers,UserPreferencesLightningExperiencePreferred,UserPreferencesPreviewLightning,UserPreferencesHideEndUserOnboardingAssistantModal,UserPreferencesHideLightningMigrationModal,UserPreferencesHideSfxWelcomeMat,UserPreferencesHideBiggerPhotoCallout,UserPreferencesGlobalNavBarWTShown,UserPreferencesGlobalNavGridMenuWTShown,UserPreferencesCreateLEXAppsWTShown,UserPreferencesFavoritesWTShown,UserPreferencesRecordHomeSectionCollapseWTShown,UserPreferencesRecordHomeReservedWTShown,UserPreferencesFavoritesShowTopFavorites,UserPreferencesExcludeMailAppAttachments,UserPreferencesSuppressTaskSFXReminders,UserPreferencesSuppressEventSFXReminders,UserPreferencesPreviewCustomTheme,UserPreferencesHasCelebrationBadge,UserPreferencesUserDebugModePref,UserPreferencesSRHOverrideActivities,UserPreferencesNewLightningReportRunPageEnabled,UserPreferencesReverseOpenActivitiesView,UserPreferencesHasSentWarningEmail,UserPreferencesHasSentWarningEmail238,UserPreferencesHasSentWarningEmail240,UserPreferencesHideBrowseProductRedirectConfirmation,UserPreferencesHideOnlineSalesAppWelcomeMat,ContactId,AccountId,CallCenterId,Extension,FederationIdentifier,AboutMe,FullPhotoUrl,SmallPhotoUrl,IsExtIndicatorVisible,OutOfOfficeMessage,MediumPhotoUrl,DigestFrequency,DefaultGroupNotificationFrequency,LastViewedDate,LastReferencedDate,BannerPhotoUrl,SmallBannerPhotoUrl,MediumBannerPhotoUrl,IsProfilePhotoActive,IndividualId,Last_Mobile_Connect_vod__c,Last_Tablet_Connect_vod__c,Last_Mobile_Connect_Version_vod__c,Last_Tablet_Connect_Version_vod__c,Last_Mobile_Sync_vod__c,Last_Tablet_Sync_vod__c,RaiseLoggingLevel_vod__c,SendDetailedLog_vod__c,Last_Blackberry_Connect_vod__c,Last_Blackberry_Connect_Version_vod__c,Last_Blackberry_Sync_vod__c,Force_Full_Refresh_vod__c,Override_SystemModstamp_Timestamp_vod__c,Facetime_Email_vod__c,Facetime_Phone_vod__c,Product_Expertise_vod__c,Available_vod__c,Available_Last_Update_vod__c,Last_iPad_Connect_Version_vod__c,Last_iPad_Connect_vod__c,Last_iPad_Sync_vod__c,Inventory_Order_Allocation_Group_vod__c,Concur_User_Id_vod__c,Last_iPad_iOS_Version_vod__c,Approved_Email_Admin_vod__c,Last_WinModern_Connect_Version_vod__c,Last_WinModern_Connect_vod__c,Last_WinModern_Sync_vod__c,Primary_Territory_vod__c,Analytics_Admin_vod__c,Content_Admin_vod__c,Last_WinModern_Windows_Version_vod__c,Upload_VTrans_vod__c,Sync_Frequency_vjh__c,Clear_Client_Sync_Errors_vod__c,Remote_Meeting_Host_Id_vod__c,Remote_Meeting_Host_Token_vod__c,Last_iPhone_Connect_Version_vod__c,Last_iPhone_Connect_vod__c,Last_iPhone_Sync_vod__c,Last_iPhone_iOS_Version_vod__c,Remote_Meeting_Start_From_CRM_Online_vod__c,Country_Code_vod__c,User_Type_vod__c,Engage_Group_Provisioning_Status_vod__c,Engage_Group_Request_vod__c,Engage_Group_vod__c,Last_CRMDesktop_Mac_Sync_vod__c,Last_CRMDesktop_Mac_Version_vod__c,Last_CRMDesktop_Windows_Sync_vod__c,Last_CRMDesktop_Windows_Version_vod__c,MSJ_Test_User__c,Last_Android_Connect_Version_vod__c,Last_Android_Connect_vod__c,Last_Android_OS_Version_vod__c,Last_Android_Sync_vod__c,Last_CRMDesktop_Mac_Conn_Ver_vod__c,Last_CRMDesktop_Mac_Connect_vod__c,Last_CRMDesktop_Windows_Conn_Ver_vod__c,Last_CRMDesktop_Windows_Connect_vod__c,MS_Graph_API_Authorized_vod__c,MS_Outlook_Last_Pull_Activity_vod__c,MS_Outlook_Last_Push_Activity_vod__c,Enable_MS_Outlook_Calendar_vod__c,Last_iPad_Updates_Applied_vod__c,Last_iPhone_Updates_Applied_vod__c,UserPreferencesHideInvoicesRedirectConfirmation,UserPreferencesHideStatementsRedirectConfirmation
-Id,Username,LastName,FirstName,Name,CompanyName,Division,Department,Title,Street,City,State,PostalCode,Country,Latitude,Longitude,GeocodeAccuracy,Address,Email,EmailPreferencesAutoBcc,EmailPreferencesAutoBccStayInTouch,EmailPreferencesStayInTouchReminder,SenderEmail,SenderName,Signature,StayInTouchSubject,StayInTouchSignature,StayInTouchNote,Phone,Fax,MobilePhone,Alias,CommunityNickname,BadgeText,IsActive,TimeZoneSidKey,UserRoleId,LocaleSidKey,ReceivesInfoEmails,ReceivesAdminInfoEmails,EmailEncodingKey,ProfileId,UserType,LanguageLocaleKey,EmployeeNumber,DelegatedApproverId,ManagerId,LastLoginDate,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,OfflineTrialExpirationDate,OfflinePdaTrialExpirationDate,UserPermissionsMarketingUser,UserPermissionsOfflineUser,UserPermissionsWirelessUser,UserPermissionsAvantgoUser,UserPermissionsCallCenterAutoLogin,UserPermissionsSFContentUser,UserPermissionsInteractionUser,UserPermissionsSupportUser,UserPermissionsChatterAnswersUser,ForecastEnabled,UserPreferencesActivityRemindersPopup,UserPreferencesEventRemindersCheckboxDefault,UserPreferencesTaskRemindersCheckboxDefault,UserPreferencesReminderSoundOff,UserPreferencesDisableAllFeedsEmail,UserPreferencesApexPagesDeveloperMode,UserPreferencesReceiveNoNotificationsAsApprover,UserPreferencesReceiveNotificationsAsDelegatedApprover,UserPreferencesHideCSNGetChatterMobileTask,UserPreferencesHideCSNDesktopTask,UserPreferencesHideChatterOnboardingSplash,UserPreferencesHideSecondChatterOnboardingSplash,UserPreferencesShowTitleToExternalUsers,UserPreferencesShowManagerToExternalUsers,UserPreferencesShowEmailToExternalUsers,UserPreferencesShowWorkPhoneToExternalUsers,UserPreferencesShowMobilePhoneToExternalUsers,UserPreferencesShowFaxToExternalUsers,UserPreferencesShowStreetAddressToExternalUsers,UserPreferencesShowCityToExternalUsers,UserPreferencesShowStateToExternalUsers,UserPreferencesShowPostalCodeToExternalUsers,UserPreferencesShowCountryToExternalUsers,UserPreferencesShowProfilePicToGuestUsers,UserPreferencesShowTitleToGuestUsers,UserPreferencesShowCityToGuestUsers,UserPreferencesShowStateToGuestUsers,UserPreferencesShowPostalCodeToGuestUsers,UserPreferencesShowCountryToGuestUsers,UserPreferencesShowForecastingChangeSignals,UserPreferencesPathAssistantCollapsed,UserPreferencesCacheDiagnostics,UserPreferencesShowEmailToGuestUsers,UserPreferencesShowManagerToGuestUsers,UserPreferencesShowWorkPhoneToGuestUsers,UserPreferencesShowMobilePhoneToGuestUsers,UserPreferencesShowFaxToGuestUsers,UserPreferencesShowStreetAddressToGuestUsers,UserPreferencesLightningExperiencePreferred,UserPreferencesPreviewLightning,UserPreferencesHideEndUserOnboardingAssistantModal,UserPreferencesHideLightningMigrationModal,UserPreferencesHideSfxWelcomeMat,UserPreferencesHideBiggerPhotoCallout,UserPreferencesGlobalNavBarWTShown,UserPreferencesGlobalNavGridMenuWTShown,UserPreferencesCreateLEXAppsWTShown,UserPreferencesFavoritesWTShown,UserPreferencesRecordHomeSectionCollapseWTShown,UserPreferencesRecordHomeReservedWTShown,UserPreferencesFavoritesShowTopFavorites,UserPreferencesExcludeMailAppAttachments,UserPreferencesSuppressTaskSFXReminders,UserPreferencesSuppressEventSFXReminders,UserPreferencesPreviewCustomTheme,UserPreferencesHasCelebrationBadge,UserPreferencesUserDebugModePref,UserPreferencesSRHOverrideActivities,UserPreferencesNewLightningReportRunPageEnabled,UserPreferencesReverseOpenActivitiesView,UserPreferencesHasSentWarningEmail,UserPreferencesHasSentWarningEmail238,UserPreferencesHasSentWarningEmail240,UserPreferencesHideBrowseProductRedirectConfirmation,UserPreferencesHideOnlineSalesAppWelcomeMat,ContactId,AccountId,CallCenterId,Extension,FederationIdentifier,AboutMe,FullPhotoUrl,SmallPhotoUrl,IsExtIndicatorVisible,OutOfOfficeMessage,MediumPhotoUrl,DigestFrequency,DefaultGroupNotificationFrequency,LastViewedDate,LastReferencedDate,BannerPhotoUrl,SmallBannerPhotoUrl,MediumBannerPhotoUrl,IsProfilePhotoActive,IndividualId,Last_Mobile_Connect_vod__c,Last_Tablet_Connect_vod__c,Last_Mobile_Connect_Version_vod__c,Last_Tablet_Connect_Version_vod__c,Last_Mobile_Sync_vod__c,Last_Tablet_Sync_vod__c,RaiseLoggingLevel_vod__c,SendDetailedLog_vod__c,Last_Blackberry_Connect_vod__c,Last_Blackberry_Connect_Version_vod__c,Last_Blackberry_Sync_vod__c,Force_Full_Refresh_vod__c,Override_SystemModstamp_Timestamp_vod__c,Facetime_Email_vod__c,Facetime_Phone_vod__c,Product_Expertise_vod__c,Available_vod__c,Available_Last_Update_vod__c,Last_iPad_Connect_Version_vod__c,Last_iPad_Connect_vod__c,Last_iPad_Sync_vod__c,Inventory_Order_Allocation_Group_vod__c,Concur_User_Id_vod__c,Last_iPad_iOS_Version_vod__c,Approved_Email_Admin_vod__c,Last_WinModern_Connect_Version_vod__c,Last_WinModern_Connect_vod__c,Last_WinModern_Sync_vod__c,Primary_Territory_vod__c,Analytics_Admin_vod__c,Content_Admin_vod__c,Last_WinModern_Windows_Version_vod__c,Upload_VTrans_vod__c,Sync_Frequency_vjh__c,Clear_Client_Sync_Errors_vod__c,Remote_Meeting_Host_Id_vod__c,Remote_Meeting_Host_Token_vod__c,Last_iPhone_Connect_Version_vod__c,Last_iPhone_Connect_vod__c,Last_iPhone_Sync_vod__c,Last_iPhone_iOS_Version_vod__c,Remote_Meeting_Start_From_CRM_Online_vod__c,Country_Code_vod__c,User_Type_vod__c,Engage_Group_Provisioning_Status_vod__c,Engage_Group_Request_vod__c,Engage_Group_vod__c,Last_CRMDesktop_Mac_Sync_vod__c,Last_CRMDesktop_Mac_Version_vod__c,Last_CRMDesktop_Windows_Sync_vod__c,Last_CRMDesktop_Windows_Version_vod__c,MSJ_Test_User__c,Last_Android_Connect_Version_vod__c,Last_Android_Connect_vod__c,Last_Android_OS_Version_vod__c,Last_Android_Sync_vod__c,Last_CRMDesktop_Mac_Conn_Ver_vod__c,Last_CRMDesktop_Mac_Connect_vod__c,Last_CRMDesktop_Windows_Conn_Ver_vod__c,Last_CRMDesktop_Windows_Connect_vod__c,MS_Graph_API_Authorized_vod__c,MS_Outlook_Last_Pull_Activity_vod__c,MS_Outlook_Last_Push_Activity_vod__c,Enable_MS_Outlook_Calendar_vod__c,Last_iPad_Updates_Applied_vod__c,Last_iPhone_Updates_Applied_vod__c,UserPreferencesHideInvoicesRedirectConfirmation,UserPreferencesHideStatementsRedirectConfirmation
+215
+Id,Username,LastName,FirstName,Name,CompanyName,Division,Department,Title,Street,City,State,PostalCode,Country,Latitude,Longitude,GeocodeAccuracy,Address,Email,EmailPreferencesAutoBcc,EmailPreferencesAutoBccStayInTouch,EmailPreferencesStayInTouchReminder,SenderEmail,SenderName,Signature,StayInTouchSubject,StayInTouchSignature,StayInTouchNote,Phone,Fax,MobilePhone,Alias,CommunityNickname,BadgeText,IsActive,TimeZoneSidKey,UserRoleId,LocaleSidKey,ReceivesInfoEmails,ReceivesAdminInfoEmails,EmailEncodingKey,ProfileId,UserType,LanguageLocaleKey,EmployeeNumber,DelegatedApproverId,ManagerId,LastLoginDate,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,OfflineTrialExpirationDate,OfflinePdaTrialExpirationDate,UserPermissionsMarketingUser,UserPermissionsOfflineUser,UserPermissionsWirelessUser,UserPermissionsAvantgoUser,UserPermissionsCallCenterAutoLogin,UserPermissionsSFContentUser,UserPermissionsInteractionUser,UserPermissionsSupportUser,UserPermissionsChatterAnswersUser,ForecastEnabled,UserPreferencesActivityRemindersPopup,UserPreferencesEventRemindersCheckboxDefault,UserPreferencesTaskRemindersCheckboxDefault,UserPreferencesReminderSoundOff,UserPreferencesDisableAllFeedsEmail,UserPreferencesApexPagesDeveloperMode,UserPreferencesReceiveNoNotificationsAsApprover,UserPreferencesReceiveNotificationsAsDelegatedApprover,UserPreferencesHideCSNGetChatterMobileTask,UserPreferencesHideCSNDesktopTask,UserPreferencesHideChatterOnboardingSplash,UserPreferencesHideSecondChatterOnboardingSplash,UserPreferencesShowTitleToExternalUsers,UserPreferencesShowManagerToExternalUsers,UserPreferencesShowEmailToExternalUsers,UserPreferencesShowWorkPhoneToExternalUsers,UserPreferencesShowMobilePhoneToExternalUsers,UserPreferencesShowFaxToExternalUsers,UserPreferencesShowStreetAddressToExternalUsers,UserPreferencesShowCityToExternalUsers,UserPreferencesShowStateToExternalUsers,UserPreferencesShowPostalCodeToExternalUsers,UserPreferencesShowCountryToExternalUsers,UserPreferencesShowProfilePicToGuestUsers,UserPreferencesShowTitleToGuestUsers,UserPreferencesShowCityToGuestUsers,UserPreferencesShowStateToGuestUsers,UserPreferencesShowPostalCodeToGuestUsers,UserPreferencesShowCountryToGuestUsers,UserPreferencesShowForecastingChangeSignals,UserPreferencesPathAssistantCollapsed,UserPreferencesCacheDiagnostics,UserPreferencesShowEmailToGuestUsers,UserPreferencesShowManagerToGuestUsers,UserPreferencesShowWorkPhoneToGuestUsers,UserPreferencesShowMobilePhoneToGuestUsers,UserPreferencesShowFaxToGuestUsers,UserPreferencesShowStreetAddressToGuestUsers,UserPreferencesLightningExperiencePreferred,UserPreferencesHideEndUserOnboardingAssistantModal,UserPreferencesHideLightningMigrationModal,UserPreferencesHideSfxWelcomeMat,UserPreferencesHideBiggerPhotoCallout,UserPreferencesGlobalNavBarWTShown,UserPreferencesGlobalNavGridMenuWTShown,UserPreferencesCreateLEXAppsWTShown,UserPreferencesFavoritesWTShown,UserPreferencesRecordHomeSectionCollapseWTShown,UserPreferencesRecordHomeReservedWTShown,UserPreferencesFavoritesShowTopFavorites,UserPreferencesExcludeMailAppAttachments,UserPreferencesSuppressTaskSFXReminders,UserPreferencesSuppressEventSFXReminders,UserPreferencesPreviewCustomTheme,UserPreferencesHasCelebrationBadge,UserPreferencesUserDebugModePref,UserPreferencesSRHOverrideActivities,UserPreferencesNewLightningReportRunPageEnabled,UserPreferencesReverseOpenActivitiesView,UserPreferencesHasSentWarningEmail,UserPreferencesHasSentWarningEmail238,UserPreferencesHasSentWarningEmail240,UserPreferencesHideBrowseProductRedirectConfirmation,UserPreferencesHideOnlineSalesAppWelcomeMat,ContactId,AccountId,CallCenterId,Extension,FederationIdentifier,AboutMe,FullPhotoUrl,SmallPhotoUrl,IsExtIndicatorVisible,OutOfOfficeMessage,MediumPhotoUrl,DigestFrequency,DefaultGroupNotificationFrequency,LastViewedDate,LastReferencedDate,BannerPhotoUrl,SmallBannerPhotoUrl,MediumBannerPhotoUrl,IsProfilePhotoActive,IndividualId,Last_Mobile_Connect_vod__c,Last_Tablet_Connect_vod__c,Last_Mobile_Connect_Version_vod__c,Last_Tablet_Connect_Version_vod__c,Last_Mobile_Sync_vod__c,Last_Tablet_Sync_vod__c,RaiseLoggingLevel_vod__c,SendDetailedLog_vod__c,Last_Blackberry_Connect_vod__c,Last_Blackberry_Connect_Version_vod__c,Last_Blackberry_Sync_vod__c,Force_Full_Refresh_vod__c,Override_SystemModstamp_Timestamp_vod__c,Facetime_Email_vod__c,Facetime_Phone_vod__c,Product_Expertise_vod__c,Available_vod__c,Available_Last_Update_vod__c,Last_iPad_Connect_Version_vod__c,Last_iPad_Connect_vod__c,Last_iPad_Sync_vod__c,Inventory_Order_Allocation_Group_vod__c,Concur_User_Id_vod__c,Last_iPad_iOS_Version_vod__c,Approved_Email_Admin_vod__c,Last_WinModern_Connect_Version_vod__c,Last_WinModern_Connect_vod__c,Last_WinModern_Sync_vod__c,Primary_Territory_vod__c,Analytics_Admin_vod__c,Content_Admin_vod__c,Last_WinModern_Windows_Version_vod__c,Upload_VTrans_vod__c,Sync_Frequency_vjh__c,Clear_Client_Sync_Errors_vod__c,Remote_Meeting_Host_Id_vod__c,Remote_Meeting_Host_Token_vod__c,Last_iPhone_Connect_Version_vod__c,Last_iPhone_Connect_vod__c,Last_iPhone_Sync_vod__c,Last_iPhone_iOS_Version_vod__c,Remote_Meeting_Start_From_CRM_Online_vod__c,Country_Code_vod__c,User_Type_vod__c,Engage_Group_Provisioning_Status_vod__c,Engage_Group_Request_vod__c,Engage_Group_vod__c,Last_CRMDesktop_Mac_Sync_vod__c,Last_CRMDesktop_Mac_Version_vod__c,Last_CRMDesktop_Windows_Sync_vod__c,Last_CRMDesktop_Windows_Version_vod__c,MSJ_Test_User__c,Last_Android_Connect_Version_vod__c,Last_Android_Connect_vod__c,Last_Android_OS_Version_vod__c,Last_Android_Sync_vod__c,Last_CRMDesktop_Mac_Conn_Ver_vod__c,Last_CRMDesktop_Mac_Connect_vod__c,Last_CRMDesktop_Windows_Conn_Ver_vod__c,Last_CRMDesktop_Windows_Connect_vod__c,MS_Graph_API_Authorized_vod__c,MS_Outlook_Last_Pull_Activity_vod__c,MS_Outlook_Last_Push_Activity_vod__c,Enable_MS_Outlook_Calendar_vod__c,Last_iPad_Updates_Applied_vod__c,Last_iPhone_Updates_Applied_vod__c
+Id,Username,LastName,FirstName,Name,CompanyName,Division,Department,Title,Street,City,State,PostalCode,Country,Latitude,Longitude,GeocodeAccuracy,Address,Email,EmailPreferencesAutoBcc,EmailPreferencesAutoBccStayInTouch,EmailPreferencesStayInTouchReminder,SenderEmail,SenderName,Signature,StayInTouchSubject,StayInTouchSignature,StayInTouchNote,Phone,Fax,MobilePhone,Alias,CommunityNickname,BadgeText,IsActive,TimeZoneSidKey,UserRoleId,LocaleSidKey,ReceivesInfoEmails,ReceivesAdminInfoEmails,EmailEncodingKey,ProfileId,UserType,LanguageLocaleKey,EmployeeNumber,DelegatedApproverId,ManagerId,LastLoginDate,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,OfflineTrialExpirationDate,OfflinePdaTrialExpirationDate,UserPermissionsMarketingUser,UserPermissionsOfflineUser,UserPermissionsWirelessUser,UserPermissionsAvantgoUser,UserPermissionsCallCenterAutoLogin,UserPermissionsSFContentUser,UserPermissionsInteractionUser,UserPermissionsSupportUser,UserPermissionsChatterAnswersUser,ForecastEnabled,UserPreferencesActivityRemindersPopup,UserPreferencesEventRemindersCheckboxDefault,UserPreferencesTaskRemindersCheckboxDefault,UserPreferencesReminderSoundOff,UserPreferencesDisableAllFeedsEmail,UserPreferencesApexPagesDeveloperMode,UserPreferencesReceiveNoNotificationsAsApprover,UserPreferencesReceiveNotificationsAsDelegatedApprover,UserPreferencesHideCSNGetChatterMobileTask,UserPreferencesHideCSNDesktopTask,UserPreferencesHideChatterOnboardingSplash,UserPreferencesHideSecondChatterOnboardingSplash,UserPreferencesShowTitleToExternalUsers,UserPreferencesShowManagerToExternalUsers,UserPreferencesShowEmailToExternalUsers,UserPreferencesShowWorkPhoneToExternalUsers,UserPreferencesShowMobilePhoneToExternalUsers,UserPreferencesShowFaxToExternalUsers,UserPreferencesShowStreetAddressToExternalUsers,UserPreferencesShowCityToExternalUsers,UserPreferencesShowStateToExternalUsers,UserPreferencesShowPostalCodeToExternalUsers,UserPreferencesShowCountryToExternalUsers,UserPreferencesShowProfilePicToGuestUsers,UserPreferencesShowTitleToGuestUsers,UserPreferencesShowCityToGuestUsers,UserPreferencesShowStateToGuestUsers,UserPreferencesShowPostalCodeToGuestUsers,UserPreferencesShowCountryToGuestUsers,UserPreferencesShowForecastingChangeSignals,UserPreferencesPathAssistantCollapsed,UserPreferencesCacheDiagnostics,UserPreferencesShowEmailToGuestUsers,UserPreferencesShowManagerToGuestUsers,UserPreferencesShowWorkPhoneToGuestUsers,UserPreferencesShowMobilePhoneToGuestUsers,UserPreferencesShowFaxToGuestUsers,UserPreferencesShowStreetAddressToGuestUsers,UserPreferencesLightningExperiencePreferred,UserPreferencesHideEndUserOnboardingAssistantModal,UserPreferencesHideLightningMigrationModal,UserPreferencesHideSfxWelcomeMat,UserPreferencesHideBiggerPhotoCallout,UserPreferencesGlobalNavBarWTShown,UserPreferencesGlobalNavGridMenuWTShown,UserPreferencesCreateLEXAppsWTShown,UserPreferencesFavoritesWTShown,UserPreferencesRecordHomeSectionCollapseWTShown,UserPreferencesRecordHomeReservedWTShown,UserPreferencesFavoritesShowTopFavorites,UserPreferencesExcludeMailAppAttachments,UserPreferencesSuppressTaskSFXReminders,UserPreferencesSuppressEventSFXReminders,UserPreferencesPreviewCustomTheme,UserPreferencesHasCelebrationBadge,UserPreferencesUserDebugModePref,UserPreferencesSRHOverrideActivities,UserPreferencesNewLightningReportRunPageEnabled,UserPreferencesReverseOpenActivitiesView,UserPreferencesHasSentWarningEmail,UserPreferencesHasSentWarningEmail238,UserPreferencesHasSentWarningEmail240,UserPreferencesHideBrowseProductRedirectConfirmation,UserPreferencesHideOnlineSalesAppWelcomeMat,ContactId,AccountId,CallCenterId,Extension,FederationIdentifier,AboutMe,FullPhotoUrl,SmallPhotoUrl,IsExtIndicatorVisible,OutOfOfficeMessage,MediumPhotoUrl,DigestFrequency,DefaultGroupNotificationFrequency,LastViewedDate,LastReferencedDate,BannerPhotoUrl,SmallBannerPhotoUrl,MediumBannerPhotoUrl,IsProfilePhotoActive,IndividualId,Last_Mobile_Connect_vod__c,Last_Tablet_Connect_vod__c,Last_Mobile_Connect_Version_vod__c,Last_Tablet_Connect_Version_vod__c,Last_Mobile_Sync_vod__c,Last_Tablet_Sync_vod__c,RaiseLoggingLevel_vod__c,SendDetailedLog_vod__c,Last_Blackberry_Connect_vod__c,Last_Blackberry_Connect_Version_vod__c,Last_Blackberry_Sync_vod__c,Force_Full_Refresh_vod__c,Override_SystemModstamp_Timestamp_vod__c,Facetime_Email_vod__c,Facetime_Phone_vod__c,Product_Expertise_vod__c,Available_vod__c,Available_Last_Update_vod__c,Last_iPad_Connect_Version_vod__c,Last_iPad_Connect_vod__c,Last_iPad_Sync_vod__c,Inventory_Order_Allocation_Group_vod__c,Concur_User_Id_vod__c,Last_iPad_iOS_Version_vod__c,Approved_Email_Admin_vod__c,Last_WinModern_Connect_Version_vod__c,Last_WinModern_Connect_vod__c,Last_WinModern_Sync_vod__c,Primary_Territory_vod__c,Analytics_Admin_vod__c,Content_Admin_vod__c,Last_WinModern_Windows_Version_vod__c,Upload_VTrans_vod__c,Sync_Frequency_vjh__c,Clear_Client_Sync_Errors_vod__c,Remote_Meeting_Host_Id_vod__c,Remote_Meeting_Host_Token_vod__c,Last_iPhone_Connect_Version_vod__c,Last_iPhone_Connect_vod__c,Last_iPhone_Sync_vod__c,Last_iPhone_iOS_Version_vod__c,Remote_Meeting_Start_From_CRM_Online_vod__c,Country_Code_vod__c,User_Type_vod__c,Engage_Group_Provisioning_Status_vod__c,Engage_Group_Request_vod__c,Engage_Group_vod__c,Last_CRMDesktop_Mac_Sync_vod__c,Last_CRMDesktop_Mac_Version_vod__c,Last_CRMDesktop_Windows_Sync_vod__c,Last_CRMDesktop_Windows_Version_vod__c,MSJ_Test_User__c,Last_Android_Connect_Version_vod__c,Last_Android_Connect_vod__c,Last_Android_OS_Version_vod__c,Last_Android_Sync_vod__c,Last_CRMDesktop_Mac_Conn_Ver_vod__c,Last_CRMDesktop_Mac_Connect_vod__c,Last_CRMDesktop_Windows_Conn_Ver_vod__c,Last_CRMDesktop_Windows_Connect_vod__c,MS_Graph_API_Authorized_vod__c,MS_Outlook_Last_Pull_Activity_vod__c,MS_Outlook_Last_Push_Activity_vod__c,Enable_MS_Outlook_Calendar_vod__c,Last_iPad_Updates_Applied_vod__c,Last_iPhone_Updates_Applied_vod__c
src02.crm_User
org02.crm_User