Translate

IRPTeam · Apr 15, 2024 · a7f2917 · a7f2917
1 parent 71972fa
commit a7f2917
Show file tree

Hide file tree

Showing 97 changed files with 4,885 additions and 429 deletions.
diff --git a/IRP/src/AccumulationRegisters/R5020B_PartnersBalance/ManagerModule.bsl b/IRP/src/AccumulationRegisters/R5020B_PartnersBalance/ManagerModule.bsl
@@ -2281,3 +2281,32 @@ Function R5020B_PartnersBalance_DebitCreditNote() Export
 		|
 		|";
 EndFunction
+
+Function R5020B_PartnersBalance_Payroll() Export
+	Return 
+		// Other transaction
+		"SELECT
+		|
+		|	VALUE(AccumulationRecordType.Expense) AS RecordType,
+		|	SalaryTaxList.Period,
+		|	SalaryTaxList.Company,
+		|	SalaryTaxList.Branch,
+		|	SalaryTaxList.Partner,
+		|	SalaryTaxList.LegalName,
+		|	SalaryTaxList.Agreement,
+		|	UNDEFINED AS Document,
+		|	SalaryTaxList.Currency,
+		|	0 AS Amount,
+		|	0 AS CustomerTransaction,
+		|	0 AS CustomerAdvance,
+		|	0 AS VendorTransaction,
+		|	0 AS VendorAdvance,
+		|	SalaryTaxList.Amount AS OtherTransaction,
+		|	UNDEFINED AS AdvancesClosing,
+		|	SalaryTaxList.Key
+		|INTO R5020B_PartnersBalance
+		|FROM
+		|	SalaryTaxList AS SalaryTaxList
+		|WHERE
+		|	TRUE";
+EndFunction
diff --git a/IRP/src/AccumulationRegisters/R5041B_TaxesPayable/ManagerModule.bsl b/IRP/src/AccumulationRegisters/R5041B_TaxesPayable/ManagerModule.bsl
@@ -6,11 +6,9 @@
 // Returns:
 //  Structure - Get access key:
 // * Company - CatalogRef.Companies -
-// * Branch - CatalogRef.BusinessUnits -
 Function GetAccessKey() Export
 	AccessKeyStructure = New Structure;
 	AccessKeyStructure.Insert("Company", Catalogs.Companies.EmptyRef());
-	AccessKeyStructure.Insert("Branch", Catalogs.BusinessUnits.EmptyRef());
 	Return AccessKeyStructure;
 EndFunction
 

diff --git a/IRP/src/AccumulationRegisters/R5041B_TaxesPayable/R5041B_TaxesPayable.mdo b/IRP/src/AccumulationRegisters/R5041B_TaxesPayable/R5041B_TaxesPayable.mdo
@@ -24,40 +24,19 @@
  <useStandardCommands>true</useStandardCommands>
  <dataLockControlMode>Managed</dataLockControlMode>
  <enableTotalsSplitting>true</enableTotalsSplitting>
- <resources uuid="cf823e29-2ebe-4dca-ae7c-516ac8d8ba87">
-  <name>TaxableAmount</name>
-  <synonym>
-   <key>en</key>
-   <value>Taxable amount</value>
-  </synonym>
-  <synonym>
-   <key>ru</key>
-   <value>Сумма оборота</value>
-  </synonym>
-  <synonym>
-   <key>tr</key>
-   <value>KDV Matrahı</value>
-  </synonym>
-  <type>
-   <types>DefinedType.typeAmount</types>
-  </type>
-  <minValue xsi:type="core:UndefinedValue"/>
-  <maxValue xsi:type="core:UndefinedValue"/>
-  <fullTextSearch>Use</fullTextSearch>
- </resources>
  <resources uuid="13789d8c-b78f-4ca5-abea-73f15319f47c">
-  <name>TaxAmount</name>
+  <name>Amount</name>
   <synonym>
    <key>en</key>
-   <value>Tax amount</value>
+   <value>Amount</value>
   </synonym>
   <synonym>
    <key>ru</key>
-   <value>Сумма налогов</value>
+   <value>Сумма</value>
   </synonym>
   <synonym>
    <key>tr</key>
-   <value>Vergi tutarı</value>
+   <value>Tutar</value>
   </synonym>
   <type>
    <types>DefinedType.typeAmount</types>
@@ -88,28 +67,6 @@
   <fullTextSearch>Use</fullTextSearch>
   <useInTotals>true</useInTotals>
  </dimensions>
- <dimensions uuid="66f832ad-6779-4b22-abbc-01ef635adf1d">
-  <name>Branch</name>
-  <synonym>
-   <key>en</key>
-   <value>Branch</value>
-  </synonym>
-  <synonym>
-   <key>ru</key>
-   <value>Структурное подразделение</value>
-  </synonym>
-  <synonym>
-   <key>tr</key>
-   <value>Şube</value>
-  </synonym>
-  <type>
-   <types>CatalogRef.BusinessUnits</types>
-  </type>
-  <minValue xsi:type="core:UndefinedValue"/>
-  <maxValue xsi:type="core:UndefinedValue"/>
-  <fullTextSearch>Use</fullTextSearch>
-  <useInTotals>true</useInTotals>
- </dimensions>
  <dimensions uuid="5eeb2983-51b6-4deb-896d-5fb1234cd8f6">
   <name>Tax</name>
   <synonym>
@@ -132,51 +89,4 @@
   <fullTextSearch>Use</fullTextSearch>
   <useInTotals>true</useInTotals>
  </dimensions>
- <dimensions uuid="6eba24f4-3930-4fc0-803b-85126643fc52">
-  <name>TaxRate</name>
-  <synonym>
-   <key>en</key>
-   <value>Tax rate</value>
-  </synonym>
-  <synonym>
-   <key>ru</key>
-   <value>Налоговая ставка</value>
-  </synonym>
-  <synonym>
-   <key>tr</key>
-   <value>Vergi oranı</value>
-  </synonym>
-  <type>
-   <types>CatalogRef.TaxRates</types>
-  </type>
-  <minValue xsi:type="core:UndefinedValue"/>
-  <maxValue xsi:type="core:UndefinedValue"/>
-  <fullTextSearch>Use</fullTextSearch>
-  <useInTotals>true</useInTotals>
- </dimensions>
- <dimensions uuid="82383715-6cea-4676-92c4-aad8247a220f">
-  <name>TaxMovementType</name>
-  <synonym>
-   <key>en</key>
-   <value>Tax movement type</value>
-  </synonym>
-  <synonym>
-   <key>ru</key>
-   <value>Вид поступления</value>
-  </synonym>
-  <synonym>
-   <key>tr</key>
-   <value>Vergiler hareket tipi</value>
-  </synonym>
-  <type>
-   <types>String</types>
-   <stringQualifiers>
-    <length>10</length>
-   </stringQualifiers>
-  </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/R9510B_SalaryPayment/R9510B_SalaryPayment.mdo b/IRP/src/AccumulationRegisters/R9510B_SalaryPayment/R9510B_SalaryPayment.mdo
@@ -199,4 +199,26 @@
   <fullTextSearch>Use</fullTextSearch>
   <useInTotals>true</useInTotals>
  </dimensions>
+ <dimensions uuid="c5667240-f66a-4291-97fa-1f0e9006ebc6">
+  <name>CalculationType</name>
+  <synonym>
+   <key>en</key>
+   <value>Calculation type</value>
+  </synonym>
+  <synonym>
+   <key>ru</key>
+   <value>Вариант оплаты</value>
+  </synonym>
+  <synonym>
+   <key>tr</key>
+   <value>Hesaplama tipi</value>
+  </synonym>
+  <type>
+   <types>CatalogRef.SalaryCalculationType</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/AccrualAndDeductionTypes/AccrualAndDeductionTypes.mdo b/IRP/src/Catalogs/AccrualAndDeductionTypes/AccrualAndDeductionTypes.mdo
@@ -247,6 +247,29 @@
   <fullTextSearch>Use</fullTextSearch>
   <dataHistory>Use</dataHistory>
  </attributes>
+ <attributes uuid="2d572a91-d980-4ee2-aefb-51be7fc6a3c5">
+  <name>CalculationType</name>
+  <synonym>
+   <key>en</key>
+   <value>Calculation type</value>
+  </synonym>
+  <synonym>
+   <key>ru</key>
+   <value>Вариант оплаты</value>
+  </synonym>
+  <synonym>
+   <key>tr</key>
+   <value>Hesaplama tipi</value>
+  </synonym>
+  <type>
+   <types>CatalogRef.SalaryCalculationType</types>
+  </type>
+  <minValue xsi:type="core:UndefinedValue"/>
+  <maxValue xsi:type="core:UndefinedValue"/>
+  <fillValue xsi:type="core:UndefinedValue"/>
+  <fullTextSearch>Use</fullTextSearch>
+  <dataHistory>Use</dataHistory>
+ </attributes>
  <tabularSections uuid="632340b7-9127-41d8-9868-0c6fc7fdae8c">
   <producedTypes>
    <objectType typeId="97f8f126-78b1-4cba-869e-a0d7ab0a0c31" valueTypeId="03f03d64-190b-4141-b59a-ef228cbc0a9e"/>

diff --git a/IRP/src/Catalogs/AccrualAndDeductionTypes/Forms/ItemForm/Form.form b/IRP/src/Catalogs/AccrualAndDeductionTypes/Forms/ItemForm/Form.form
@@ -232,6 +232,56 @@
       <textEdit>true</textEdit>
     </extInfo>
   </items>
+  <items xsi:type="form:FormField">
+    <name>CalculationType</name>
+    <id>29</id>
+    <visible>true</visible>
+    <enabled>true</enabled>
+    <userVisible>
+      <common>true</common>
+    </userVisible>
+    <dataPath xsi:type="form:DataPath">
+      <segments>Object.CalculationType</segments>
+    </dataPath>
+    <extendedTooltip>
+      <name>CalculationTypeExtendedTooltip</name>
+      <id>31</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>CalculationTypeContextMenu</name>
+      <id>30</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:FormGroup">
     <name>GroupAdditionalAttributes</name>
     <id>3</id>

diff --git a/IRP/src/Catalogs/AddAttributeAndPropertySets/AddAttributeAndPropertySets.mdo b/IRP/src/Catalogs/AddAttributeAndPropertySets/AddAttributeAndPropertySets.mdo
@@ -920,6 +920,13 @@
     <value>149</value>
    </code>
   </items>
+  <items id="14341052-2325-4066-93a7-1385274365eb">
+   <name>Catalog_SalaryCalculationType</name>
+   <description/>
+   <code xsi:type="core:NumberValue">
+    <value>150</value>
+   </code>
+  </items>
  </predefined>
  <editType>InDialog</editType>
  <choiceMode>BothWays</choiceMode>

diff --git a/...Catalogs/SalaryCalculationType/Forms/ChoiceForm/Attributes/List/ExtInfo/ListSettings.dcss b/...Catalogs/SalaryCalculationType/Forms/ChoiceForm/Attributes/List/ExtInfo/ListSettings.dcss
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Settings xmlns="http://v8.1c.ru/8.1/data-composition-system/settings" xmlns:dcscor="http://v8.1c.ru/8.1/data-composition-system/core" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<filter>
+		<viewMode>Normal</viewMode>
+		<userSettingID>dfcece9d-5077-440b-b6b3-45a5cb4538eb</userSettingID>
+	</filter>
+	<order>
+		<viewMode>Normal</viewMode>
+		<userSettingID>88619765-ccb3-46c6-ac52-38e9c992ebd4</userSettingID>
+	</order>
+	<conditionalAppearance>
+		<viewMode>Normal</viewMode>
+		<userSettingID>b75fecce-942b-4aed-abc9-e6a02e460fb3</userSettingID>
+	</conditionalAppearance>
+	<itemsViewMode>Normal</itemsViewMode>
+	<itemsUserSettingID>911b6018-f537-43e8-a417-da56b22f9aec</itemsUserSettingID>
+</Settings>