Translate

IRPTeam · Jan 9, 2024 · 1924a4c · 1924a4c
1 parent a5b3d40
commit 1924a4c
Show file tree

Hide file tree

Showing 71 changed files with 10,253 additions and 1,637 deletions.
diff --git a/IRP/src/AccumulationRegisters/R5022T_Expenses/ManagerModule.bsl b/IRP/src/AccumulationRegisters/R5022T_Expenses/ManagerModule.bsl
@@ -98,19 +98,23 @@ Procedure Expenses_LoadRecords(CalculationMovementCostRef) Export
 		CurrenciesParameters = New Structure();
 
 		PostingDataTables = New Map();
-		PostingDataTables.Insert(RecordSet, New Structure("RecordSet", ExpenseTable));
+
+		ExpenseTableSettings = PostingServer.PostingTableSettings(RecordSet.Metadata().Name, ExpenseTable, RecordSet);
+		PostingDataTables.Insert(RecordSet.Metadata(), ExpenseTableSettings);
+
 		ArrayOfPostingInfo = New Array();
 		For Each DataTable In PostingDataTables Do
 			ArrayOfPostingInfo.Add(DataTable);
 		EndDo;
 		CurrenciesParameters.Insert("Object", QuerySelection.Document);
+		CurrenciesParameters.Insert("Metadata", QuerySelection.Document.Metadata());
 		CurrenciesParameters.Insert("ArrayOfPostingInfo", ArrayOfPostingInfo);
 		CurrenciesServer.PreparePostingDataTables(CurrenciesParameters, Undefined);
 
 		For Each ItemOfPostingInfo In ArrayOfPostingInfo Do
-			If TypeOf(ItemOfPostingInfo.Key) = Type("AccumulationRegisterRecordSet.R5022T_Expenses") Then
+			If ItemOfPostingInfo.Key = Metadata.AccumulationRegisters.R5022T_Expenses Then
 				RecordSet.Read();
-				For Each RowPostingInfo In ItemOfPostingInfo.Value.RecordSet Do
+				For Each RowPostingInfo In ItemOfPostingInfo.Value.PrepareTable Do
 					FillPropertyValues(RecordSet.Add(), RowPostingInfo);
 				EndDo;
 				RecordSet.SetActive(True);

diff --git a/IRP/src/AccumulationRegisters/R6020B_BatchBalance/ManagerModule.bsl b/IRP/src/AccumulationRegisters/R6020B_BatchBalance/ManagerModule.bsl
@@ -30,7 +30,7 @@ Procedure BatchBalance_Clear(DocObjectRef, Cancel) Export
 	EndDo;
 EndProcedure
 
-Procedure BatchBalance_CollectRecords(DocObject) Export
+Function BatchBalance_CollectRecords(DocObject) Export
 	Query = New Query;
 	Query.Text =
 	"SELECT
@@ -198,9 +198,8 @@ Procedure BatchBalance_CollectRecords(DocObject) Export
 	|WHERE
 	|	R6040T_BatchShortageIncoming.Document = &Document";
 	Query.SetParameter("Document", DocObject.Ref);
-	QueryResult = Query.Execute();
-	DocObject.RegisterRecords.R6020B_BatchBalance.Load(QueryResult.Unload());
-EndProcedure
+	Return Query.Execute().Unload();
+EndFunction
 
 Procedure BatchBalance_LoadRecords(CalculationMovementCostRef) Export
 	Query = New Query;

diff --git a/IRP/src/AccumulationRegisters/R6060T_CostOfGoodsSold/ManagerModule.bsl b/IRP/src/AccumulationRegisters/R6060T_CostOfGoodsSold/ManagerModule.bsl
@@ -32,7 +32,7 @@ Procedure CostOfGoodsSold_Clear(DocObjectRef, Cancel) Export
 	EndDo;
 EndProcedure
 
-Procedure CostOfGoodsSold_CollectRecords(DocObject) Export
+Function CostOfGoodsSold_CollectRecords(DocObject) Export
 	Query = New Query;
 	Query.Text =
 	"SELECT
@@ -249,9 +249,8 @@ Procedure CostOfGoodsSold_CollectRecords(DocObject) Export
 	|	OR BatchWiseBalance.AllocatedRevenueTaxAmount <> 0)";
 
 	Query.SetParameter("Document", DocObject.Ref);
-	QueryResult = Query.Execute();
-	DocObject.RegisterRecords.R6060T_CostOfGoodsSold.Load(QueryResult.Unload());
-EndProcedure
+	Return Query.Execute().Unload();
+EndFunction
 
 Procedure CostOfGoodsSold_LoadRecords(CalculationMovementCostRef) Export
 	Query = New Query;

diff --git a/IRP/src/AccumulationRegisters/R8510B_BookValueOfFixedAsset/ManagerModule.bsl b/IRP/src/AccumulationRegisters/R8510B_BookValueOfFixedAsset/ManagerModule.bsl
@@ -72,19 +72,23 @@ Procedure BookValueOfFixedAsset_LoadRecords(CalculationMovementCostRef) Export
 		CurrenciesParameters = New Structure();
 
 		PostingDataTables = New Map();
-		PostingDataTables.Insert(RecordSet, New Structure("RecordSet", BookValueTable));
+
+		BookValueTableSettings = PostingServer.PostingTableSettings(RecordSet.Metadata().Name, BookValueTable, RecordSet);
+		PostingDataTables.Insert(RecordSet.Metadata(), BookValueTableSettings);
+
 		ArrayOfPostingInfo = New Array();
 		For Each DataTable In PostingDataTables Do
 			ArrayOfPostingInfo.Add(DataTable);
 		EndDo;
 		CurrenciesParameters.Insert("Object", QuerySelection.Document);
+		CurrenciesParameters.Insert("Metadata", QuerySelection.Document.Metadata());
 		CurrenciesParameters.Insert("ArrayOfPostingInfo", ArrayOfPostingInfo);
 		CurrenciesServer.PreparePostingDataTables(CurrenciesParameters, Undefined);
 
 		For Each ItemOfPostingInfo In ArrayOfPostingInfo Do
-			If TypeOf(ItemOfPostingInfo.Key) = Type("AccumulationRegisterRecordSet.R8510B_BookValueOfFixedAsset") Then
+			If ItemOfPostingInfo.Key = Metadata.AccumulationRegisters.R8510B_BookValueOfFixedAsset Then
 				RecordSet.Read();
-				For Each RowPostingInfo In ItemOfPostingInfo.Value.RecordSet Do
+				For Each RowPostingInfo In ItemOfPostingInfo.Value.PrepareTable Do
 					FillPropertyValues(RecordSet.Add(), RowPostingInfo);
 				EndDo;
 				RecordSet.SetActive(True);

diff --git a/IRP/src/ChartsOfAccounts/Basic/ObjectModule.bsl b/IRP/src/ChartsOfAccounts/Basic/ObjectModule.bsl
@@ -6,7 +6,9 @@ Procedure BeforeWrite(Cancel)
 
 	Result = GetSearchCodeAndOrder(ThisObject.Code);
 	ThisObject.SearchCode = Result.SearchCode;
-	ThisObject.Order = Result.Order;
+	If Not ValueIsFilled(ThisObject.Order) Then
+		ThisObject.Order = Result.Order;
+	EndIf;
 EndProcedure
 
 Function GetSearchCodeAndOrder(_Code)

diff --git a/IRP/src/CommonForms/ReportForm/Form.form b/IRP/src/CommonForms/ReportForm/Form.form
@@ -1061,6 +1061,10 @@
   <headerHorizontalAlign>Left</headerHorizontalAlign>
   <showInFooter>true</showInFooter>
   <extInfo xsi:type="form:SpreadSheetDocFieldExtInfo">
+   <handlers>
+    <event>DetailProcessing</event>
+    <name>ResultDetailProcessing</name>
+   </handlers>
    <width>100</width>
    <autoMaxWidth>true</autoMaxWidth>
    <height>10</height>
@@ -1517,6 +1521,31 @@
    <itemValueType/>
   </extInfo>
  </attributes>
+ <attributes>
+  <name>IsDetailProcessing</name>
+  <title>
+   <key>en</key>
+   <value>Is detail processing</value>
+  </title>
+  <title>
+   <key>ru</key>
+   <value>Обрабатывается детализация</value>
+  </title>
+  <title>
+   <key>tr</key>
+   <value>Detal işleniyor</value>
+  </title>
+  <id>5</id>
+  <valueType>
+   <types>Boolean</types>
+  </valueType>
+  <view>
+   <common>true</common>
+  </view>
+  <edit>
+   <common>true</common>
+  </edit>
+ </attributes>
  <formCommands>
   <name>CustomParameters</name>
   <title>
@@ -1567,6 +1596,12 @@
   </action>
   <currentRowUse>Auto</currentRowUse>
  </formCommands>
+ <parameters>
+  <name>IsDetailProcessing</name>
+  <valueType>
+   <types>Boolean</types>
+  </valueType>
+ </parameters>
  <commandInterface>
   <navigationPanel/>
   <commandBar/>