Translate

IRPTeam · May 29, 2024 · cc27b39 · cc27b39
1 parent 0f38186
commit cc27b39
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 7 deletions.
diff --git a/IRP/src/AccumulationRegisters/T1040T_AccountingAmounts/T1040T_AccountingAmounts.mdo b/IRP/src/AccumulationRegisters/T1040T_AccountingAmounts/T1040T_AccountingAmounts.mdo
@@ -180,4 +180,26 @@
   <fullTextSearch>Use</fullTextSearch>
   <useInTotals>true</useInTotals>
  </dimensions>
+ <dimensions uuid="761642fc-2a73-4f78-be0b-e514af4fc441">
+  <name>RevaluatedCurrency</name>
+  <synonym>
+   <key>en</key>
+   <value>Revaluated currency</value>
+  </synonym>
+  <synonym>
+   <key>ru</key>
+   <value>Переоцениваемая валюта</value>
+  </synonym>
+  <synonym>
+   <key>tr</key>
+   <value>Değerlenen 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>
 </mdclass:AccumulationRegister>
diff --git a/IRP/src/CommonModules/AccountingServer/Module.bsl b/IRP/src/CommonModules/AccountingServer/Module.bsl
@@ -2101,8 +2101,8 @@ Function GetAccountingData(Parameters)
 	Query = New Query();
 	Query.Text = 
 	"SELECT
-	|	Amounts.Currency,
-	|	SUM(Amounts.Amount) AS Amount
+	|	case when &IsRevaluationCurrency then Amounts.RevaluatedCurrency else Amounts.Currency end as Currency,
+	|	SUM(case when &IsRevaluationCurrency then 0 else Amounts.Amount end) AS Amount
 	|FROM
 	|	AccumulationRegister.T1040T_AccountingAmounts AS Amounts
 	|WHERE
@@ -2115,7 +2115,7 @@ Function GetAccountingData(Parameters)
 	|		else True
 	|	end
 	|GROUP BY
-	|	Amounts.Currency
+	|	case when &IsRevaluationCurrency then Amounts.RevaluatedCurrency else Amounts.Currency end
 	|;
 	|
 	|////////////////////////////////////////////////////////////////////////////////
@@ -2164,8 +2164,10 @@ Function GetAccountingData(Parameters)
 
 	If Parameters.IsCurrencyRevaluation Then
 		Query.SetParameter("RevaluationCurrency", Parameters.CurrencyMovementType);
+		Query.SetParameter("IsRevaluationCurrency", True);
 	Else
 		Query.SetParameter("RevaluationCurrency", ChartsOfCharacteristicTypes.CurrencyMovementType.SettlementCurrency);
+		Query.SetParameter("IsRevaluationCurrency", False);
 	EndIf;
 
 	QueryResults = Query.ExecuteBatch();

diff --git a/IRP/src/DataProcessors/MobileCreateDocument/MobileCreateDocument.mdo b/IRP/src/DataProcessors/MobileCreateDocument/MobileCreateDocument.mdo
@@ -193,7 +193,7 @@
   </synonym>
   <synonym>
    <key>ru</key>
-   <value>Form</value>
+   <value>Форма</value>
   </synonym>
   <synonym>
    <key>tr</key>

diff --git a/IRP/src/Documents/ForeignCurrencyRevaluation/ManagerModule.bsl b/IRP/src/Documents/ForeignCurrencyRevaluation/ManagerModule.bsl
@@ -549,6 +549,7 @@ Function T1040T_AccountingAmounts()
 		|	Table.Key AS Key,
 		|	Table.Currency,
 		|	Table.CurrencyMovementType,
+		|	Table.TransactionCurrency AS RevaluatedCurrency,
 		|	Table.AmountRevaluated AS Amount,
 		|	VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R2020B_AdvancesFromCustomers) AS
 		|		Operation
@@ -567,6 +568,7 @@ Function T1040T_AccountingAmounts()
 		|	Table.Key AS Key,
 		|	Table.Currency,
 		|	Table.CurrencyMovementType,
+		|	Table.TransactionCurrency,
 		|	Table.AmountRevaluated AS Amount,
 		|	VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R2020B_AdvancesFromCustomers_CR_R5021T_Revenues) AS
 		|		Operation
@@ -584,6 +586,7 @@ Function T1040T_AccountingAmounts()
 		|	Table.Key AS Key,
 		|	Table.Currency,
 		|	Table.CurrencyMovementType,
+		|	Table.TransactionCurrency,
 		|	Table.AmountRevaluated AS Amount,
 		|	VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R1021B_VendorsTransactions) AS
 		|		Operation
@@ -601,6 +604,7 @@ Function T1040T_AccountingAmounts()
 		|	Table.Key AS Key,
 		|	Table.Currency,
 		|	Table.CurrencyMovementType,
+		|	Table.TransactionCurrency,
 		|	Table.AmountRevaluated AS Amount,
 		|	VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R1021B_VendorsTransactions_CR_R5021T_Revenues) AS
 		|		Operation
@@ -618,6 +622,7 @@ Function T1040T_AccountingAmounts()
 		|	Table.Key AS Key,
 		|	Table.Currency,
 		|	Table.CurrencyMovementType,
+		|	Table.TransactionCurrency,
 		|	Table.AmountRevaluated AS Amount,
 		|	VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R9510B_SalaryPayment) AS
 		|		Operation
@@ -635,6 +640,7 @@ Function T1040T_AccountingAmounts()
 		|	Table.Key AS Key,
 		|	Table.Currency,
 		|	Table.CurrencyMovementType,
+		|	Table.TransactionCurrency,
 		|	Table.AmountRevaluated AS Amount,
 		|	VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R9510B_SalaryPayment_CR_R5021T_Revenues) AS
 		|		Operation
@@ -653,6 +659,7 @@ Function T1040T_AccountingAmounts()
 		|	Table.Key AS Key,
 		|	Table.Currency,
 		|	Table.CurrencyMovementType,
+		|	Table.TransactionCurrency,
 		|	Table.AmountRevaluated AS Amount,
 		|	VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R3010B_CashOnHand) AS Operation
 		|FROM
@@ -669,6 +676,7 @@ Function T1040T_AccountingAmounts()
 		|	Table.Key AS Key,
 		|	Table.Currency,
 		|	Table.CurrencyMovementType,
+		|	Table.TransactionCurrency,
 		|	Table.AmountRevaluated AS Amount,
 		|	VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R3010B_CashOnHand_CR_R5021T_Revenues) AS Operation
 		|FROM
@@ -685,6 +693,7 @@ Function T1040T_AccountingAmounts()
 		|	Table.Key AS Key,
 		|	Table.Currency,
 		|	Table.CurrencyMovementType,
+		|	Table.TransactionCurrency,
 		|	Table.AmountRevaluated AS Amount,
 		|	VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R1020B_AdvancesToVendors) AS
 		|		Operation
@@ -702,6 +711,7 @@ Function T1040T_AccountingAmounts()
 		|	Table.Key AS Key,
 		|	Table.Currency,
 		|	Table.CurrencyMovementType,
+		|	Table.TransactionCurrency,
 		|	Table.AmountRevaluated AS Amount,
 		|	VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R1020B_AdvancesToVendors_CR_R5021T_Revenues) AS
 		|		Operation
@@ -719,6 +729,7 @@ Function T1040T_AccountingAmounts()
 		|	Table.Key AS Key,
 		|	Table.Currency,
 		|	Table.CurrencyMovementType,
+		|	Table.TransactionCurrency,
 		|	Table.AmountRevaluated AS Amount,
 		|	VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R2021B_CustomersTransactions) AS
 		|		Operation
@@ -736,6 +747,7 @@ Function T1040T_AccountingAmounts()
 		|	Table.Key AS Key,
 		|	Table.Currency,
 		|	Table.CurrencyMovementType,
+		|	Table.TransactionCurrency,
 		|	Table.AmountRevaluated AS Amount,
 		|	VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R2021B_CustomersTransactions_CR_R5021T_Revenues) AS
 		|		Operation
@@ -753,6 +765,7 @@ Function T1040T_AccountingAmounts()
 		|	Table.Key AS Key,
 		|	Table.Currency,
 		|	Table.CurrencyMovementType,
+		|	Table.TransactionCurrency,
 		|	Table.AmountRevaluated AS Amount,
 		|	VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R3015B_CashAdvance) AS Operation
 		|FROM
@@ -769,6 +782,7 @@ Function T1040T_AccountingAmounts()
 		|	Table.Key AS Key,
 		|	Table.Currency,
 		|	Table.CurrencyMovementType,
+		|	Table.TransactionCurrency,
 		|	Table.AmountRevaluated AS Amount,
 		|	VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R3015B_CashAdvance_CR_R5021T_Revenues) AS Operation
 		|FROM
@@ -785,6 +799,7 @@ Function T1040T_AccountingAmounts()
 		|	Table.Key AS Key,
 		|	Table.Currency,
 		|	Table.CurrencyMovementType,
+		|	Table.TransactionCurrency,
 		|	Table.AmountRevaluated AS Amount,
 		|	VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R3027B_EmployeeCashAdvance) AS
 		|		Operation
@@ -802,6 +817,7 @@ Function T1040T_AccountingAmounts()
 		|	Table.Key AS Key,
 		|	Table.Currency,
 		|	Table.CurrencyMovementType,
+		|	Table.TransactionCurrency,
 		|	Table.AmountRevaluated AS Amount,
 		|	VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R3027B_EmployeeCashAdvance_CR_R5021T_Revenues) AS
 		|		Operation
@@ -819,6 +835,7 @@ Function T1040T_AccountingAmounts()
 		|	Table.Key AS Key,
 		|	Table.Currency,
 		|	Table.CurrencyMovementType,
+		|	Table.TransactionCurrency,
 		|	Table.AmountRevaluated AS Amount,
 		|	VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R5015B_OtherPartnersTransactions) AS
 		|		Operation
@@ -836,6 +853,7 @@ Function T1040T_AccountingAmounts()
 		|	Table.Key AS Key,
 		|	Table.Currency,
 		|	Table.CurrencyMovementType,
+		|	Table.TransactionCurrency,
 		|	Table.AmountRevaluated AS Amount,
 		|	VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5015B_OtherPartnersTransactions_CR_R5021T_Revenues) AS
 		|		Operation
@@ -853,6 +871,7 @@ Function T1040T_AccountingAmounts()
 		|	Table.Key AS Key,
 		|	Table.Currency,
 		|	Table.CurrencyMovementType,
+		|	Table.TransactionCurrency,
 		|	Table.AmountRevaluated AS Amount,
 		|	VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R8510B_BookValueOfFixedAsset) AS
 		|		Operation
@@ -870,6 +889,7 @@ Function T1040T_AccountingAmounts()
 		|	Table.Key AS Key,
 		|	Table.Currency,
 		|	Table.CurrencyMovementType,
+		|	Table.TransactionCurrency,
 		|	Table.AmountRevaluated AS Amount,
 		|	VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R8510B_BookValueOfFixedAsset_CR_R5021T_Revenues) AS
 		|		Operation

diff --git a/IRP/src/Documents/PurchaseInvoice/Forms/DocumentForm/Form.form b/IRP/src/Documents/PurchaseInvoice/Forms/DocumentForm/Form.form
@@ -2987,7 +2987,7 @@
      </title>
      <title>
       <key>tr</key>
-      <value>Vendor's price</value>
+      <value>Tedarikçi fiyatı</value>
      </title>
      <extendedTooltip>
       <name>VendorPriceExtendedTooltip</name>
@@ -3297,7 +3297,7 @@
       </title>
       <title>
        <key>tr</key>
-       <value>Vendor's price</value>
+       <value>Tedarikçi fiyatı</value>
       </title>
       <visible>true</visible>
       <enabled>true</enabled>

diff --git a/IRP/src/Documents/PurchaseOrder/Forms/DocumentForm/Form.form b/IRP/src/Documents/PurchaseOrder/Forms/DocumentForm/Form.form
@@ -3017,7 +3017,7 @@
      </title>
      <title>
       <key>tr</key>
-      <value>Vendor's price</value>
+      <value>Tedarikçi fiyatı</value>
      </title>
      <extendedTooltip>
       <name>VendorPriceExtendedTooltip</name>