diff --git a/src/core/Data/initialOptionsMap.ts b/src/core/Data/initialOptionsMap.ts
index b655966..8524d95 100644
--- a/src/core/Data/initialOptionsMap.ts
+++ b/src/core/Data/initialOptionsMap.ts
@@ -1,6 +1,4 @@
-import {
-    TInitialElementsOptions
-} from 'core/types/Requests/Calculation';
+import { TInitialElementsOptions } from 'core/types/Requests/Calculation';
 
 const initialOptionMap: TInitialElementsOptions = {
   selectSupplier: {
@@ -13,6 +11,12 @@ const initialOptionMap: TInitialElementsOptions = {
       evo_supplier_type: 100000000,
     },
   },
+  selectSupplierCurrency: {
+    entityName: 'transactioncurrency',
+    where: {
+      statecode: 0,
+    },
+  },
 };
 
 export default initialOptionMap;
diff --git a/src/core/fakeData/entityFakes.ts b/src/core/fakeData/entityFakes.ts
index 9f68add..5c0f1a0 100644
--- a/src/core/fakeData/entityFakes.ts
+++ b/src/core/fakeData/entityFakes.ts
@@ -8,6 +8,7 @@ import faker from 'faker';
  */
 const ACCOUNT_1_ID = faker.random.uuid();
 const ACCOUNT_2_ID = faker.random.uuid();
+const ACCOUNT_3_ID = faker.random.uuid();
 
 const LEAD_1_ID = faker.random.uuid();
 const LEAD_2_ID = faker.random.uuid();
@@ -17,6 +18,12 @@ const OPPORTUNITY_2_ID = faker.random.uuid();
 
 const QUOTE_1_ID = faker.random.uuid();
 const QUOTE_2_ID = faker.random.uuid();
+
+const TRANSACTION_CURRENTCY_1_ID = faker.random.uuid();
+const TRANSACTION_CURRENTCY_2_ID = faker.random.uuid();
+
+const EVO_CLIENT_1_ID = faker.random.uuid();
+const EVO_CLIENT_2_ID = faker.random.uuid();
 /**
  * Fake Consts
  */
@@ -27,14 +34,48 @@ const entityFakeData: {
   account: [
     {
       accountid: ACCOUNT_1_ID,
-      name: 'Account10101010',
+      name: 'Салон 1',
+      evo_account_type: 100000001,
+      evo_supplier_type: 100000000,
+      statecode: 0,
     },
     {
-      name: 'Account2525252346346',
-      accountid: '123123123123',
+      accountid: ACCOUNT_2_ID,
+      name: 'Салон 2',
       evo_account_type: 100000001,
-      statecode: 0,
       evo_supplier_type: 100000000,
+      statecode: 0,
+    },
+    {
+      accountid: ACCOUNT_3_ID,
+      name: 'Салон 3',
+      evo_account_type: 100000001,
+      evo_supplier_type: 100000000,
+      statecode: 0,
+    },
+  ],
+  transactioncurrency: [
+    {
+      transactioncurrencyid: TRANSACTION_CURRENTCY_1_ID,
+      isocurrencycode: 'RUB',
+      statecode: 0,
+    },
+    {
+      transactioncurrencyid: TRANSACTION_CURRENTCY_2_ID,
+      isocurrencycode: 'USD',
+      statecode: 0,
+    },
+  ],
+  evo_client_type: [
+    {
+      evo_client_typeid: EVO_CLIENT_1_ID,
+      evo_name: 'Новый',
+      statecode: 0,
+    },
+    {
+      evo_client_typeid: EVO_CLIENT_2_ID,
+      evo_name: 'Повторный',
+      statecode: 0,
     },
   ],
   lead: [
@@ -46,7 +87,7 @@ const entityFakeData: {
     {
       fullname: '150_ООО "Некромант',
       leadid: LEAD_2_ID,
-      evo_opportunityid: OPPORTUNITY_2_ID,
+      // evo_opportunityid: OPPORTUNITY_2_ID,
     },
   ],
   opportunity: [