Translate

IRPTeam · Jun 26, 2024 · 845bfc8 · 845bfc8
1 parent cc27b39
commit 845bfc8
Show file tree

Hide file tree

Showing 261 changed files with 22,987 additions and 2,786 deletions.
diff --git a/IRP/src/AccumulationRegisters/R1020B_AdvancesToVendors/ManagerModule.bsl b/IRP/src/AccumulationRegisters/R1020B_AdvancesToVendors/ManagerModule.bsl
@@ -227,6 +227,7 @@ Function R1020B_AdvancesToVendors_DebitCreditNote() Export
 		|	Doc.SendAgreement AS Agreement,
 		|	Doc.SendProject AS Project,
 		|	Doc.Amount,
+		|	Doc.Key,
 		|	UNDEFINED AS VendorsAdvancesClosing
 		|INTO R1020B_AdvancesToVendors
 		|FROM
@@ -261,6 +262,7 @@ Function R1020B_AdvancesToVendors_DebitCreditNote() Export
 		|	Doc.ReceiveAgreement AS Agreement,
 		|	Doc.ReceiveProject AS Project,
 		|	Doc.Amount,
+		|	Doc.Key,
 		|	UNDEFINED
 		|FROM
 		|	ReceiveAdvances AS Doc
@@ -284,6 +286,7 @@ Function R1020B_AdvancesToVendors_DebitCreditNote() Export
 		|	OffsetOfAdvances.AdvanceAgreement,
 		|	OffsetOfAdvances.AdvanceProject,
 		|	OffsetOfAdvances.Amount,
+		|	OffsetOfAdvances.Key,
 		|	OffsetOfAdvances.Recorder
 		|FROM
 		|	InformationRegister.T2010S_OffsetOfAdvances AS OffsetOfAdvances

diff --git a/IRP/src/AccumulationRegisters/R1021B_VendorsTransactions/ManagerModule.bsl b/IRP/src/AccumulationRegisters/R1021B_VendorsTransactions/ManagerModule.bsl
@@ -423,29 +423,6 @@ Function R1021B_VendorsTransactions_CreditNote() Export
 EndFunction
 
 Function R1021B_VendorsTransactions_DebitCreditNote() Export
-
-//IsSendAdvanceCustomer
-//IsSendAdvanceVendor
-//
-//IsSendTransactionCustomer
-//IsSendTransactionVendor
-//
-//IsReceiveAdvanceCustomer
-//IsReceiveAdvanceVendor
-//
-//IsReceiveTransactionCustomer
-//IsReceiveTransactionVendor
-
-//3. Vendor transactions (VT) - Customer advances (CA) - minus - plus
-//4. Vendor transactions (VT) - Customer transactions (CT) - minus - minus
-//16. Vendor transactions (VT) - Vendor transactions (VT) (CT)- minus - plus
-//
-//3. Vendor transactions (VT) - Customer advances (CA) - minus - plus
-//4. Vendor transactions (VT) - Customer transactions (CT) - minus - minus
-//16. Vendor transactions (VT) - Vendor transactions (VT) - minus - plus
-//16. Vendor transactions (VT) - Vendor transactions (VT) (CT)- minus - plus
-//16. Vendor transactions (VT) - Vendor transactions (VT) - minus - plus
-
 	Return
 		"SELECT
 		|case when Doc.PartnersIsEqual then
@@ -475,6 +452,7 @@ Function R1021B_VendorsTransactions_DebitCreditNote() Export
 		|	Doc.SendBasisDocument AS Basis,
 		|	Doc.SendOrderSettlements AS Order,
 		|	Doc.Amount,
+		|	Doc.Key,
 		|	UNDEFINED AS VendorsAdvancesClosing
 		|INTO R1021B_VendorsTransactions
 		|FROM
@@ -508,6 +486,7 @@ Function R1021B_VendorsTransactions_DebitCreditNote() Export
 		|	Doc.ReceiveBasisDocument,
 		|	Doc.ReceiveOrderSettlements,
 		|	Doc.Amount,
+		|	Doc.Key,
 		|	UNDEFINED
 		|FROM
 		|	ReceiveTransactions AS Doc
@@ -533,6 +512,7 @@ Function R1021B_VendorsTransactions_DebitCreditNote() Export
 		|	OffsetOfAdvances.TransactionDocument,
 		|	OffsetOfAdvances.TransactionOrder,
 		|	OffsetOfAdvances.Amount,
+		|	OffsetOfAdvances.Key,
 		|	OffsetOfAdvances.Recorder
 		|FROM
 		|	InformationRegister.T2010S_OffsetOfAdvances AS OffsetOfAdvances

diff --git a/IRP/src/AccumulationRegisters/R1040B_TaxesOutgoing/R1040B_TaxesOutgoing.mdo b/IRP/src/AccumulationRegisters/R1040B_TaxesOutgoing/R1040B_TaxesOutgoing.mdo
@@ -24,40 +24,19 @@
  <useStandardCommands>true</useStandardCommands>
  <dataLockControlMode>Managed</dataLockControlMode>
  <enableTotalsSplitting>true</enableTotalsSplitting>
- <resources uuid="0e86e4c7-5edc-4ad6-a7ce-d5ce9274a057">
-  <name>TaxableAmount</name>
-  <synonym>
-   <key>en</key>
-   <value>Taxable amount</value>
-  </synonym>
-  <synonym>
-   <key>ru</key>
-   <value>Сумма оборота</value>
-  </synonym>
-  <synonym>
-   <key>tr</key>
-   <value>KDV Matrahı</value>
-  </synonym>
-  <type>
-   <types>DefinedType.typeAmount</types>
-  </type>
-  <minValue xsi:type="core:UndefinedValue"/>
-  <maxValue xsi:type="core:UndefinedValue"/>
-  <fullTextSearch>Use</fullTextSearch>
- </resources>
  <resources uuid="210f094c-6ece-4fdb-99a6-1cd9570db0e1">
-  <name>TaxAmount</name>
+  <name>Amount</name>
   <synonym>
    <key>en</key>
-   <value>Tax amount</value>
+   <value>Amount</value>
   </synonym>
   <synonym>
    <key>ru</key>
-   <value>Сумма налогов</value>
+   <value>Сумма</value>
   </synonym>
   <synonym>
    <key>tr</key>
-   <value>Vergi tutarı</value>
+   <value>Tutar</value>
   </synonym>
   <type>
    <types>DefinedType.typeAmount</types>
@@ -154,25 +133,88 @@
   <fullTextSearch>Use</fullTextSearch>
   <useInTotals>true</useInTotals>
  </dimensions>
- <dimensions uuid="af359c9f-ec14-4b29-a247-560f377ebf45">
-  <name>TaxMovementType</name>
+ <dimensions uuid="c7253578-aa97-401e-bf65-5fd9db9ff8c2">
+  <name>InvoiceType</name>
+  <synonym>
+   <key>en</key>
+   <value>Invoice type</value>
+  </synonym>
+  <synonym>
+   <key>ru</key>
+   <value>Тип инвойса</value>
+  </synonym>
+  <synonym>
+   <key>tr</key>
+   <value>Invoice type</value>
+  </synonym>
+  <type>
+   <types>EnumRef.InvoiceType</types>
+  </type>
+  <minValue xsi:type="core:UndefinedValue"/>
+  <maxValue xsi:type="core:UndefinedValue"/>
+  <fullTextSearch>Use</fullTextSearch>
+  <useInTotals>true</useInTotals>
+ </dimensions>
+ <dimensions uuid="bf80f826-aaa1-4b73-b046-3b1cc3a508c2">
+  <name>CurrencyMovementType</name>
+  <synonym>
+   <key>en</key>
+   <value>Multi currency movement type</value>
+  </synonym>
+  <synonym>
+   <key>ru</key>
+   <value>Вид мультивалютной аналитики</value>
+  </synonym>
+  <synonym>
+   <key>tr</key>
+   <value>Çoklu döviz hareket tipi</value>
+  </synonym>
+  <type>
+   <types>ChartOfCharacteristicTypesRef.CurrencyMovementType</types>
+  </type>
+  <minValue xsi:type="core:UndefinedValue"/>
+  <maxValue xsi:type="core:UndefinedValue"/>
+  <fullTextSearch>Use</fullTextSearch>
+  <useInTotals>true</useInTotals>
+ </dimensions>
+ <dimensions uuid="63376ac5-808d-457f-b73d-0737328b6a6b">
+  <name>Currency</name>
+  <synonym>
+   <key>en</key>
+   <value>Currency</value>
+  </synonym>
+  <synonym>
+   <key>ru</key>
+   <value>Валюта</value>
+  </synonym>
+  <synonym>
+   <key>tr</key>
+   <value>Döviz</value>
+  </synonym>
+  <type>
+   <types>CatalogRef.Currencies</types>
+  </type>
+  <minValue xsi:type="core:UndefinedValue"/>
+  <maxValue xsi:type="core:UndefinedValue"/>
+  <fullTextSearch>Use</fullTextSearch>
+  <useInTotals>true</useInTotals>
+ </dimensions>
+ <dimensions uuid="1daad7d1-81fe-458a-a539-770defc785b0">
+  <name>TransactionCurrency</name>
   <synonym>
    <key>en</key>
-   <value>Tax movement type</value>
+   <value>Transaction currency</value>
   </synonym>
   <synonym>
    <key>ru</key>
-   <value>Вид поступления</value>
+   <value>Валюта транзакции</value>
   </synonym>
   <synonym>
    <key>tr</key>
-   <value>Vergiler hareket tipi</value>
+   <value>İşlem para birimi</value>
   </synonym>
   <type>
-   <types>String</types>
-   <stringQualifiers>
-    <length>10</length>
-   </stringQualifiers>
+   <types>CatalogRef.Currencies</types>
   </type>
   <minValue xsi:type="core:UndefinedValue"/>
   <maxValue xsi:type="core:UndefinedValue"/>

diff --git a/IRP/src/AccumulationRegisters/R2020B_AdvancesFromCustomers/ManagerModule.bsl b/IRP/src/AccumulationRegisters/R2020B_AdvancesFromCustomers/ManagerModule.bsl
@@ -230,6 +230,7 @@ Function R2020B_AdvancesFromCustomers_DebitCreditNote() Export
 		|	Doc.SendAgreement AS Agreement,
 		|	Doc.SendProject AS Project,
 		|	Doc.Amount,
+		|	Doc.Key,
 		|	UNDEFINED AS CustomersAdvancesClosing
 		|INTO R2020B_AdvancesFromCustomers
 		|FROM
@@ -264,6 +265,7 @@ Function R2020B_AdvancesFromCustomers_DebitCreditNote() Export
 		|	Doc.ReceiveAgreement AS Agreement,
 		|	Doc.ReceiveProject AS Project,
 		|	Doc.Amount,
+		|	Doc.Key,
 		|	UNDEFINED
 		|FROM
 		|	ReceiveAdvances AS Doc
@@ -287,6 +289,7 @@ Function R2020B_AdvancesFromCustomers_DebitCreditNote() Export
 		|	OffsetOfAdvances.AdvanceAgreement,
 		|	OffsetOfAdvances.AdvanceProject,
 		|	OffsetOfAdvances.Amount,
+		|	OffsetOfAdvances.Key,
 		|	OffsetOfAdvances.Recorder
 		|FROM
 		|	InformationRegister.T2010S_OffsetOfAdvances AS OffsetOfAdvances

diff --git a/IRP/src/AccumulationRegisters/R2021B_CustomersTransactions/ManagerModule.bsl b/IRP/src/AccumulationRegisters/R2021B_CustomersTransactions/ManagerModule.bsl
@@ -402,6 +402,7 @@ Function R2021B_CustomersTransactions_DebitCreditNote() Export
 		|	Doc.SendBasisDocument AS Basis,
 		|	Doc.SendOrderSettlements AS Order,
 		|	Doc.Amount,
+		|	Doc.Key,
 		|	UNDEFINED AS CustomersAdvancesClosing
 		|INTO R2021B_CustomersTransactions
 		|FROM
@@ -437,6 +438,7 @@ Function R2021B_CustomersTransactions_DebitCreditNote() Export
 		|	Doc.ReceiveBasisDocument,
 		|	Doc.ReceiveOrderSettlements,
 		|	Doc.Amount,
+		|	Doc.Key,
 		|	UNDEFINED
 		|FROM
 		|	ReceiveTransactions AS Doc
@@ -462,6 +464,7 @@ Function R2021B_CustomersTransactions_DebitCreditNote() Export
 		|	OffsetOfAdvances.TransactionDocument,
 		|	OffsetOfAdvances.TransactionOrder,
 		|	OffsetOfAdvances.Amount,
+		|	OffsetOfAdvances.Key,
 		|	OffsetOfAdvances.Recorder
 		|FROM
 		|	InformationRegister.T2010S_OffsetOfAdvances AS OffsetOfAdvances