Translate

IRPTeam · May 3, 2024 · 2418649 · 2418649
1 parent 5aa238b
commit 2418649
Show file tree

Hide file tree

Showing 20 changed files with 1,886 additions and 52 deletions.
diff --git a/IRP/src/CommonAttributes/ManualMovementsEdit/ManualMovementsEdit.mdo b/IRP/src/CommonAttributes/ManualMovementsEdit/ManualMovementsEdit.mdo
@@ -11,7 +11,7 @@
  </synonym>
  <synonym>
   <key>tr</key>
-  <value>Manual movements edit</value>
+  <value>Manuel harketleri değişitirme</value>
  </synonym>
  <type>
   <types>Boolean</types>
@@ -80,6 +80,10 @@
   <metadata>Document.AdditionalCostAllocation</metadata>
   <use>Use</use>
  </content>
+ <content>
+  <metadata>Document.ExpenseAccruals</metadata>
+  <use>Use</use>
+ </content>
  <content>
   <metadata>Document.SalesReturn</metadata>
   <use>Use</use>
@@ -244,6 +248,10 @@
   <metadata>Document.SalesOrderClosing</metadata>
   <use>Use</use>
  </content>
+ <content>
+  <metadata>Document.RevenueAccruals</metadata>
+  <use>Use</use>
+ </content>
  <content>
   <metadata>Document.RetailSalesReceipt</metadata>
   <use>Use</use>

diff --git a/IRP/src/CommonModules/DocExpenseRevenueAccrualsClient/Module.bsl b/IRP/src/CommonModules/DocExpenseRevenueAccrualsClient/Module.bsl
@@ -56,7 +56,7 @@ EndProcedure
 //  Structure - Row pickup empty structure:
 // * Amount - Number - 
 // * Currency - CatalogRef.Currencies - 
-// * Document - DocumentRef 
+// * Document - DocumentRef  
 // * TaxAmount - Number - 
 Function RowPickupEmptyStructure() Export
 

diff --git a/IRP/src/CommonModules/Localization/Module.bsl b/IRP/src/CommonModules/Localization/Module.bsl
@@ -1669,22 +1669,22 @@ Function Strings(Lang) Export
 		|tr='İşlem tipi girilmedi'", Lang));
 	Strings.Insert("Error_144", NStr("en='Document`s movements had been modified manually. Reposting or undoposting is disabled due to manual adjustments.';
 		|ru='Движения документа были изменены вручную. Перепроведение или отмена проведения невозможны из-за ручных корректировок.';
-		|tr='Document`s movements had been modified manually. Reposting or undoposting is disabled due to manual adjustments.'", Lang));
+		|tr='Evrak hareketler manuel olarak değişitirilmişti. Tekrar kaydetme veya kaydetme iptal manuel düzeltilen evraklar için devre dışıdır.'", Lang));
 	Strings.Insert("Error_PartnerBalanceCheckfailed", NStr("en='""Amount"" does not equal the sum of all resources';
 		|ru='""Сумма"" не равна сумме всех ресурсов';
-		|tr='""Amount"" does not equal the sum of all resources'", Lang));
+		|tr='""Tutar"" tüm kaynaklara eşit değildir'", Lang));
 
 	// %1 - Register name
 	Strings.Insert("Error_145", NStr("en='Differences detected between the current manual movements and the potential automated movements in register [%1].';
 		|ru='Обнаружены различия между текущими ручными движениями и потенциальными автоматическими движениями в регистре [%1].';
-		|tr='Differences detected between the current manual movements and the potential automated movements in register [%1].'", Lang));
+		|tr='[%1] kayıt tablosunda mevcut ve potansiyel kayıtları arasında farklar tespit edilmişti.'", Lang));
 
 	Strings.Insert("Error_146", NStr("en='Document in not posted.';
 		|ru='Документ не проведен.';
 		|tr='Belge kaydedilmedi.'", Lang));
 	Strings.insert("Error_147", NStr("en='The document has manual entries and cannot be canceled.';
 		|ru='Документ имеет ручные записи и не может быть отменён.';
-		|tr='The document has manual entries and cannot be canceled.'", Lang));
+		|tr='Evrak hareketleri manuel olarak değiştirilmişti, iptal edilemez.'", Lang));
 
 	Strings.Insert("Error_FillTotalAmount", NStr("en='Fill total amount. Row: [%1]';
 		|ru='Необходимо заполнить сумму итого. Строка: [%1]';
@@ -1920,10 +1920,10 @@ Function Strings(Lang) Export
 		|tr='%1 dosyanın boyutu %2 MB ve izin verilen %3 MB''ten fazladır'", Lang) + Chars.LF + "%1");
 	Strings.Insert("InfoMessage_038", NStr("en='New document movements are identical to the manual corrections. The ""Manual Movements Edit"" checkbox is now unnecessary and can be removed.';
 		|ru='Новые движения документа идентичны ручным корректировкам. Флажок ""Редактирование ручных движений"" теперь не нужен и может быть удалён.';
-		|tr='New document movements are identical to the manual corrections. The ""Manual Movements Edit"" checkbox is now unnecessary and can be removed.'", Lang));
+		|tr='Yeni evrak hareketleri manuel hareketlerine eşittir. ""Menuel hareket düzeltme"" işareti gereksiz olduğundan kaldırılabilir.'", Lang));
 	Strings.Insert("InfoMessage_039", NStr("en='Movements successfully recorded';
 		|ru='Движения успешно записаны';
-		|tr='Movements successfully recorded'", Lang));
+		|tr='Hareketler başarıyla kadyedildi'", Lang));
 
 	Strings.Insert("InfoMessage_WriteObject", NStr("en='Save object, before continue.';
 		|ru='Сохраните объект, прежде чем продолжить.';
@@ -2061,10 +2061,10 @@ Function Strings(Lang) Export
 		|tr='Müşteriye iade yapmak istiyor musunuz?'", Lang));
 	Strings.Insert("QuestionToUser_029", NStr("en='New document movements match the manual corrections, making the ""Manual Movements Edit"" checkbox unnecessary. Would you like to remove this checkbox?';
 		|ru='Новые движения документа соответствуют ручным корректировкам, делая флажок ""Редактирование ручных движений"" ненужным. Хотите ли вы удалить этот флажок?';
-		|tr='New document movements match the manual corrections, making the ""Manual Movements Edit"" checkbox unnecessary. Would you like to remove this checkbox?'", Lang));
+		|tr='Yeni evrak hareketleri manuel hareketlerine eşittir. ""Menuel hareket düzeltme"" işaretleme gereksiz. Devam etmek ister misiniz?'", Lang));
 	Strings.Insert("QuestionToUser_030", NStr("en='Do you want to restore movements to default?';
 		|ru='Вы хотите восстановить движения по умолчанию?';
-		|tr='Do you want to restore movements to default?'", Lang));
+		|tr='Ayarları varsayınlara getirmek ister misiniz?'", Lang));
 #EndRegion
 
 #Region SuggestionToUser

diff --git a/IRP/src/DataProcessors/EditDocumentsMovements/EditDocumentsMovements.mdo b/IRP/src/DataProcessors/EditDocumentsMovements/EditDocumentsMovements.mdo
@@ -15,7 +15,7 @@
  </synonym>
  <synonym>
   <key>tr</key>
-  <value>Edit documents movements</value>
+  <value>Evrak hareketlerini değiştir</value>
  </synonym>
  <useStandardCommands>true</useStandardCommands>
  <defaultForm>DataProcessor.EditDocumentsMovements.Form.Form</defaultForm>
@@ -55,7 +55,7 @@
   </synonym>
   <synonym>
    <key>tr</key>
-   <value>Movements</value>
+   <value>Hareketler</value>
   </synonym>
   <attributes uuid="c527158a-5525-40c6-b0c3-8e76da291e24">
    <name>RegisterName</name>
@@ -93,7 +93,7 @@
    </synonym>
    <synonym>
     <key>tr</key>
-    <value>Movements count</value>
+    <value>Hareket sayısı</value>
    </synonym>
    <type>
     <types>Number</types>

diff --git a/IRP/src/DataProcessors/EditDocumentsMovements/Forms/Form/Form.form b/IRP/src/DataProcessors/EditDocumentsMovements/Forms/Form/Form.form
@@ -22,7 +22,7 @@
      </title>
      <title>
       <key>tr</key>
-      <value>Write movements</value>
+      <value>Hareketleri yaz</value>
      </title>
      <visible>true</visible>
      <enabled>true</enabled>
@@ -65,7 +65,7 @@
      </title>
      <title>
       <key>tr</key>
-      <value>Write movements (register self-control)</value>
+      <value>Hareketleri sakla (kayıt tablosu kendi kontrolü)</value>
      </title>
      <visible>true</visible>
      <enabled>true</enabled>
@@ -109,7 +109,7 @@
     </title>
     <title>
      <key>tr</key>
-     <value>Write movements</value>
+     <value>Hareketleri yaz</value>
     </title>
     <toolTip>
      <key>en</key>
@@ -121,7 +121,7 @@
     </toolTip>
     <toolTip>
      <key>tr</key>
-     <value>Group write movemements menu</value>
+     <value>Grup hareketleri yazma menüsü</value>
     </toolTip>
     <toolTipRepresentation>ShowLeft</toolTipRepresentation>
     <extendedTooltip>
@@ -159,7 +159,7 @@
    </title>
    <title>
     <key>tr</key>
-    <value>Write movements</value>
+    <value>Hareketleri yaz</value>
    </title>
    <toolTip>
     <key>en</key>
@@ -171,7 +171,7 @@
    </toolTip>
    <toolTip>
     <key>tr</key>
-    <value>Group write movements control panel</value>
+    <value>Grup hareketleri yazma araç çubuğu</value>
    </toolTip>
    <extendedTooltip>
     <name>GroupWriteMovementsControlPanelExtendedTooltip</name>
@@ -206,7 +206,7 @@
    </title>
    <title>
     <key>tr</key>
-    <value>Manual edit</value>
+    <value>El ile değiştir</value>
    </title>
    <visible>true</visible>
    <enabled>true</enabled>
@@ -384,7 +384,7 @@
    </title>
    <title>
     <key>tr</key>
-    <value>No control write rules</value>
+    <value>Yazma kurallar devre dışı</value>
    </title>
    <visible>true</visible>
    <enabled>true</enabled>
@@ -589,7 +589,7 @@
   </title>
   <title>
    <key>tr</key>
-   <value>Manual movements edit</value>
+   <value>Manuel harketleri değişitirme</value>
   </title>
   <id>2</id>
   <valueType>
@@ -614,7 +614,7 @@
   </title>
   <title>
    <key>tr</key>
-   <value>Do not control write rules</value>
+   <value>Yazma kurallarını kontrol etme</value>
   </title>
   <id>3</id>
   <valueType>
@@ -639,7 +639,7 @@
   </title>
   <title>
    <key>tr</key>
-   <value>Write movements</value>
+   <value>Hareketleri yaz</value>
   </title>
   <id>1</id>
   <toolTip>
@@ -652,7 +652,7 @@
   </toolTip>
   <toolTip>
    <key>tr</key>
-   <value>Write movements</value>
+   <value>Hareketleri yaz</value>
   </toolTip>
   <use>
    <common>true</common>
@@ -676,7 +676,7 @@
   </title>
   <title>
    <key>tr</key>
-   <value>Reread posting data</value>
+   <value>Kaydetme verisini tekrar oku</value>
   </title>
   <id>2</id>
   <use>
@@ -701,7 +701,7 @@
   </title>
   <title>
    <key>tr</key>
-   <value>Movement analysis</value>
+   <value>Hareket analizi</value>
   </title>
   <id>3</id>
   <toolTip>
@@ -714,7 +714,7 @@
   </toolTip>
   <toolTip>
    <key>tr</key>
-   <value>Movement analysis</value>
+   <value>Hareket analizi</value>
   </toolTip>
   <use>
    <common>true</common>
@@ -738,7 +738,7 @@
   </title>
   <title>
    <key>tr</key>
-   <value>Write movements with register self control</value>
+   <value>Kayıt tablo kendi kontrolü ile hareketleri yaz</value>
   </title>
   <id>4</id>
   <toolTip>
@@ -751,7 +751,7 @@
   </toolTip>
   <toolTip>
    <key>tr</key>
-   <value>Write movements with register self control</value>
+   <value>Kayıt tablo kendi kontrolü ile hareketleri yaz</value>
   </toolTip>
   <use>
    <common>true</common>

diff --git a/IRP/src/Documents/ExpenseAccruals/Forms/DocumentForm/Form.form b/IRP/src/Documents/ExpenseAccruals/Forms/DocumentForm/Form.form
@@ -1144,6 +1144,14 @@
      <event>OnChange</event>
      <name>CostListOnChange</name>
     </handlers>
+    <handlers>
+     <event>AfterDeleteRow</event>
+     <name>CostListAfterDeleteRow</name>
+    </handlers>
+    <handlers>
+     <event>OnEditEnd</event>
+     <name>CostListOnEditEnd</name>
+    </handlers>
     <searchStringAddition>
      <visible>true</visible>
      <enabled>true</enabled>

diff --git a/IRP/src/Documents/ExpenseAccruals/Forms/DocumentForm/Module.bsl b/IRP/src/Documents/ExpenseAccruals/Forms/DocumentForm/Module.bsl
@@ -117,6 +117,22 @@ Procedure CostListOnChange(Item)
 	FillDocumentAmount();
 EndProcedure
 
+&AtClient
+Procedure CostListAfterDeleteRow(Item)
+	DeleteUnnecessaryRowsInCurrencies();
+EndProcedure
+
+&AtClient
+Procedure CostListOnEditEnd(Item, NewRow, CancelEdit)
+	If NewRow Then
+		CurrentData = Item.CurrentData;
+		If CurrentData = Undefined Then
+			Return;
+		EndIf;
+		AfterRowAdd(CurrentData);
+	EndIf;
+EndProcedure
+
 &AtClient
 Procedure EditCurrencies(Command)
 	CurrentData = ThisObject.Items.CostList.CurrentData;
@@ -155,6 +171,19 @@ Procedure SetVisibilityAvailability(Object, Form)
 	//
 EndProcedure
 
+&AtClient
+Procedure DeleteUnnecessaryRowsInCurrencies()
+	ArrayRowsToDelete = New Array; // Array of FormDataCollectionItem
+	For Each Row In Object.Currencies Do
+		If Object.CostList.FindRows(New Structure("Key", Row.Key)).Count() = 0 Then
+			ArrayRowsToDelete.Add(Row);
+		EndIf;
+	EndDo;
+	For Each Row In ArrayRowsToDelete Do
+		Object.Currencies.Delete(Row);
+	EndDo;
+EndProcedure
+
 // After expense SelectСosts.
 // 
 // Parameters:

diff --git a/IRP/src/Documents/RevenueAccruals/Forms/DocumentForm/Form.form b/IRP/src/Documents/RevenueAccruals/Forms/DocumentForm/Form.form
@@ -802,7 +802,7 @@
       <common>true</common>
      </userVisible>
      <dataPath xsi:type="form:DataPath">
-      <segments>Object.CostList.ExpenseType</segments>
+      <segments>Object.CostList.RevenueType</segments>
      </dataPath>
      <extendedTooltip>
       <name>CostListExpenseTypeExtendedTooltip</name>
@@ -1140,6 +1140,14 @@
      <horizontalAlign>Left</horizontalAlign>
      <autoFill>true</autoFill>
     </autoCommandBar>
+    <handlers>
+     <event>OnEditEnd</event>
+     <name>CostListOnEditEnd</name>
+    </handlers>
+    <handlers>
+     <event>AfterDeleteRow</event>
+     <name>CostListAfterDeleteRow</name>
+    </handlers>
     <handlers>
      <event>OnChange</event>
      <name>CostListOnChange</name>
@@ -1313,15 +1321,15 @@
    </userVisible>
    <title>
     <key>en</key>
-    <value>Expense</value>
+    <value>Revenue</value>
    </title>
    <title>
     <key>ru</key>
-    <value>Расход</value>
+    <value>Доход</value>
    </title>
    <title>
     <key>tr</key>
-    <value>Gider</value>
+    <value>Gelir</value>
    </title>
    <extendedTooltip>
     <name>GroupCostListExtendedTooltip</name>