From ee781aa6da480de29d8c0cd89465b96de6118919 Mon Sep 17 00:00:00 2001 From: DitriXNew Date: Thu, 11 May 2023 16:58:32 +0300 Subject: [PATCH] Translate --- IRP/src/CommonForms/CodeStringCheck/Form.form | 77 +++++++++++++++++++ .../CommonForms/CodeStringCheck/Module.bsl | 11 ++- .../EquipmentFiscalPrinterClient/Module.bsl | 8 +- IRP/src/CommonModules/Log/Log.mdo | 20 +++++ IRP/src/CommonModules/Log/Module.bsl | 36 +++++++++ IRP/src/Configuration/Configuration.mdo | 1 + .../PointOfSale/Forms/Form/Module.bsl | 3 +- .../ObjectModule.bsl | 1 - .../Forms/DocumentForm/Module.bsl | 3 +- .../Forms/DocumentForm/Module.bsl | 3 +- Unit/src/Catalogs/ItemKeys/ItemKeys.mdo | 7 -- Unit/src/Catalogs/Items/Items.mdo | 6 -- .../AddAttributeAndProperty.mdo | 1 - .../CurrencyMovementType.mdo | 5 -- Unit/src/CommonAttributes/Author/Author.mdo | 3 - Unit/src/CommonAttributes/Branch/Branch.mdo | 3 - .../Description/Description.mdo | 3 - .../Description_en/Description_en.mdo | 3 - .../Description_hash/Description_hash.mdo | 3 - .../Description_ru/Description_ru.mdo | 3 - .../Description_tr/Description_tr.mdo | 3 - .../DocumentAmount/DocumentAmount.mdo | 3 - Unit/src/CommonAttributes/Height/Height.mdo | 3 - Unit/src/CommonAttributes/ID/ID.mdo | 3 - Unit/src/CommonAttributes/Length/Length.mdo | 3 - .../CommonAttributes/UniqueID/UniqueID.mdo | 3 - Unit/src/CommonAttributes/Volume/Volume.mdo | 3 - Unit/src/CommonAttributes/Weight/Weight.mdo | 3 - Unit/src/CommonAttributes/Width/Width.mdo | 3 - Unit/src/CommonForms/AttachFile/Form.form | 9 --- Unit/src/Constants/SaasMode/SaasMode.mdo | 1 - .../typeAddPropertyOwners.mdo | 1 - .../DefinedTypes/typeAmount/typeAmount.mdo | 1 - .../typeDescription/typeDescription.mdo | 1 - .../typeFilesOwner/typeFilesOwner.mdo | 1 - 35 files changed, 151 insertions(+), 90 deletions(-) create mode 100644 IRP/src/CommonModules/Log/Log.mdo create mode 100644 IRP/src/CommonModules/Log/Module.bsl diff --git a/IRP/src/CommonForms/CodeStringCheck/Form.form b/IRP/src/CommonForms/CodeStringCheck/Form.form index 36ae494b4f..c72586744c 100644 --- a/IRP/src/CommonForms/CodeStringCheck/Form.form +++ b/IRP/src/CommonForms/CodeStringCheck/Form.form @@ -153,6 +153,52 @@ true + + isReturn + 36 + true + true + + true + + + isReturn + + + isReturnExtendedTooltip + 38 + true + true + + true + + Label + true + true + + Left + + + + isReturnContextMenu + 37 + true + true + + true + + true + + CheckBoxField + true + Enter + true + Left + true + + CheckBox + + DecorationInfo 12 @@ -794,6 +840,31 @@ + + isReturn + + <key>en</key> + <value>Is return</value> + + + <key>ru</key> + <value>Это возврат</value> + + + <key>tr</key> + <value>Bu iade</value> + + 10 + + Boolean + + + true + + + true + + SearchByBarcode @@ -908,6 +979,12 @@ </numberQualifiers> </valueType> </parameters> + <parameters> + <name>isReturn</name> + <valueType> + <types>Boolean</types> + </valueType> + </parameters> <commandInterface> <navigationPanel/> <commandBar/> diff --git a/IRP/src/CommonForms/CodeStringCheck/Module.bsl b/IRP/src/CommonForms/CodeStringCheck/Module.bsl index 3846cd626b..faea8e977c 100644 --- a/IRP/src/CommonForms/CodeStringCheck/Module.bsl +++ b/IRP/src/CommonForms/CodeStringCheck/Module.bsl @@ -7,6 +7,7 @@ Procedure OnCreateAtServer(Cancel, StandardProcessing) ItemKey = Parameters.ItemKey; LineNumber = Parameters.LineNumber; RowKey = Parameters.RowKey; + isReturn = Parameters.isReturn; EndProcedure &AtClient @@ -81,7 +82,7 @@ Async Procedure SearchByBarcodeEnd(Result, AdditionalParameters = Undefined) Exp AllBarcodesIsOk = True; For Each StringCode In ArrayOfApprovedCodeStrings Do // String - RequestKMSettings = EquipmentFiscalPrinterClient.RequestKMSettings(); + RequestKMSettings = EquipmentFiscalPrinterClient.RequestKMSettings(isReturn); RequestKMSettings.Quantity = 1; RequestKMSettings.MarkingCode = StringCode; @@ -89,7 +90,9 @@ Async Procedure SearchByBarcodeEnd(Result, AdditionalParameters = Undefined) Exp If Not Result.Approved Then AllBarcodesIsOk = False; - CommonFunctionsClientServer.ShowUsersMessage(CommonFunctionsServer.SerializeJSON(Result)); + Log.Write("CodeStringCheck.CheckKM.Approved.False", Result, , , Hardware); + CommonFunctionsClientServer.ShowUsersMessage(StrTemplate(R().EqFP_ProblemWhileCheckCodeString, StringCode)); + Done(); Return; EndIf; NewRow = CurrentCodes.Add(); @@ -100,7 +103,7 @@ Async Procedure SearchByBarcodeEnd(Result, AdditionalParameters = Undefined) Exp If AllBarcodesIsOk And ArrayOfApprovedCodeStrings.Count() > 0 Then Done(); EndIf; - + EndProcedure &AtClient @@ -130,7 +133,7 @@ EndFunction Async Procedure CheckKM(Command) For Each SelectedID In Items.CurrentCodes.SelectedRows Do // Number Row = CurrentCodes.FindByID(SelectedID); - RequestKMSettings = EquipmentFiscalPrinterClient.RequestKMSettings(); + RequestKMSettings = EquipmentFiscalPrinterClient.RequestKMSettings(isReturn); RequestKMSettings.Quantity = 1; RequestKMSettings.MarkingCode = Row.StringCode; diff --git a/IRP/src/CommonModules/EquipmentFiscalPrinterClient/Module.bsl b/IRP/src/CommonModules/EquipmentFiscalPrinterClient/Module.bsl index 722157a450..538c04c989 100644 --- a/IRP/src/CommonModules/EquipmentFiscalPrinterClient/Module.bsl +++ b/IRP/src/CommonModules/EquipmentFiscalPrinterClient/Module.bsl @@ -232,7 +232,7 @@ Async Function ProcessCheck(ConsolidatedRetailSales, DataSource) Export If TypeOf(DataSource) = Type("DocumentRef.RetailSalesReceipt") Or TypeOf(DataSource) = Type("DocumentRef.RetailReturnReceipt") Then - + isReturn = TypeOf(DataSource) = Type("DocumentRef.RetailReturnReceipt"); CodeStringList = EquipmentFiscalPrinterServer.GetStringCode(DataSource); If CodeStringList.Count() > 0 Then @@ -242,7 +242,7 @@ Async Function ProcessCheck(ConsolidatedRetailSales, DataSource) Export ArrayForApprove = New Array; // Array Of String For Each CodeString In EquipmentFiscalPrinterServer.GetStringCode(DataSource) Do - RequestKMSettings = RequestKMSettings(); + RequestKMSettings = RequestKMSettings(isReturn); RequestKMSettings.MarkingCode = CodeString; RequestKMSettings.Quantity = 1; CheckResult = Device_CheckKM(Settings.ConnectedDriver, Settings.ConnectedDriver.DriverObject, RequestKMSettings, False); @@ -497,12 +497,12 @@ EndFunction // * MarkingCode - String - // * PlannedStatus - Number - // * Quantity - Number - -Function RequestKMSettings() Export +Function RequestKMSettings(isReturn = False) Export Str = New Structure; Str.Insert("GUID", String(New UUID())); Str.Insert("WaitForResult", True); Str.Insert("MarkingCode", ""); - Str.Insert("PlannedStatus", 1); + Str.Insert("PlannedStatus", ?(isReturn, 3, 1)); Str.Insert("Quantity", 1); Return Str; EndFunction diff --git a/IRP/src/CommonModules/Log/Log.mdo b/IRP/src/CommonModules/Log/Log.mdo new file mode 100644 index 0000000000..e2f20d8bd9 --- /dev/null +++ b/IRP/src/CommonModules/Log/Log.mdo @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<mdclass:CommonModule xmlns:mdclass="http://g5.1c.ru/v8/dt/metadata/mdclass" uuid="d43bb0be-c8b2-4b03-9eb0-d3f39140f603"> + <name>Log</name> + <synonym> + <key>en</key> + <value>Log</value> + </synonym> + <synonym> + <key>ru</key> + <value>Логи</value> + </synonym> + <synonym> + <key>tr</key> + <value>Log</value> + </synonym> + <server>true</server> + <externalConnection>true</externalConnection> + <clientOrdinaryApplication>true</clientOrdinaryApplication> + <serverCall>true</serverCall> +</mdclass:CommonModule> \ No newline at end of file diff --git a/IRP/src/CommonModules/Log/Module.bsl b/IRP/src/CommonModules/Log/Module.bsl new file mode 100644 index 0000000000..43d50db1fc --- /dev/null +++ b/IRP/src/CommonModules/Log/Module.bsl @@ -0,0 +1,36 @@ +// @strict-types + +// Write. +// +// Parameters: +// Name - String - Event name. Ex. "Send to API" +// Log - Arbitrary, String - Log data. String, or serializeble object, ex. Structure, Map, Array +// Level - Number - Level: +// 0 - Error +// 1 - Info +// 2 - Warning +// 3 - Note +// Step - String - Add part to event name. "Name.Step" +// Ref - Undefined - Ref to db data +Procedure Write(Name, Log, Level = 0, Step = "", Ref = Undefined) Export + + If Level = 0 Then + EventLevel = EventLogLevel.Error; + ElsIf Level = 1 Then + EventLevel = EventLogLevel.Information; + ElsIf Level = 2 Then + EventLevel = EventLogLevel.Warning; + Else + EventLevel = EventLogLevel.Note; + EndIf; + + If Not TypeOf(Log) = Type("String") Then + Try + Log = CommonFunctionsServer.SerializeJSON(Log); + Except + Log = String(Log); + EndTry; + EndIf; + + WriteLogEvent(Name, EventLevel, , Ref, Log); +EndProcedure \ No newline at end of file diff --git a/IRP/src/Configuration/Configuration.mdo b/IRP/src/Configuration/Configuration.mdo index bf1d592a32..43d6c5f863 100644 --- a/IRP/src/Configuration/Configuration.mdo +++ b/IRP/src/Configuration/Configuration.mdo @@ -562,6 +562,7 @@ <commonModules>CommonModule.SerialLotNumberClientServer</commonModules> <commonModules>CommonModule.SourceOfOriginClientServer</commonModules> <commonModules>CommonModule.ControlCodeStringsClient</commonModules> + <commonModules>CommonModule.Log</commonModules> <commonAttributes>CommonAttribute.Author</commonAttributes> <commonAttributes>CommonAttribute.Branch</commonAttributes> <commonAttributes>CommonAttribute.Description</commonAttributes> diff --git a/IRP/src/DataProcessors/PointOfSale/Forms/Form/Module.bsl b/IRP/src/DataProcessors/PointOfSale/Forms/Form/Module.bsl index b988b1c9a3..b85b09a0f4 100644 --- a/IRP/src/DataProcessors/PointOfSale/Forms/Form/Module.bsl +++ b/IRP/src/DataProcessors/PointOfSale/Forms/Form/Module.bsl @@ -679,6 +679,7 @@ Procedure ItemListControlCodeStringStateClick() Export Params.Insert("Item", CurrentData.Item); Params.Insert("ItemKey", CurrentData.ItemKey); Params.Insert("LineNumber", CurrentData.LineNumber); + Params.Insert("isReturn", isReturn); Notify = New NotifyDescription("ItemListControlCodeStringStateOpeningEnd", ThisObject, Params); OpenForm("CommonForm.CodeStringCheck", Params, ThisObject, , , , Notify, FormWindowOpeningMode.LockOwnerWindow); @@ -702,7 +703,7 @@ Procedure ItemListControlCodeStringStateOpeningEnd(Result, AddInfo) Export EndDo; ControlCodeStringsClient.UpdateState(Object); - + Modified = True; EndProcedure #Region SpecialOffers diff --git a/IRP/src/Documents/ProductionPlanningClosing/ObjectModule.bsl b/IRP/src/Documents/ProductionPlanningClosing/ObjectModule.bsl index a6b7843a33..c030d8e6b3 100644 --- a/IRP/src/Documents/ProductionPlanningClosing/ObjectModule.bsl +++ b/IRP/src/Documents/ProductionPlanningClosing/ObjectModule.bsl @@ -60,7 +60,6 @@ Procedure Filling(FillingData, FillingText, StandardProcessing) ControllerClientServer_V2.SetReadOnlyProperties(ThisObject, FillingData); ThisObject.ProductionPlanning = FillingData.ProductionPlanning; ThisObject.Company = FillingData.Company; - ThisObject.Branch = FillingData.Branch; ThisObject.BusinessUnit = FillingData.BusinessUnit; EndIf; EndIf; diff --git a/IRP/src/Documents/RetailReturnReceipt/Forms/DocumentForm/Module.bsl b/IRP/src/Documents/RetailReturnReceipt/Forms/DocumentForm/Module.bsl index 44817bed8b..e106a4e949 100644 --- a/IRP/src/Documents/RetailReturnReceipt/Forms/DocumentForm/Module.bsl +++ b/IRP/src/Documents/RetailReturnReceipt/Forms/DocumentForm/Module.bsl @@ -812,6 +812,7 @@ Procedure ItemListControlCodeStringStateClick() Export Params.Insert("Item", CurrentData.Item); Params.Insert("ItemKey", CurrentData.ItemKey); Params.Insert("LineNumber", CurrentData.LineNumber); + Params.Insert("isReturn", True); Notify = New NotifyDescription("ItemListControlCodeStringStateOpeningEnd", ThisObject, Params); OpenForm("CommonForm.CodeStringCheck", Params, ThisObject, , , , Notify, FormWindowOpeningMode.LockOwnerWindow); @@ -835,7 +836,7 @@ Procedure ItemListControlCodeStringStateOpeningEnd(Result, AddInfo) Export EndDo; ControlCodeStringsClient.UpdateState(Object); - + Modified = True; EndProcedure #EndRegion diff --git a/IRP/src/Documents/RetailSalesReceipt/Forms/DocumentForm/Module.bsl b/IRP/src/Documents/RetailSalesReceipt/Forms/DocumentForm/Module.bsl index 37cb98e0e1..6a69e50f3b 100644 --- a/IRP/src/Documents/RetailSalesReceipt/Forms/DocumentForm/Module.bsl +++ b/IRP/src/Documents/RetailSalesReceipt/Forms/DocumentForm/Module.bsl @@ -829,6 +829,7 @@ Procedure ItemListControlCodeStringStateClick() Export Params.Insert("Item", CurrentData.Item); Params.Insert("ItemKey", CurrentData.ItemKey); Params.Insert("LineNumber", CurrentData.LineNumber); + Params.Insert("isReturn", False); Notify = New NotifyDescription("ItemListControlCodeStringStateOpeningEnd", ThisObject, Params); OpenForm("CommonForm.CodeStringCheck", Params, ThisObject, , , , Notify, FormWindowOpeningMode.LockOwnerWindow); @@ -852,7 +853,7 @@ Procedure ItemListControlCodeStringStateOpeningEnd(Result, AddInfo) Export EndDo; ControlCodeStringsClient.UpdateState(Object); - + Modified = True; EndProcedure #EndRegion diff --git a/Unit/src/Catalogs/ItemKeys/ItemKeys.mdo b/Unit/src/Catalogs/ItemKeys/ItemKeys.mdo index 3422a797c7..bc1b8c5508 100644 --- a/Unit/src/Catalogs/ItemKeys/ItemKeys.mdo +++ b/Unit/src/Catalogs/ItemKeys/ItemKeys.mdo @@ -21,7 +21,6 @@ </types> </typeExtension> </extension> - <type/> </attributes> <attributes uuid="e24992d8-4e4b-48fb-9e33-1ecff27521fe"> <name>Unit</name> @@ -34,7 +33,6 @@ </types> </typeExtension> </extension> - <type/> </attributes> <attributes uuid="bed58c0a-067f-4c6d-a9b1-484e01981e58"> <name>Specification</name> @@ -47,7 +45,6 @@ </types> </typeExtension> </extension> - <type/> </attributes> <attributes uuid="0b3eea57-92cf-4afb-a48a-9f29dd8414ea"> <name>AffectPricingMD5</name> @@ -63,7 +60,6 @@ </stringQualifiers> </typeExtension> </extension> - <type/> </attributes> <attributes uuid="6bdf1e79-77a8-4713-9f71-1a618a8163dd"> <name>UniqueMD5</name> @@ -79,7 +75,6 @@ </stringQualifiers> </typeExtension> </extension> - <type/> </attributes> <attributes uuid="0335ab5b-d050-46e0-8d7b-232875676960"> <name>ItemKeyID</name> @@ -95,7 +90,6 @@ </stringQualifiers> </typeExtension> </extension> - <type/> </attributes> <tabularSections uuid="e308f718-cb1d-42a1-9be7-d3fe7b6113f7"> <producedTypes> @@ -119,7 +113,6 @@ </stringQualifiers> </typeExtension> </extension> - <type/> </attributes> </tabularSections> <forms uuid="3fc2847e-aa4b-4477-acfb-df076db489fd"> diff --git a/Unit/src/Catalogs/Items/Items.mdo b/Unit/src/Catalogs/Items/Items.mdo index ac7758cf4c..d1ed7336b2 100644 --- a/Unit/src/Catalogs/Items/Items.mdo +++ b/Unit/src/Catalogs/Items/Items.mdo @@ -21,7 +21,6 @@ </types> </typeExtension> </extension> - <type/> </attributes> <attributes uuid="3be45037-ee1c-4e18-af04-6b9849623124"> <name>Unit</name> @@ -34,7 +33,6 @@ </types> </typeExtension> </extension> - <type/> </attributes> <attributes uuid="7c02c364-48a6-4604-9fdd-d2d33044251c"> <name>MainPricture</name> @@ -47,7 +45,6 @@ </types> </typeExtension> </extension> - <type/> </attributes> <attributes uuid="651cb065-89df-49a5-8608-12a787180423"> <name>Vendor</name> @@ -60,7 +57,6 @@ </types> </typeExtension> </extension> - <type/> </attributes> <attributes uuid="ac6a45d9-c3fe-4248-ab89-f1a5e3766773"> <name>ItemID</name> @@ -76,7 +72,6 @@ </stringQualifiers> </typeExtension> </extension> - <type/> </attributes> <attributes uuid="ed0b00c6-4424-43f1-b95b-77dec93d7442"> <name>PackageUnit</name> @@ -89,7 +84,6 @@ </types> </typeExtension> </extension> - <type/> </attributes> <forms uuid="ad5f8d87-4851-4e38-bcf9-14ec004c5a5f"> <name>ItemForm</name> diff --git a/Unit/src/ChartsOfCharacteristicTypes/AddAttributeAndProperty/AddAttributeAndProperty.mdo b/Unit/src/ChartsOfCharacteristicTypes/AddAttributeAndProperty/AddAttributeAndProperty.mdo index 355b12a763..0b5b9ccfab 100644 --- a/Unit/src/ChartsOfCharacteristicTypes/AddAttributeAndProperty/AddAttributeAndProperty.mdo +++ b/Unit/src/ChartsOfCharacteristicTypes/AddAttributeAndProperty/AddAttributeAndProperty.mdo @@ -18,5 +18,4 @@ </types> </typeExtension> </extension> - <type/> </mdclass:ChartOfCharacteristicTypes> diff --git a/Unit/src/ChartsOfCharacteristicTypes/CurrencyMovementType/CurrencyMovementType.mdo b/Unit/src/ChartsOfCharacteristicTypes/CurrencyMovementType/CurrencyMovementType.mdo index f6df01ad03..19b0c67655 100644 --- a/Unit/src/ChartsOfCharacteristicTypes/CurrencyMovementType/CurrencyMovementType.mdo +++ b/Unit/src/ChartsOfCharacteristicTypes/CurrencyMovementType/CurrencyMovementType.mdo @@ -21,7 +21,6 @@ <codeAllowedLength>Checked</codeAllowedLength> <descriptionLength>Checked</descriptionLength> </extension> - <type/> <codeAllowedLength>Variable</codeAllowedLength> <attributes uuid="10234ece-e0e7-42a2-bb49-47d16a9f4d2a"> <name>DeferredCalculation</name> @@ -34,7 +33,6 @@ </types> </typeExtension> </extension> - <type/> </attributes> <attributes uuid="4695ec89-0581-41ad-ab80-2dbd6913f7c0"> <name>Currency</name> @@ -47,7 +45,6 @@ </types> </typeExtension> </extension> - <type/> </attributes> <attributes uuid="125a412a-3b5f-4c8e-8887-69f1b5d32a19"> <name>Source</name> @@ -60,7 +57,6 @@ </types> </typeExtension> </extension> - <type/> </attributes> <attributes uuid="e2bd6ab9-2236-4a0c-b8a3-0351897a6ad5"> <name>Type</name> @@ -73,6 +69,5 @@ </types> </typeExtension> </extension> - <type/> </attributes> </mdclass:ChartOfCharacteristicTypes> diff --git a/Unit/src/CommonAttributes/Author/Author.mdo b/Unit/src/CommonAttributes/Author/Author.mdo index 40d58a633e..3df5fb78ad 100644 --- a/Unit/src/CommonAttributes/Author/Author.mdo +++ b/Unit/src/CommonAttributes/Author/Author.mdo @@ -10,7 +10,4 @@ </types> </typeExtension> </extension> - <type/> - <autoUse>DontUse</autoUse> - <dataSeparation>DontUse</dataSeparation> </mdclass:CommonAttribute> diff --git a/Unit/src/CommonAttributes/Branch/Branch.mdo b/Unit/src/CommonAttributes/Branch/Branch.mdo index fede5b1355..f1c7991e71 100644 --- a/Unit/src/CommonAttributes/Branch/Branch.mdo +++ b/Unit/src/CommonAttributes/Branch/Branch.mdo @@ -10,7 +10,4 @@ </types> </typeExtension> </extension> - <type/> - <autoUse>DontUse</autoUse> - <dataSeparation>DontUse</dataSeparation> </mdclass:CommonAttribute> diff --git a/Unit/src/CommonAttributes/Description/Description.mdo b/Unit/src/CommonAttributes/Description/Description.mdo index deddce0941..717e526e3e 100644 --- a/Unit/src/CommonAttributes/Description/Description.mdo +++ b/Unit/src/CommonAttributes/Description/Description.mdo @@ -13,7 +13,4 @@ </stringQualifiers> </typeExtension> </extension> - <type/> - <autoUse>DontUse</autoUse> - <dataSeparation>DontUse</dataSeparation> </mdclass:CommonAttribute> diff --git a/Unit/src/CommonAttributes/Description_en/Description_en.mdo b/Unit/src/CommonAttributes/Description_en/Description_en.mdo index bd7c69cbc8..2ed8d76c78 100644 --- a/Unit/src/CommonAttributes/Description_en/Description_en.mdo +++ b/Unit/src/CommonAttributes/Description_en/Description_en.mdo @@ -10,7 +10,4 @@ </types> </typeExtension> </extension> - <type/> - <autoUse>DontUse</autoUse> - <dataSeparation>DontUse</dataSeparation> </mdclass:CommonAttribute> diff --git a/Unit/src/CommonAttributes/Description_hash/Description_hash.mdo b/Unit/src/CommonAttributes/Description_hash/Description_hash.mdo index c1cd9baa97..52bd7b0be7 100644 --- a/Unit/src/CommonAttributes/Description_hash/Description_hash.mdo +++ b/Unit/src/CommonAttributes/Description_hash/Description_hash.mdo @@ -10,7 +10,4 @@ </types> </typeExtension> </extension> - <type/> - <autoUse>DontUse</autoUse> - <dataSeparation>DontUse</dataSeparation> </mdclass:CommonAttribute> diff --git a/Unit/src/CommonAttributes/Description_ru/Description_ru.mdo b/Unit/src/CommonAttributes/Description_ru/Description_ru.mdo index 4f9cac9259..248b8e425f 100644 --- a/Unit/src/CommonAttributes/Description_ru/Description_ru.mdo +++ b/Unit/src/CommonAttributes/Description_ru/Description_ru.mdo @@ -10,7 +10,4 @@ </types> </typeExtension> </extension> - <type/> - <autoUse>DontUse</autoUse> - <dataSeparation>DontUse</dataSeparation> </mdclass:CommonAttribute> diff --git a/Unit/src/CommonAttributes/Description_tr/Description_tr.mdo b/Unit/src/CommonAttributes/Description_tr/Description_tr.mdo index 2721426a68..e9ff146dae 100644 --- a/Unit/src/CommonAttributes/Description_tr/Description_tr.mdo +++ b/Unit/src/CommonAttributes/Description_tr/Description_tr.mdo @@ -10,7 +10,4 @@ </types> </typeExtension> </extension> - <type/> - <autoUse>DontUse</autoUse> - <dataSeparation>DontUse</dataSeparation> </mdclass:CommonAttribute> diff --git a/Unit/src/CommonAttributes/DocumentAmount/DocumentAmount.mdo b/Unit/src/CommonAttributes/DocumentAmount/DocumentAmount.mdo index f38aaf1e9c..289a212346 100644 --- a/Unit/src/CommonAttributes/DocumentAmount/DocumentAmount.mdo +++ b/Unit/src/CommonAttributes/DocumentAmount/DocumentAmount.mdo @@ -10,7 +10,4 @@ </types> </typeExtension> </extension> - <type/> - <autoUse>DontUse</autoUse> - <dataSeparation>DontUse</dataSeparation> </mdclass:CommonAttribute> diff --git a/Unit/src/CommonAttributes/Height/Height.mdo b/Unit/src/CommonAttributes/Height/Height.mdo index 0346b27319..5e20b9bc4c 100644 --- a/Unit/src/CommonAttributes/Height/Height.mdo +++ b/Unit/src/CommonAttributes/Height/Height.mdo @@ -15,7 +15,4 @@ </numberQualifiers> </typeExtension> </extension> - <type/> - <autoUse>DontUse</autoUse> - <dataSeparation>DontUse</dataSeparation> </mdclass:CommonAttribute> diff --git a/Unit/src/CommonAttributes/ID/ID.mdo b/Unit/src/CommonAttributes/ID/ID.mdo index d2b8932311..ec74047fea 100644 --- a/Unit/src/CommonAttributes/ID/ID.mdo +++ b/Unit/src/CommonAttributes/ID/ID.mdo @@ -14,7 +14,4 @@ </numberQualifiers> </typeExtension> </extension> - <type/> - <autoUse>DontUse</autoUse> - <dataSeparation>DontUse</dataSeparation> </mdclass:CommonAttribute> diff --git a/Unit/src/CommonAttributes/Length/Length.mdo b/Unit/src/CommonAttributes/Length/Length.mdo index 5d4b657b85..c6dfa8f635 100644 --- a/Unit/src/CommonAttributes/Length/Length.mdo +++ b/Unit/src/CommonAttributes/Length/Length.mdo @@ -15,7 +15,4 @@ </numberQualifiers> </typeExtension> </extension> - <type/> - <autoUse>DontUse</autoUse> - <dataSeparation>DontUse</dataSeparation> </mdclass:CommonAttribute> diff --git a/Unit/src/CommonAttributes/UniqueID/UniqueID.mdo b/Unit/src/CommonAttributes/UniqueID/UniqueID.mdo index a552d2d737..4d50c53882 100644 --- a/Unit/src/CommonAttributes/UniqueID/UniqueID.mdo +++ b/Unit/src/CommonAttributes/UniqueID/UniqueID.mdo @@ -13,7 +13,4 @@ </stringQualifiers> </typeExtension> </extension> - <type/> - <autoUse>DontUse</autoUse> - <dataSeparation>DontUse</dataSeparation> </mdclass:CommonAttribute> diff --git a/Unit/src/CommonAttributes/Volume/Volume.mdo b/Unit/src/CommonAttributes/Volume/Volume.mdo index dfb7ecb9ca..5dee1eba5d 100644 --- a/Unit/src/CommonAttributes/Volume/Volume.mdo +++ b/Unit/src/CommonAttributes/Volume/Volume.mdo @@ -15,7 +15,4 @@ </numberQualifiers> </typeExtension> </extension> - <type/> - <autoUse>DontUse</autoUse> - <dataSeparation>DontUse</dataSeparation> </mdclass:CommonAttribute> diff --git a/Unit/src/CommonAttributes/Weight/Weight.mdo b/Unit/src/CommonAttributes/Weight/Weight.mdo index 7e6ec7223e..bbadc111df 100644 --- a/Unit/src/CommonAttributes/Weight/Weight.mdo +++ b/Unit/src/CommonAttributes/Weight/Weight.mdo @@ -15,7 +15,4 @@ </numberQualifiers> </typeExtension> </extension> - <type/> - <autoUse>DontUse</autoUse> - <dataSeparation>DontUse</dataSeparation> </mdclass:CommonAttribute> diff --git a/Unit/src/CommonAttributes/Width/Width.mdo b/Unit/src/CommonAttributes/Width/Width.mdo index ba493769e1..70a3e044b6 100644 --- a/Unit/src/CommonAttributes/Width/Width.mdo +++ b/Unit/src/CommonAttributes/Width/Width.mdo @@ -15,7 +15,4 @@ </numberQualifiers> </typeExtension> </extension> - <type/> - <autoUse>DontUse</autoUse> - <dataSeparation>DontUse</dataSeparation> </mdclass:CommonAttribute> diff --git a/Unit/src/CommonForms/AttachFile/Form.form b/Unit/src/CommonForms/AttachFile/Form.form index 2118a70dad..c66d3029ce 100644 --- a/Unit/src/CommonForms/AttachFile/Form.form +++ b/Unit/src/CommonForms/AttachFile/Form.form @@ -11,9 +11,6 @@ <userVisible> <common>true</common> </userVisible> - <dataPath xsi:type="form:DataPath"> - <segments>FileList</segments> - </dataPath> <titleLocation>None</titleLocation> <items xsi:type="form:FormField"> <name>FileListCreationDate</name> @@ -349,9 +346,6 @@ <userVisible> <common>true</common> </userVisible> - <dataPath xsi:type="form:DataPath"> - <segments>DefaultFilesStorageVolume</segments> - </dataPath> <titleLocation>None</titleLocation> <extendedTooltip> <name>DefaultFilesStorageVolumeExtendedTooltip</name> @@ -400,9 +394,6 @@ <userVisible> <common>true</common> </userVisible> - <dataPath xsi:type="form:DataPath"> - <segments>Upload</segments> - </dataPath> <titleLocation>None</titleLocation> <extendedTooltip> <name>UploadExtendedTooltip</name> diff --git a/Unit/src/Constants/SaasMode/SaasMode.mdo b/Unit/src/Constants/SaasMode/SaasMode.mdo index 703fc40bc8..074fc9ef24 100644 --- a/Unit/src/Constants/SaasMode/SaasMode.mdo +++ b/Unit/src/Constants/SaasMode/SaasMode.mdo @@ -15,5 +15,4 @@ </types> </typeExtension> </extension> - <type/> </mdclass:Constant> diff --git a/Unit/src/DefinedTypes/typeAddPropertyOwners/typeAddPropertyOwners.mdo b/Unit/src/DefinedTypes/typeAddPropertyOwners/typeAddPropertyOwners.mdo index 1c4735caee..5e7c995358 100644 --- a/Unit/src/DefinedTypes/typeAddPropertyOwners/typeAddPropertyOwners.mdo +++ b/Unit/src/DefinedTypes/typeAddPropertyOwners/typeAddPropertyOwners.mdo @@ -9,5 +9,4 @@ <extendedConfigurationObject>Checked</extendedConfigurationObject> <typeExtension/> </extension> - <type/> </mdclass:DefinedType> diff --git a/Unit/src/DefinedTypes/typeAmount/typeAmount.mdo b/Unit/src/DefinedTypes/typeAmount/typeAmount.mdo index dabcc052f9..0a508eab25 100644 --- a/Unit/src/DefinedTypes/typeAmount/typeAmount.mdo +++ b/Unit/src/DefinedTypes/typeAmount/typeAmount.mdo @@ -17,5 +17,4 @@ </numberQualifiers> </typeExtension> </extension> - <type/> </mdclass:DefinedType> diff --git a/Unit/src/DefinedTypes/typeDescription/typeDescription.mdo b/Unit/src/DefinedTypes/typeDescription/typeDescription.mdo index a74d25d5be..7f23b05ddd 100644 --- a/Unit/src/DefinedTypes/typeDescription/typeDescription.mdo +++ b/Unit/src/DefinedTypes/typeDescription/typeDescription.mdo @@ -16,5 +16,4 @@ </stringQualifiers> </typeExtension> </extension> - <type/> </mdclass:DefinedType> diff --git a/Unit/src/DefinedTypes/typeFilesOwner/typeFilesOwner.mdo b/Unit/src/DefinedTypes/typeFilesOwner/typeFilesOwner.mdo index 4e2013bd76..87b8c86b0f 100644 --- a/Unit/src/DefinedTypes/typeFilesOwner/typeFilesOwner.mdo +++ b/Unit/src/DefinedTypes/typeFilesOwner/typeFilesOwner.mdo @@ -8,5 +8,4 @@ <extension xsi:type="mdclassExtension:DefinedTypeExtension"> <typeExtension/> </extension> - <type/> </mdclass:DefinedType>