Translate

IRPTeam · Aug 3, 2023 · baad08b · baad08b
1 parent 85b7043
commit baad08b
Show file tree

Hide file tree

Showing 115 changed files with 2,758 additions and 631 deletions.
diff --git a/IRP/src/AccumulationRegisters/R1011B_PurchaseOrdersReceipt/R1011B_PurchaseOrdersReceipt.mdo b/IRP/src/AccumulationRegisters/R1011B_PurchaseOrdersReceipt/R1011B_PurchaseOrdersReceipt.mdo
@@ -134,4 +134,26 @@
   <fullTextSearch>Use</fullTextSearch>
   <useInTotals>true</useInTotals>
  </dimensions>
+ <dimensions uuid="fb70e4b7-bb07-413f-9df7-2366355559b9">
+  <name>RowKey</name>
+  <synonym>
+   <key>en</key>
+   <value>Row key</value>
+  </synonym>
+  <synonym>
+   <key>ru</key>
+   <value>Ключ строки</value>
+  </synonym>
+  <synonym>
+   <key>tr</key>
+   <value>Satır anahtarı</value>
+  </synonym>
+  <type>
+   <types>DefinedType.typeRowID</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/AccumulationRegisters/R2011B_SalesOrdersShipment/R2011B_SalesOrdersShipment.mdo b/IRP/src/AccumulationRegisters/R2011B_SalesOrdersShipment/R2011B_SalesOrdersShipment.mdo
@@ -133,4 +133,26 @@
   <fullTextSearch>Use</fullTextSearch>
   <useInTotals>true</useInTotals>
  </dimensions>
+ <dimensions uuid="d85fa2ac-438d-4f18-be1b-c63792668b90">
+  <name>RowKey</name>
+  <synonym>
+   <key>en</key>
+   <value>Row key</value>
+  </synonym>
+  <synonym>
+   <key>ru</key>
+   <value>Ключ строки</value>
+  </synonym>
+  <synonym>
+   <key>tr</key>
+   <value>Satır anahtarı</value>
+  </synonym>
+  <type>
+   <types>DefinedType.typeRowID</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/Catalogs/DataMappingItems/DataMappingItems.mdo b/IRP/src/Catalogs/DataMappingItems/DataMappingItems.mdo
@@ -177,9 +177,17 @@
   </synonym>
   <type>
    <types>String</types>
+   <types>Number</types>
+   <types>Date</types>
+   <types>Boolean</types>
+   <numberQualifiers>
+    <precision>15</precision>
+    <scale>5</scale>
+   </numberQualifiers>
    <stringQualifiers>
-    <length>256</length>
+    <length>512</length>
    </stringQualifiers>
+   <dateQualifiers/>
   </type>
   <toolTip>
    <key>en</key>
@@ -195,9 +203,7 @@
   </toolTip>
   <minValue xsi:type="core:UndefinedValue"/>
   <maxValue xsi:type="core:UndefinedValue"/>
-  <fillValue xsi:type="core:StringValue">
-   <value/>
-  </fillValue>
+  <fillValue xsi:type="core:UndefinedValue"/>
   <indexing>Index</indexing>
   <fullTextSearch>Use</fullTextSearch>
   <dataHistory>Use</dataHistory>
@@ -450,7 +456,7 @@
      <precision>10</precision>
     </numberQualifiers>
     <stringQualifiers>
-     <length>150</length>
+     <length>512</length>
     </stringQualifiers>
     <dateQualifiers>
      <dateFractions>Date</dateFractions>

diff --git a/IRP/src/Catalogs/ItemKeys/ManagerModule.bsl b/IRP/src/Catalogs/ItemKeys/ManagerModule.bsl
@@ -22,7 +22,7 @@ Function GetChoiceDataTable(Parameters)
 	QueryBuilder = New QueryBuilder(QueryBuilderText);
 	QueryBuilder.FillSettings();
 	CommonFormActionsServer.SetCustomSearchFilter(QueryBuilder, Parameters);
-	CommonFormActionsServer.SetStandardSearchFilter(QueryBuilder, Parameters);
+	CommonFormActionsServer.SetStandardSearchFilter(QueryBuilder, Parameters, Metadata.Catalogs.ItemKeys);
 
 	Query = QueryBuilder.GetQuery();
 

diff --git a/IRP/src/Catalogs/MovementRules/MovementRules.mdo b/IRP/src/Catalogs/MovementRules/MovementRules.mdo
@@ -308,6 +308,13 @@
     <value>32</value>
    </code>
   </items>
+  <items id="96682eb8-f338-4b94-9953-e11f0c05068c">
+   <name>RRR_RGR</name>
+   <description>RRR&amp;RGR</description>
+   <code xsi:type="core:StringValue">
+    <value>33</value>
+   </code>
+  </items>
  </predefined>
  <editType>InDialog</editType>
  <choiceMode>BothWays</choiceMode>

diff --git a/IRP/src/Catalogs/RowIDs/Forms/ItemForm/Form.form b/IRP/src/Catalogs/RowIDs/Forms/ItemForm/Form.form
@@ -1048,6 +1048,56 @@
      <textEdit>true</textEdit>
     </extInfo>
    </items>
+   <items xsi:type="form:FormField">
+    <name>TransactionTypeRGR</name>
+    <id>140</id>
+    <visible>true</visible>
+    <enabled>true</enabled>
+    <userVisible>
+     <common>true</common>
+    </userVisible>
+    <dataPath xsi:type="form:DataPath">
+     <segments>Object.TransactionTypeRGR</segments>
+    </dataPath>
+    <extendedTooltip>
+     <name>TransactionTypeRGRExtendedTooltip</name>
+     <id>142</id>
+     <visible>true</visible>
+     <enabled>true</enabled>
+     <userVisible>
+      <common>true</common>
+     </userVisible>
+     <type>Label</type>
+     <autoMaxWidth>true</autoMaxWidth>
+     <autoMaxHeight>true</autoMaxHeight>
+     <extInfo xsi:type="form:LabelDecorationExtInfo">
+      <horizontalAlign>Left</horizontalAlign>
+     </extInfo>
+    </extendedTooltip>
+    <contextMenu>
+     <name>TransactionTypeRGRContextMenu</name>
+     <id>141</id>
+     <visible>true</visible>
+     <enabled>true</enabled>
+     <userVisible>
+      <common>true</common>
+     </userVisible>
+     <autoFill>true</autoFill>
+    </contextMenu>
+    <type>InputField</type>
+    <editMode>Enter</editMode>
+    <showInHeader>true</showInHeader>
+    <headerHorizontalAlign>Left</headerHorizontalAlign>
+    <showInFooter>true</showInFooter>
+    <extInfo xsi:type="form:InputFieldExtInfo">
+     <autoMaxWidth>true</autoMaxWidth>
+     <autoMaxHeight>true</autoMaxHeight>
+     <wrap>true</wrap>
+     <chooseType>true</chooseType>
+     <typeDomainEnabled>true</typeDomainEnabled>
+     <textEdit>true</textEdit>
+    </extInfo>
+   </items>
    <items xsi:type="form:FormField">
     <name>TransactionTypeGRReturn</name>
     <id>134</id>

diff --git a/IRP/src/Catalogs/RowIDs/RowIDs.mdo b/IRP/src/Catalogs/RowIDs/RowIDs.mdo
@@ -1002,6 +1002,29 @@
   <fullTextSearch>Use</fullTextSearch>
   <dataHistory>Use</dataHistory>
  </attributes>
+ <attributes uuid="ce3a3349-c87a-4c8d-b47f-e861c440b6c9">
+  <name>TransactionTypeRGR</name>
+  <synonym>
+   <key>en</key>
+   <value>Transaction type GR Retail</value>
+  </synonym>
+  <synonym>
+   <key>ru</key>
+   <value>Вид операции розничной отгрузки товара</value>
+  </synonym>
+  <synonym>
+   <key>tr</key>
+   <value>Transaction type GR Retail</value>
+  </synonym>
+  <type>
+   <types>EnumRef.RetailGoodsReceiptTransactionTypes</types>
+  </type>
+  <minValue xsi:type="core:UndefinedValue"/>
+  <maxValue xsi:type="core:UndefinedValue"/>
+  <fillValue xsi:type="core:UndefinedValue"/>
+  <fullTextSearch>Use</fullTextSearch>
+  <dataHistory>Use</dataHistory>
+ </attributes>
  <forms uuid="651805ba-bc1e-443a-8ae5-b2b855347771">
   <name>ItemForm</name>
   <synonym>

diff --git a/IRP/src/Catalogs/Vehicles/Vehicles.mdo b/IRP/src/Catalogs/Vehicles/Vehicles.mdo
@@ -61,7 +61,7 @@
  </objectPresentation>
  <objectPresentation>
   <key>tr</key>
-  <value>Vehicle</value>
+  <value>Araç</value>
  </objectPresentation>
  <listPresentation>
   <key>en</key>