Translate

IRPTeam · Jan 10, 2023 · f7bb394 · f7bb394
1 parent c776496
commit f7bb394
Show file tree

Hide file tree

Showing 91 changed files with 509 additions and 290 deletions.
diff --git a/IRP/src/AccountingRegisters/Basic/Basic.mdo b/IRP/src/AccountingRegisters/Basic/Basic.mdo
@@ -91,7 +91,7 @@
   </synonym>
   <synonym>
    <key>ru</key>
-   <value>Валюты</value>
+   <value>Валюта</value>
   </synonym>
   <synonym>
    <key>tr</key>
@@ -112,7 +112,7 @@
   </synonym>
   <synonym>
    <key>ru</key>
-   <value>Сумма оплаты</value>
+   <value>Сумма</value>
   </synonym>
   <synonym>
    <key>tr</key>

diff --git a/...040T_ManualMaterialsCorretionInProduction/R7040T_ManualMaterialsCorretionInProduction.mdo b/...040T_ManualMaterialsCorretionInProduction/R7040T_ManualMaterialsCorretionInProduction.mdo
@@ -58,7 +58,7 @@
   </synonym>
   <synonym>
    <key>tr</key>
-   <value>Üretim reçete miktarı</value>
+   <value>Reçete miktarı</value>
   </synonym>
   <type>
    <types>DefinedType.typeQuantity</types>

diff --git a/IRP/src/AccumulationRegisters/R8010B_TradeAgentInventory/R8010B_TradeAgentInventory.mdo b/IRP/src/AccumulationRegisters/R8010B_TradeAgentInventory/R8010B_TradeAgentInventory.mdo
@@ -133,4 +133,18 @@
   <fullTextSearch>Use</fullTextSearch>
   <useInTotals>true</useInTotals>
  </dimensions>
+ <dimensions uuid="69fabe4c-18ed-4839-a750-b35840721267">
+  <name>LegalName</name>
+  <synonym>
+   <key>en</key>
+   <value>Legal name</value>
+  </synonym>
+  <type>
+   <types>CatalogRef.Companies</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/R8012B_ConsignorInventory/R8012B_ConsignorInventory.mdo b/IRP/src/AccumulationRegisters/R8012B_ConsignorInventory/R8012B_ConsignorInventory.mdo
@@ -155,4 +155,18 @@
   <fullTextSearch>Use</fullTextSearch>
   <useInTotals>true</useInTotals>
  </dimensions>
+ <dimensions uuid="983def76-a969-4af7-8052-f3d11afab1e0">
+  <name>LegalName</name>
+  <synonym>
+   <key>en</key>
+   <value>Legal name</value>
+  </synonym>
+  <type>
+   <types>CatalogRef.Companies</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/R8014T_ConsignorSales/R8014T_ConsignorSales.mdo b/IRP/src/AccumulationRegisters/R8014T_ConsignorSales/R8014T_ConsignorSales.mdo
@@ -295,7 +295,7 @@
   </synonym>
   <synonym>
    <key>ru</key>
-   <value>Единица измерения</value>
+   <value>Ед. изм.</value>
   </synonym>
   <synonym>
    <key>tr</key>

diff --git a/IRP/src/Catalogs/BillOfMaterials/BillOfMaterials.mdo b/IRP/src/Catalogs/BillOfMaterials/BillOfMaterials.mdo
@@ -133,7 +133,7 @@
   </synonym>
   <synonym>
    <key>ru</key>
-   <value>Единица измерения</value>
+   <value>Ед. изм.</value>
   </synonym>
   <synonym>
    <key>tr</key>
@@ -347,7 +347,7 @@
    </synonym>
    <synonym>
     <key>ru</key>
-    <value>Единица измерения</value>
+    <value>Ед. изм.</value>
    </synonym>
    <synonym>
     <key>tr</key>

diff --git a/IRP/src/Catalogs/BillOfMaterials/Forms/ItemForm/Form.form b/IRP/src/Catalogs/BillOfMaterials/Forms/ItemForm/Form.form
@@ -2271,7 +2271,7 @@
    </title>
    <title>
     <key>ru</key>
-    <value>Единица измерения</value>
+    <value>Ед. изм.</value>
    </title>
    <title>
     <key>tr</key>

diff --git a/IRP/src/Catalogs/Companies/Companies.mdo b/IRP/src/Catalogs/Companies/Companies.mdo
@@ -351,7 +351,7 @@
   </synonym>
   <synonym>
    <key>ru</key>
-   <value>Код налога</value>
+   <value>ИНН</value>
   </synonym>
   <synonym>
    <key>tr</key>

diff --git a/IRP/src/Catalogs/ExternalFunctions/Forms/ItemForm/Form.form b/IRP/src/Catalogs/ExternalFunctions/Forms/ItemForm/Form.form
@@ -109,7 +109,7 @@
   </title>
   <title>
    <key>ru</key>
-   <value>Наименование</value>
+   <value>Комментарий</value>
   </title>
   <title>
    <key>tr</key>

diff --git a/IRP/src/Catalogs/ExternalFunctions/Forms/ListForm/Form.form b/IRP/src/Catalogs/ExternalFunctions/Forms/ListForm/Form.form
@@ -798,7 +798,7 @@
     </title>
     <title>
      <key>tr</key>
-     <value>Start</value>
+     <value>Başlat</value>
     </title>
     <visible>true</visible>
     <enabled>true</enabled>

diff --git a/IRP/src/Catalogs/FillingTemplates/Forms/ChoiceForm/Form.form b/IRP/src/Catalogs/FillingTemplates/Forms/ChoiceForm/Form.form
@@ -118,7 +118,7 @@
    </title>
    <title>
     <key>ru</key>
-    <value>Наименование</value>
+    <value>Комментарий</value>
    </title>
    <title>
     <key>tr</key>

diff --git a/IRP/src/Catalogs/FillingTemplates/Forms/ListForm/Form.form b/IRP/src/Catalogs/FillingTemplates/Forms/ListForm/Form.form
@@ -118,7 +118,7 @@
    </title>
    <title>
     <key>ru</key>
-    <value>Наименование</value>
+    <value>Комментарий</value>
    </title>
    <title>
     <key>tr</key>

diff --git a/IRP/src/Catalogs/SourceOfOrigins/Forms/ItemForm/Form.form b/IRP/src/Catalogs/SourceOfOrigins/Forms/ItemForm/Form.form
@@ -104,7 +104,7 @@
     </presentation>
     <presentation>
      <key>ru</key>
-     <value>Manual</value>
+     <value>Вручную</value>
     </presentation>
     <presentation>
      <key>tr</key>

diff --git a/IRP/src/ChartsOfAccounts/Basic/Basic.mdo b/IRP/src/ChartsOfAccounts/Basic/Basic.mdo
@@ -193,7 +193,7 @@
   </synonym>
   <synonym>
    <key>ru</key>
-   <value>Валюты</value>
+   <value>Валюта</value>
   </synonym>
   <synonym>
    <key>tr</key>
@@ -237,7 +237,7 @@
   </synonym>
   <synonym>
    <key>ru</key>
-   <value>Валюты</value>
+   <value>Валюта</value>
   </synonym>
   <synonym>
    <key>tr</key>
@@ -259,7 +259,7 @@
   </synonym>
   <synonym>
    <key>ru</key>
-   <value>Сумма оплаты</value>
+   <value>Сумма</value>
   </synonym>
   <synonym>
    <key>tr</key>

diff --git a/IRP/src/CommonForms/EditStores/Form.form b/IRP/src/CommonForms/EditStores/Form.form
@@ -1391,7 +1391,7 @@
    </title>
    <title>
     <key>ru</key>
-    <value>Единица измерения</value>
+    <value>Ед. изм.</value>
    </title>
    <title>
     <key>tr</key>

diff --git a/IRP/src/CommonForms/PickupSpecialOffers/Form.form b/IRP/src/CommonForms/PickupSpecialOffers/Form.form
@@ -772,7 +772,7 @@
    </title>
    <title>
     <key>ru</key>
-    <value>Сумма оплаты</value>
+    <value>Сумма</value>
    </title>
    <title>
     <key>tr</key>

diff --git a/IRP/src/CommonForms/PrintForm/Form.form b/IRP/src/CommonForms/PrintForm/Form.form
@@ -2718,7 +2718,7 @@
   </title>
   <title>
    <key>ru</key>
-   <value>Отправка маила</value>
+   <value>Отправить маил</value>
   </title>
   <title>
    <key>tr</key>

diff --git a/IRP/src/CommonModules/Localization/Module.bsl b/IRP/src/CommonModules/Localization/Module.bsl
@@ -1257,7 +1257,7 @@ Function Strings(Lang) Export
 		|ru='Оплата (+)';
 		|tr='Ödeme (+)'", Lang));
 	Strings.Insert("InfoMessage_SessionIsClosed", NStr("en='Session is closed';
-		|ru='Сессия закрыта';
+		|ru='Смена закрыта';
 		|tr='Vardya kapandı'", Lang));
 	Strings.Insert("InfoMessage_Sales", NStr("en='Sales';
 		|ru='Продажа';

diff --git a/IRP/src/CommonModules/OffersClientServer/OffersClientServer.mdo b/IRP/src/CommonModules/OffersClientServer/OffersClientServer.mdo
@@ -7,7 +7,7 @@
  </synonym>
  <synonym>
   <key>ru</key>
-  <value>Специальные предложения клиент сервер</value>
+  <value>Скидки клиент сервер</value>
  </synonym>
  <synonym>
   <key>tr</key>

diff --git a/IRP/src/CommonModules/RowIDInfoServer/Module.bsl b/IRP/src/CommonModules/RowIDInfoServer/Module.bsl
@@ -2275,42 +2275,52 @@ Function ExtractData_FromSO(BasisesTable, DataReceiver, AddInfo = Undefined)
 	|	Document.SalesOrder.SpecialOffers AS SpecialOffers
 	|		INNER JOIN BasisesTable AS BasisesTable
 	|		ON BasisesTable.Basis = SpecialOffers.Ref
-	|		AND BasisesTable.BasisKey = SpecialOffers.Key
-	|;
-	|
-	|///////////////////////////////////////////////////////////////////////////////
-	|SELECT DISTINCT
-	|	UNDEFINED AS Ref,
-	|	Payments.PaymentType,
-	|	Payments.PaymentTerminal,
-	|	Payments.Account,
-	|	Payments.Amount,
-	|	Payments.Percent,
-	|	Payments.Commission,
-	|	Payments.BankTerm,
-	|	Payments.Key
+	|		AND BasisesTable.BasisKey = SpecialOffers.Key";
+
+	QueryPaymentsAmount = New Query();
+	QueryPaymentsAmount.Text = 
+	"SELECT
+	|	SUM(R3026B_SalesOrdersCustomerAdvance.Amount) AS Amount,
+	|	VALUE(Catalog.PaymentTypes.EmptyRef) AS PaymentType
 	|FROM
-	|	Document.SalesOrder.Payments AS Payments
-	|		INNER JOIN BasisesTable AS BasisesTable
-	|		ON BasisesTable.Basis = Payments.Ref
+	|	AccumulationRegister.R3026B_SalesOrdersCustomerAdvance AS R3026B_SalesOrdersCustomerAdvance
+	|WHERE
+	|	R3026B_SalesOrdersCustomerAdvance.Order IN (&Orders)
+	|	AND (R3026B_SalesOrdersCustomerAdvance.Recorder REFS Document.CashReceipt
+	|	OR R3026B_SalesOrdersCustomerAdvance.Recorder REFS Document.BankReceipt)
 	|GROUP BY
-	|	Payments.Key,
-	|	Payments.Account,
-	|	Payments.Amount,
-	|	Payments.BankTerm,
-	|	Payments.Commission,
-	|	Payments.PaymentTerminal,
-	|	Payments.PaymentType,
-	|	Payments.Percent";
-
+	|	VALUE(Catalog.PaymentTypes.EmptyRef)
+	|HAVING
+	|	SUM(R3026B_SalesOrdersCustomerAdvance.Amount) > 0";
+
+	QueryPaymentsAmount.SetParameter("Orders", BasisesTable.UnloadColumn("Basis"));
+
+	QueryPaymentsType = New Query();
+	QueryPaymentsType.Text = 
+	"SELECT
+	|	MAX(PaymentTypes.Ref) AS PaymentType
+	|FROM
+	|	Catalog.PaymentTypes AS PaymentTypes
+	|WHERE
+	|	NOT PaymentTypes.DeletionMark
+	|	AND PaymentTypes.Type = VALUE(Enum.PaymentTypes.Advance)";
+	PaymentsTypeSelection = QueryPaymentsType.Execute().Select();
+	PaymentType = Catalogs.PaymentTypes.EmptyRef();
+	If PaymentsTypeSelection.Next() Then
+		PaymentType = PaymentsTypeSelection.PaymentType;
+	EndIf;
+
+	TablePayments = QueryPaymentsAmount.Execute().Unload();
+	TablePayments.FillValues(PaymentType, "PaymentType");
+
 	Query.SetParameter("BasisesTable", BasisesTable);
 	QueryResults = Query.ExecuteBatch();
 
 	TableRowIDInfo     = QueryResults[1].Unload();
 	TableItemList      = QueryResults[2].Unload();
 	TableTaxList       = QueryResults[3].Unload();
 	TableSpecialOffers = QueryResults[4].Unload();
-	TablePayments      = QueryResults[5].Unload();
+	//TablePayments      = QueryResults[5].Unload();
 
 	Tables = New Structure();
 	Tables.Insert("RowIDInfo"     , TableRowIDInfo);

diff --git a/IRP/src/CommonModules/SerialLotNumberClient/Module.bsl b/IRP/src/CommonModules/SerialLotNumberClient/Module.bsl
@@ -144,7 +144,39 @@ Procedure DeleteUnusedSerialLotNumbers(Object, KeyForDelete = Undefined) Export
 		For Each Row In ArrayOfUnusedRows Do
 			Object.SerialLotNumbers.Delete(Row);
 		EndDo;
-	Else
+
+		ArrayOfItemKeys = New Array();
+		For Each Row In Object.ItemList Do
+			NewRow = New Structure("Key, ItemKey, SerialLotNumbers", Row.Key, Row.ItemKey, New Array());
+			For Each RowSLN In Object.SerialLotNumbers.FindRows(New Structure("Key", Row.Key)) Do
+				NewRow.SerialLotNumbers.Add(New Structure("SerialLotNumber", RowSLN.SerialLotNUmber));
+			EndDo;
+			If NewRow.SerialLotNumbers.Count() Then
+				ArrayOfItemKeys.Add(NewRow);
+			EndIf;
+		EndDo;
+		If ArrayOfItemKeys.Count() Then
+			ArrayOfWrongSerialLotNumbers = SerialLotNumbersServer.GetWrongSerialLotNumbers(ArrayOfItemKeys);
+			ArrayForDelete = New Array();
+
+			For Each RowSNL In Object.SerialLotNumbers Do
+				IsWrongSerialLotNumber = False;
+				For Each Row In ArrayOfWrongSerialLotNumbers Do
+					If Row.Key = RowSNL.Key And Row.SerialLotNumber = RowSNL.SerialLotNumber Then
+						IsWrongSerialLotNumber = True;
+					EndIf;
+				EndDo;
+				If IsWrongSerialLotNumber Then
+					ArrayForDelete.Add(RowSNL);
+				EndIf;
+			EndDo;
+
+			For Each Row In ArrayForDelete Do
+				Object.SerialLotNumbers.Delete(Row);
+			EndDo;
+		EndIf;
+
+	Else // Ke <> Undefined
 		ArrayRowsForDelete = Object.SerialLotNumbers.FindRows(New Structure("Key", KeyForDelete));
 		For Each Row In ArrayRowsForDelete Do
 			Object.SerialLotNumbers.Delete(Row);

diff --git a/IRP/src/CommonModules/SerialLotNumbersServer/Module.bsl b/IRP/src/CommonModules/SerialLotNumbersServer/Module.bsl
@@ -285,3 +285,35 @@ Procedure SetUnique(Object) Export
 		EndIf;
 	EndDo;
 EndProcedure
+
+
+Function GetWrongSerialLotNumbers(ArrayOfItemKeys) Export
+	ArrayOfWrongSerialLotNumbers = New Array();
+
+	For Each Row In ArrayOfItemKeys Do
+		For Each RowSLN In Row.SerialLotNumbers Do
+			If Not ValueIsFilled(RowSLN.SerialLotNumber) Then
+				ArrayOfWrongSerialLotNumbers.Add(New Structure("Key, SerialLotNumber"));
+				Continue;
+			EndIf;
+			IsWrongSerialLotNumber = True;
+			Owner = RowSLN.SerialLotNumber.SerialLotNumberOwner;
+			If Not ValueIsFilled(Owner) Then
+				IsWrongSerialLotNumber = False;
+			ElsIf Owner = Row.ItemKey Then
+				IsWrongSerialLotNumber = False;
+			ElsIf Owner = Row.ItemKey.Item Then
+				IsWrongSerialLotNumber = False;
+			ElsIf Owner = Row.ItemKey.Item.ItemType Then
+				IsWrongSerialLotNumber = False;
+			EndIf;
+			If IsWrongSerialLotNumber Then
+				ArrayOfWrongSerialLotNumbers.Add(New Structure("Key, SerialLotNumber", Row.Key, RowSLN.SerialLotNumber));
+			EndIf;
+		EndDo;
+	EndDo;
+
+	Return ArrayOfWrongSerialLotNumbers;
+EndFUnction
+
+
diff --git a/IRP/src/CommonPictures/Waiting/Waiting.mdo b/IRP/src/CommonPictures/Waiting/Waiting.mdo
@@ -7,7 +7,7 @@
  </synonym>
  <synonym>
   <key>ru</key>
-  <value>Ожидание2</value>
+  <value>В ожидании</value>
  </synonym>
  <synonym>
   <key>tr</key>