Translate

IRPTeam · Jul 6, 2023 · c54a45a · c54a45a
1 parent 25c735f
commit c54a45a
Show file tree

Hide file tree

Showing 216 changed files with 4,806 additions and 761 deletions.
diff --git a/IRP/src/AccumulationRegisters/R3021B_CashInTransitIncoming/R3021B_CashInTransitIncoming.mdo b/IRP/src/AccumulationRegisters/R3021B_CashInTransitIncoming/R3021B_CashInTransitIncoming.mdo
@@ -219,28 +219,6 @@
   <fullTextSearch>Use</fullTextSearch>
   <useInTotals>true</useInTotals>
  </dimensions>
- <dimensions uuid="ed747d28-4afe-435b-8579-07bbaed4815b">
-  <name>ReceiptingAccount</name>
-  <synonym>
-   <key>en</key>
-   <value>Receipting account</value>
-  </synonym>
-  <synonym>
-   <key>ru</key>
-   <value>Касса/банк получатель</value>
-  </synonym>
-  <synonym>
-   <key>tr</key>
-   <value>Alıcı kasa/banka</value>
-  </synonym>
-  <type>
-   <types>CatalogRef.CashAccounts</types>
-  </type>
-  <minValue xsi:type="core:UndefinedValue"/>
-  <maxValue xsi:type="core:UndefinedValue"/>
-  <fullTextSearch>Use</fullTextSearch>
-  <useInTotals>true</useInTotals>
- </dimensions>
  <dimensions uuid="c4ecb6fc-0deb-4331-a72e-3ebf6ae58a82">
   <name>Basis</name>
   <synonym>

diff --git a/IRP/src/Catalogs/AccessGroups/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/AccessGroups/Forms/ItemForm/Module.bsl
@@ -34,4 +34,9 @@ Procedure AddAttributesCreateFormControl()
 	AddAttributesAndPropertiesServer.CreateFormControls(ThisObject);
 EndProcedure
 
+&AtClient
+Procedure AddAttributeButtonClick(Item) Export
+	AddAttributesAndPropertiesClient.AddAttributeButtonClick(ThisObject, Item);
+EndProcedure
+
 #EndRegion
diff --git a/IRP/src/Catalogs/AccessProfiles/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/AccessProfiles/Forms/ItemForm/Module.bsl
@@ -79,4 +79,9 @@ Procedure AddAttributesCreateFormControl()
 	AddAttributesAndPropertiesServer.CreateFormControls(ThisObject);
 EndProcedure
 
+&AtClient
+Procedure AddAttributeButtonClick(Item) Export
+	AddAttributesAndPropertiesClient.AddAttributeButtonClick(ThisObject, Item);
+EndProcedure
+
 #EndRegion
diff --git a/IRP/src/Catalogs/AccountingOperations/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/AccountingOperations/Forms/ItemForm/Module.bsl
@@ -35,4 +35,9 @@ Procedure AddAttributesCreateFormControl()
 	AddAttributesAndPropertiesServer.CreateFormControls(ThisObject);
 EndProcedure
 
+&AtClient
+Procedure AddAttributeButtonClick(Item) Export
+	AddAttributesAndPropertiesClient.AddAttributeButtonClick(ThisObject, Item);
+EndProcedure
+
 #EndRegion
diff --git a/IRP/src/Catalogs/AccrualAndDeductionTypes/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/AccrualAndDeductionTypes/Forms/ItemForm/Module.bsl
@@ -65,4 +65,9 @@ Procedure AddAttributesCreateFormControl()
 	AddAttributesAndPropertiesServer.CreateFormControls(ThisObject);
 EndProcedure
 
+&AtClient
+Procedure AddAttributeButtonClick(Item) Export
+	AddAttributesAndPropertiesClient.AddAttributeButtonClick(ThisObject, Item);
+EndProcedure
+
 #EndRegion
diff --git a/IRP/src/Catalogs/Addresses/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/Addresses/Forms/ItemForm/Module.bsl
@@ -35,4 +35,9 @@ Procedure AddAttributesCreateFormControl()
 	AddAttributesAndPropertiesServer.CreateFormControls(ThisObject);
 EndProcedure
 
+&AtClient
+Procedure AddAttributeButtonClick(Item) Export
+	AddAttributesAndPropertiesClient.AddAttributeButtonClick(ThisObject, Item);
+EndProcedure
+
 #EndRegion
diff --git a/IRP/src/Catalogs/Agreements/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/Agreements/Forms/ItemForm/Module.bsl
@@ -315,4 +315,9 @@ Procedure AddAttributesCreateFormControl()
 	AddAttributesAndPropertiesServer.CreateFormControls(ThisObject);
 EndProcedure
 
+&AtClient
+Procedure AddAttributeButtonClick(Item) Export
+	AddAttributesAndPropertiesClient.AddAttributeButtonClick(ThisObject, Item);
+EndProcedure
+
 #EndRegion
diff --git a/IRP/src/Catalogs/BankTerms/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/BankTerms/Forms/ItemForm/Module.bsl
@@ -42,6 +42,11 @@ Procedure AddAttributesCreateFormControl()
 	AddAttributesAndPropertiesServer.CreateFormControls(ThisObject);
 EndProcedure
 
+&AtClient
+Procedure AddAttributeButtonClick(Item) Export
+	AddAttributesAndPropertiesClient.AddAttributeButtonClick(ThisObject, Item);
+EndProcedure
+
 #EndRegion
 
 #Region Actions

diff --git a/IRP/src/Catalogs/BillOfMaterials/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/BillOfMaterials/Forms/ItemForm/Module.bsl
@@ -337,6 +337,11 @@ Procedure AddAttributesCreateFormControl()
 	AddAttributesAndPropertiesServer.CreateFormControls(ThisObject);
 EndProcedure
 
+&AtClient
+Procedure AddAttributeButtonClick(Item) Export
+	AddAttributesAndPropertiesClient.AddAttributeButtonClick(ThisObject, Item);
+EndProcedure
+
 #EndRegion
 
 &AtClient

diff --git a/IRP/src/Catalogs/BillOfMaterials/ManagerModule.bsl b/IRP/src/Catalogs/BillOfMaterials/ManagerModule.bsl
@@ -1,5 +1,5 @@
 
-Function GetBillOfMaterialsByItemKey(ItemKey) Export
+Function GetBillOfMaterialsByItemKey(ItemKey, BusinessUnit = Undefined) Export
 	Query = New Query();
 	Query.Text = 
 		"SELECT
@@ -10,16 +10,31 @@ Function GetBillOfMaterialsByItemKey(ItemKey) Export
 		|	ItemKeys.Ref = &ItemKey
 		|	AND NOT ItemKeys.DefaultBillOfMaterials.DeletionMark
 		|	AND ItemKeys.DefaultBillOfMaterials.Active
-		|;		
+		|	and case
+		|		when &Filter_BusinessUnit
+		|			then ItemKeys.DefaultBillOfMaterials.BusinessUnit = &BusinessUnit
+		|		else true
+		|	end
+		|;
+		|
+		|////////////////////////////////////////////////////////////////////////////////
 		|SELECT TOP 2
 		|	Table.Ref
 		|FROM
 		|	Catalog.BillOfMaterials AS Table
 		|WHERE
 		|	Table.ItemKey = &ItemKey
 		|	AND NOT Table.DeletionMark
-		|	AND Table.Active";
+		|	AND Table.Active
+		|	and case
+		|		when &Filter_BusinessUnit
+		|			then Table.BusinessUnit = &BusinessUnit
+		|		else true
+		|	end";
 	Query.SetParameter("ItemKey", ItemKey);
+	Query.SetParameter("BusinessUnit", BusinessUnit);
+	Query.SetParameter("Filter_BusinessUnit", BusinessUnit <> Undefined);
+
 	QueryResults = Query.ExecuteBatch();
 	DefaultRef = QueryResults[0].Unload();
 	If DefaultRef.Count() Then

diff --git a/IRP/src/Catalogs/BusinessUnits/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/BusinessUnits/Forms/ItemForm/Module.bsl
@@ -84,4 +84,9 @@ Procedure AddAttributesCreateFormControl()
 	AddAttributesAndPropertiesServer.CreateFormControls(ThisObject);
 EndProcedure
 
+&AtClient
+Procedure AddAttributeButtonClick(Item) Export
+	AddAttributesAndPropertiesClient.AddAttributeButtonClick(ThisObject, Item);
+EndProcedure
+
 #EndRegion
diff --git a/IRP/src/Catalogs/CancelReturnReasons/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/CancelReturnReasons/Forms/ItemForm/Module.bsl
@@ -33,4 +33,9 @@ Procedure AddAttributesCreateFormControl()
 	AddAttributesAndPropertiesServer.CreateFormControls(ThisObject);
 EndProcedure
 
+&AtClient
+Procedure AddAttributeButtonClick(Item) Export
+	AddAttributesAndPropertiesClient.AddAttributeButtonClick(ThisObject, Item);
+EndProcedure
+
 #EndRegion
diff --git a/IRP/src/Catalogs/CashAccounts/Forms/ItemForm/Form.form b/IRP/src/Catalogs/CashAccounts/Forms/ItemForm/Form.form
@@ -1092,10 +1092,6 @@
    <event>AfterWriteAtServer</event>
    <name>AfterWriteAtServer</name>
   </handlers>
-  <handlers>
-   <event>BeforeWrite</event>
-   <name>BeforeWrite</name>
-  </handlers>
   <handlers>
    <event>BeforeWriteAtServer</event>
    <name>BeforeWriteAtServer</name>

diff --git a/IRP/src/Catalogs/CashAccounts/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/CashAccounts/Forms/ItemForm/Module.bsl
@@ -34,11 +34,6 @@ Procedure OnCreateAtServer(Cancel, StandardProcessing)
 	SetVisibilityAvailability(Object, ThisObject);
 EndProcedure
 
-&AtClient
-Procedure BeforeWrite(Cancel, WriteParameters)
-	CatCashAccountsClient.BeforeWrite(Object, ThisObject, Cancel, WriteParameters);
-EndProcedure
-
 &AtServer
 Procedure FillCheckProcessingAtServer(Cancel, CheckedAttributes)
 	If ThisObject.CurrencyType = "Fixed" And Not ValueIsFilled(Object.Currency) Then
@@ -162,4 +157,9 @@ Procedure AddAttributesCreateFormControl()
 	AddAttributesAndPropertiesServer.CreateFormControls(ThisObject);
 EndProcedure
 
+&AtClient
+Procedure AddAttributeButtonClick(Item) Export
+	AddAttributesAndPropertiesClient.AddAttributeButtonClick(ThisObject, Item);
+EndProcedure
+
 #EndRegion
diff --git a/IRP/src/Catalogs/CashStatementStatuses/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/CashStatementStatuses/Forms/ItemForm/Module.bsl
@@ -37,4 +37,9 @@ Procedure AddAttributesCreateFormControl()
 	AddAttributesAndPropertiesServer.CreateFormControls(ThisObject);
 EndProcedure
 
+&AtClient
+Procedure AddAttributeButtonClick(Item) Export
+	AddAttributesAndPropertiesClient.AddAttributeButtonClick(ThisObject, Item);
+EndProcedure
+
 #EndRegion
diff --git a/IRP/src/Catalogs/ChequeBonds/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/ChequeBonds/Forms/ItemForm/Module.bsl
@@ -32,4 +32,9 @@ Procedure AddAttributesCreateFormControl()
 	AddAttributesAndPropertiesServer.CreateFormControls(ThisObject);
 EndProcedure
 
+&AtClient
+Procedure AddAttributeButtonClick(Item) Export
+	AddAttributesAndPropertiesClient.AddAttributeButtonClick(ThisObject, Item);
+EndProcedure
+
 #EndRegion
diff --git a/IRP/src/Catalogs/Companies/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/Companies/Forms/ItemForm/Module.bsl
@@ -214,9 +214,14 @@ Procedure AddAttributesCreateFormControl()
 	AddAttributesAndPropertiesServer.CreateFormControls(ThisObject);
 EndProcedure
 
+&AtClient
+Procedure AddAttributeButtonClick(Item) Export
+	AddAttributesAndPropertiesClient.AddAttributeButtonClick(ThisObject, Item);
+EndProcedure
+
+#EndRegion
+
 &AtServer
 Procedure IDInfoCreateFormControl()
 	IDInfoServer.CreateFormControls(ThisObject);
 EndProcedure
-
-#EndRegion
diff --git a/IRP/src/Catalogs/Countries/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/Countries/Forms/ItemForm/Module.bsl
@@ -38,4 +38,9 @@ Procedure AddAttributesCreateFormControl()
 	AddAttributesAndPropertiesServer.CreateFormControls(ThisObject);
 EndProcedure
 
+&AtClient
+Procedure AddAttributeButtonClick(Item) Export
+	AddAttributesAndPropertiesClient.AddAttributeButtonClick(ThisObject, Item);
+EndProcedure
+
 #EndRegion
diff --git a/IRP/src/Catalogs/Currencies/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/Currencies/Forms/ItemForm/Module.bsl
@@ -38,4 +38,9 @@ Procedure AddAttributesCreateFormControl()
 	AddAttributesAndPropertiesServer.CreateFormControls(ThisObject);
 EndProcedure
 
+&AtClient
+Procedure AddAttributeButtonClick(Item) Export
+	AddAttributesAndPropertiesClient.AddAttributeButtonClick(ThisObject, Item);
+EndProcedure
+
 #EndRegion
diff --git a/IRP/src/Catalogs/DataAreas/Forms/ListForm/Module.bsl b/IRP/src/Catalogs/DataAreas/Forms/ListForm/Module.bsl
diff --git a/IRP/src/Catalogs/EmployeePositions/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/EmployeePositions/Forms/ItemForm/Module.bsl
@@ -61,4 +61,9 @@ Procedure AddAttributesCreateFormControl()
 	AddAttributesAndPropertiesServer.CreateFormControls(ThisObject);
 EndProcedure
 
+&AtClient
+Procedure AddAttributeButtonClick(Item) Export
+	AddAttributesAndPropertiesClient.AddAttributeButtonClick(ThisObject, Item);
+EndProcedure
+
 #EndRegion
diff --git a/IRP/src/Catalogs/EquipmentDrivers/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/EquipmentDrivers/Forms/ItemForm/Module.bsl
@@ -230,4 +230,9 @@ Procedure AddAttributesCreateFormControl()
 	AddAttributesAndPropertiesServer.CreateFormControls(ThisObject);
 EndProcedure
 
+&AtClient
+Procedure AddAttributeButtonClick(Item) Export
+	AddAttributesAndPropertiesClient.AddAttributeButtonClick(ThisObject, Item);
+EndProcedure
+
 #EndRegion
diff --git a/IRP/src/Catalogs/ExpenseAndRevenueTypes/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/ExpenseAndRevenueTypes/Forms/ItemForm/Module.bsl
@@ -78,4 +78,9 @@ Procedure AddAttributesCreateFormControl()
 	AddAttributesAndPropertiesServer.CreateFormControls(ThisObject);
 EndProcedure
 
+&AtClient
+Procedure AddAttributeButtonClick(Item) Export
+	AddAttributesAndPropertiesClient.AddAttributeButtonClick(ThisObject, Item);
+EndProcedure
+
 #EndRegion
diff --git a/IRP/src/Catalogs/ExternalDataProc/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/ExternalDataProc/Forms/ItemForm/Module.bsl
@@ -112,4 +112,9 @@ Procedure AddAttributesCreateFormControl()
 	AddAttributesAndPropertiesServer.CreateFormControls(ThisObject);
 EndProcedure
 
+&AtClient
+Procedure AddAttributeButtonClick(Item) Export
+	AddAttributesAndPropertiesClient.AddAttributeButtonClick(ThisObject, Item);
+EndProcedure
+
 #EndRegion
diff --git a/IRP/src/Catalogs/FileStorageVolumes/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/FileStorageVolumes/Forms/ItemForm/Module.bsl
@@ -28,4 +28,9 @@ Procedure AddAttributesCreateFormControl()
 	AddAttributesAndPropertiesServer.CreateFormControls(ThisObject);
 EndProcedure
 
+&AtClient
+Procedure AddAttributeButtonClick(Item) Export
+	AddAttributesAndPropertiesClient.AddAttributeButtonClick(ThisObject, Item);
+EndProcedure
+
 #EndRegion
diff --git a/IRP/src/Catalogs/FileStoragesInfo/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/FileStoragesInfo/Forms/ItemForm/Module.bsl
@@ -28,4 +28,9 @@ Procedure AddAttributesCreateFormControl()
 	AddAttributesAndPropertiesServer.CreateFormControls(ThisObject);
 EndProcedure
 
+&AtClient
+Procedure AddAttributeButtonClick(Item) Export
+	AddAttributesAndPropertiesClient.AddAttributeButtonClick(ThisObject, Item);
+EndProcedure
+
 #EndRegion
diff --git a/IRP/src/Catalogs/Files/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/Files/Forms/ItemForm/Module.bsl
@@ -100,4 +100,9 @@ Procedure AddAttributesCreateFormControl()
 	AddAttributesAndPropertiesServer.CreateFormControls(ThisObject);
 EndProcedure
 
+&AtClient
+Procedure AddAttributeButtonClick(Item) Export
+	AddAttributesAndPropertiesClient.AddAttributeButtonClick(ThisObject, Item);
+EndProcedure
+
 #EndRegion
diff --git a/IRP/src/Catalogs/FillingTemplates/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/FillingTemplates/Forms/ItemForm/Module.bsl
@@ -42,6 +42,8 @@ Procedure DescriptionOpening(Item, StandardProcessing) Export
 	LocalizationClient.DescriptionOpening(Object, ThisObject, Item, StandardProcessing);
 EndProcedure
 
+#Region AddAttributes
+
 // Add attribute start choice.
 // 
 // Parameters:
@@ -56,4 +58,11 @@ EndProcedure
 &AtServer
 Procedure AddAttributesCreateFormControl()
 	AddAttributesAndPropertiesServer.CreateFormControls(ThisObject);
-EndProcedure
+EndProcedure
+
+&AtClient
+Procedure AddAttributeButtonClick(Item) Export
+	AddAttributesAndPropertiesClient.AddAttributeButtonClick(ThisObject, Item);
+EndProcedure
+
+#EndRegion