Skip to content

Commit

Permalink
Translate
Browse files Browse the repository at this point in the history
  • Loading branch information
DitriXNew committed Mar 12, 2024
1 parent 445da2e commit 37f31e0
Show file tree
Hide file tree
Showing 104 changed files with 6,288 additions and 2,262 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -45,27 +45,6 @@
<maxValue xsi:type="core:UndefinedValue"/>
<fullTextSearch>Use</fullTextSearch>
</resources>
<resources uuid="36a7dd6f-79d1-48d7-a97e-a7fc6feb6b21">
<name>Commission</name>
<synonym>
<key>en</key>
<value>Commission</value>
</synonym>
<synonym>
<key>ru</key>
<value>Сумма комиссии</value>
</synonym>
<synonym>
<key>tr</key>
<value>Komisyon</value>
</synonym>
<type>
<types>DefinedType.typeAmount</types>
</type>
<minValue xsi:type="core:UndefinedValue"/>
<maxValue xsi:type="core:UndefinedValue"/>
<fullTextSearch>Use</fullTextSearch>
</resources>
<attributes uuid="ce3889e5-ccb4-493f-a9e5-dad91d027cf5">
<name>DeferredCalculation</name>
<synonym>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,12 +182,6 @@
<value>3</value>
</code>
</content>
<content id="084c14d6-0bf2-4b3f-a728-f9be108187ca">
<name>BankPayment_DR_R5022T_Expenses_CR_R3010B_CashOnHand</name>
<code xsi:type="core:NumberValue">
<value>9</value>
</code>
</content>
<content id="74335ed0-2922-43c2-85c5-27c87eb943ba">
<name>BankPayment_DR_R1021B_VendorsTransactions_CR_R1020B_AdvancesToVendors</name>
<code xsi:type="core:NumberValue">
Expand Down
8 changes: 4 additions & 4 deletions IRP/src/Catalogs/CashAccounts/CashAccounts.mdo
Original file line number Diff line number Diff line change
Expand Up @@ -257,18 +257,18 @@
<choiceHistoryOnInput>DontUse</choiceHistoryOnInput>
</attributes>
<attributes uuid="cea7e428-a4ce-4039-ab22-4d65dbae45dc">
<name>CommissionIsSeparate</name>
<name>DELETE_CommissionIsSeparate</name>
<synonym>
<key>en</key>
<value>Commission is separate</value>
<value>DELETE commission is separate</value>
</synonym>
<synonym>
<key>ru</key>
<value>Комиссия отдельно</value>
<value>DELETE комиссия отдельно</value>
</synonym>
<synonym>
<key>tr</key>
<value>Komisyon ayrı</value>
<value>DELETE komisyon ayrıdır</value>
</synonym>
<type>
<types>Boolean</types>
Expand Down
43 changes: 0 additions & 43 deletions IRP/src/Catalogs/CashAccounts/Forms/ItemForm/Form.form
Original file line number Diff line number Diff line change
Expand Up @@ -632,49 +632,6 @@
<textEdit>true</textEdit>
</extInfo>
</items>
<items xsi:type="form:FormField">
<name>CommissionIsSeparate</name>
<id>35</id>
<visible>true</visible>
<enabled>true</enabled>
<userVisible>
<common>true</common>
</userVisible>
<dataPath xsi:type="form:DataPath">
<segments>Object.CommissionIsSeparate</segments>
</dataPath>
<extendedTooltip>
<name>CommissionIsSeparateExtendedTooltip</name>
<id>37</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>CommissionIsSeparateContextMenu</name>
<id>36</id>
<visible>true</visible>
<enabled>true</enabled>
<userVisible>
<common>true</common>
</userVisible>
<autoFill>true</autoFill>
</contextMenu>
<type>CheckBoxField</type>
<editMode>Enter</editMode>
<showInHeader>true</showInHeader>
<headerHorizontalAlign>Left</headerHorizontalAlign>
<showInFooter>true</showInFooter>
<extInfo xsi:type="form:CheckBoxFieldExtInfo"/>
</items>
<items xsi:type="form:FormGroup">
<name>GroupCurrency</name>
<id>18</id>
Expand Down
1 change: 0 additions & 1 deletion IRP/src/Catalogs/CashAccounts/Forms/ItemForm/Module.bsl
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ Procedure SetVisibilityAvailability(Object, Form)
Form.Items.TransitAccount.Visible = IsBankAccount;
Form.Items.CurrencyType.ReadOnly = IsBankAccount Or IsPOSAccount Or IsTransitAccount Or IsPOSCashAccount;
Form.Items.ReceiptingAccount.Visible = IsPOSAccount;
Form.Items.CommissionIsSeparate.Visible = IsBankAccount;
Form.Items.CashAccount.Visible = IsPOSCashAccount;
Form.Items.FinancialMovementType.Visible = IsPOSCashAccount;
Form.Items.Acquiring.Visible = IsPOSAccount;
Expand Down
1 change: 0 additions & 1 deletion IRP/src/Catalogs/CashAccounts/ObjectModule.bsl
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ Procedure BeforeWrite(Cancel)
EndIf;
If Not IsBankAccount Then
ThisObject.TransitAccount = Undefined;
ThisObject.CommissionIsSeparate = False;
EndIf;
If Not IsPOSAccount Then
ThisObject.ReceiptingAccount = Undefined;
Expand Down
1 change: 0 additions & 1 deletion IRP/src/CommonModules/AccountingServer/Module.bsl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ Function GetOperationsDefinition()
// Bank payment
Map.Insert(AO.BankPayment_DR_R1020B_AdvancesToVendors_R1021B_VendorsTransactions_CR_R3010B_CashOnHand , New Structure("ByRow", True));
Map.Insert(AO.BankPayment_DR_R1021B_VendorsTransactions_CR_R1020B_AdvancesToVendors , New Structure("ByRow", True));
Map.Insert(AO.BankPayment_DR_R5022T_Expenses_CR_R3010B_CashOnHand , New Structure("ByRow", True));

// Bank receipt
Map.Insert(AO.BankReceipt_DR_R3010B_CashOnHand_CR_R2020B_AdvancesFromCustomers_R2021B_CustomersTransactions , New Structure("ByRow", True));
Expand Down
6 changes: 5 additions & 1 deletion IRP/src/CommonModules/BuilderAPI/Module.bsl
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,11 @@ Function Initialize(Doc = Undefined, InitialData = Undefined, FillingData = Unde
DocObject.Fill(FillingData);
Else
DocMetadata = Doc.Metadata();
DocObject = Doc.GetObject();
If Doc.IsEmpty() Then
DocObject = Documents[DocMetadata.Name].CreateDocument();
Else
DocObject = Doc.GetObject();
EndIf;
EndIf;
Else
DocMetadata = DocInfo.DocMetadata;
Expand Down
129 changes: 79 additions & 50 deletions IRP/src/CommonModules/ControllerClientServer_V2/Module.bsl
Original file line number Diff line number Diff line change
Expand Up @@ -535,8 +535,15 @@ Procedure ExecuteSetterByName(Parameters, Results, SetterName)
EndProcedure

Procedure ExecuteCommandByName(Parameters, CommandName)
//@skip-warning
Execute StrTemplate("%1(Parameters);", CommandName);
If CommandName = "CommandUpdateByBillOfMaterials" Then
CommandUpdateByBillOfMaterials(Parameters);
ElsIf CommandName = "CommandUpdateCurrentQuantity" Then
CommandUpdateCurrentQuantity(Parameters);
ElsIf CommandName = "CommandRecalculationWhenBasedOn" Then
CommandRecalculationWhenBasedOn(Parameters);
Else
Raise StrTemplate("Unsupported command name[%1]", CommandName);
EndIf;
EndProcedure

Function ResultArray(_Key, Value)
Expand Down Expand Up @@ -595,11 +602,6 @@ Function GetAllBindingsByDefault(Parameters)
Return Binding;
EndFunction

Function GetAllCommandsByDefault(Parameters)
ArrayOfCommands = New Array();
Return ArrayOfCommands;
EndFunction

#EndRegion

#Region _FORM_
Expand Down Expand Up @@ -728,7 +730,6 @@ Procedure AddNewRow(TableName, Parameters, ViewNotify = Undefined, LaunchSteps =

Bindings = GetAllBindings(Parameters);
Defaults = GetAllBindingsByDefault(Parameters);
DefaultsCommand = GetAllCommandsByDefault(Parameters);

For Each ColumnName In StrSplit(Parameters.ObjectMetadataInfo.Tables[TableName].Columns, ",") Do

Expand Down Expand Up @@ -758,11 +759,7 @@ Procedure AddNewRow(TableName, Parameters, ViewNotify = Undefined, LaunchSteps =

If LaunchSteps Then
LaunchNextSteps(Parameters);
EndIf;

For Each CommandName In DefaultsCommand Do
ExecuteCommandByName(Parameters, CommandName);
EndDo;
EndIf;
EndProcedure

#EndRegion
Expand Down Expand Up @@ -1617,6 +1614,10 @@ Procedure MultiSetTransactionType_BankPayment(Parameters, Results) Export
ResourceToBinding.Insert("ReceiptingAccount" , BindPaymentListReceiptingAccount(Parameters));
ResourceToBinding.Insert("ReceiptingBranch" , BindPaymentListReceiptingBranch(Parameters));
ResourceToBinding.Insert("Project" , BindPaymentListProject(Parameters));
ResourceToBinding.Insert("ExpenseType" , BindPaymentListExpenseType(Parameters));
ResourceToBinding.Insert("ProfitLossCenter" , BindPaymentListProfitLossCenter(Parameters));
ResourceToBinding.Insert("AdditionalAnalytic" , BindPaymentListAdditionalAnalytic(Parameters));

MultiSetterObject(Parameters, Results, ResourceToBinding);
EndProcedure

Expand All @@ -1637,12 +1638,18 @@ Procedure MultiSetTransactionType_BankReceipt(Parameters, Results) Export
ResourceToBinding.Insert("PaymentType" , BindPaymentListPaymentType(Parameters));
ResourceToBinding.Insert("PaymentTerminal" , BindPaymentListPaymentTerminal(Parameters));
ResourceToBinding.Insert("BankTerm" , BindPaymentListBankTerm(Parameters));
ResourceToBinding.Insert("CommissionIsSeparate" , BindPaymentListCommissionIsSeparate(Parameters));
ResourceToBinding.Insert("RetailCustomer" , BindPaymentListRetailCustomer(Parameters));
ResourceToBinding.Insert("RevenueType" , BindPaymentListRevenueType(Parameters));
ResourceToBinding.Insert("SendingAccount" , BindPaymentListSendingAccount(Parameters));
ResourceToBinding.Insert("SendingBranch" , BindPaymentListSendingBranch(Parameters));
ResourceToBinding.Insert("Project" , BindPaymentListProject(Parameters));
ResourceToBinding.Insert("ProfitLossCenter" , BindPaymentListProfitLossCenter(Parameters));
ResourceToBinding.Insert("ExpenseType" , BindPaymentListExpenseType(Parameters));
ResourceToBinding.Insert("AdditionalAnalytic" , BindPaymentListAdditionalAnalytic(Parameters));
ResourceToBinding.Insert("CommissionPercent" , BindPaymentListCommissionPercent(Parameters));
ResourceToBinding.Insert("Commission" , BindPaymentListCommission(Parameters));
ResourceToBinding.Insert("CommissionFinancialMovementType" , BindPaymentListCommissionFinancialMovementType(Parameters));

MultiSetterObject(Parameters, Results, ResourceToBinding);
EndProcedure

Expand Down Expand Up @@ -1744,6 +1751,10 @@ Procedure StepClearByTransactionTypeBankPayment(Parameters, Chain) Export
Options.ReceiptingAccount = GetPaymentListReceiptingAccount(Parameters, Row.Key);
Options.ReceiptingBranch = GetPaymentListReceiptingBranch(Parameters, Row.Key);
Options.Project = GetPaymentListProject(Parameters, Row.Key);
Options.ExpenseType = GetPaymentListExpenseType(Parameters, Row.Key);
Options.ProfitLossCenter = GetPaymentListProfitLossCenter(Parameters, Row.Key);
Options.AdditionalAnalytic = GetPaymentListAdditionalAnalytic(Parameters, Row.Key);

Options.Key = Row.Key;
Options.StepName = "StepClearByTransactionTypeBankPayment";
Chain.ClearByTransactionTypeBankPayment.Options.Add(Options);
Expand Down Expand Up @@ -1774,12 +1785,18 @@ Procedure StepClearByTransactionTypeBankReceipt(Parameters, Chain) Export
Options.PaymentType = GetPaymentListPaymentType(Parameters, Row.Key);
Options.PaymentTerminal = GetPaymentListPaymentTerminal(Parameters, Row.Key);
Options.BankTerm = GetPaymentListBankTerm(Parameters, Row.Key);
Options.CommissionIsSeparate = GetPaymentListCommissionIsSeparate(Parameters, Row.Key);
Options.RetailCustomer = GetPaymentListRetailCustomer(Parameters, Row.Key);
Options.RevenueType = GetPaymentListRevenueType(Parameters, Row.Key);
Options.SendingAccount = GetPaymentListSendingAccount(Parameters, Row.Key);
Options.SendingBranch = GetPaymentListSendingBranch(Parameters, Row.Key);
Options.Project = GetPaymentListProject(Parameters, Row.Key);
Options.Project = GetPaymentListProject(Parameters, Row.Key);
Options.ProfitLossCenter = GetPaymentListProfitLossCenter(Parameters, Row.Key);
Options.ExpenseType = GetPaymentListExpenseType(Parameters, Row.Key);
Options.AdditionalAnalytic = GetPaymentListAdditionalAnalytic(Parameters, Row.Key);
Options.CommissionPercent = GetPaymentListCommissionPercent(Parameters, Row.Key);
Options.Commission = GetPaymentListCommission(Parameters, Row.Key);
Options.CommissionFinancialMovementType = GetPaymentListCommissionFinancialMovementType(Parameters, Row.Key);

Options.Key = Row.Key;
Options.StepName = "StepClearByTransactionTypeBankReceipt";
Chain.ClearByTransactionTypeBankReceipt.Options.Add(Options);
Expand Down Expand Up @@ -6586,6 +6603,50 @@ EndFunction

#EndRegion

#Region PAYMENT_LIST_ADDITIONAL_ANALYTIC

// PaymentList.AdditionalAnalytic.Set
Procedure SetPaymentListAdditionalAnalytic(Parameters, Results) Export
Binding = BindPaymentListAdditionalAnalytic(Parameters);
SetterObject(Binding.StepsEnabler, Binding.DataPath, Parameters, Results);
EndProcedure

// PaymentList.AdditionalAnalytic.Get
Function GetPaymentListAdditionalAnalytic(Parameters, _Key)
Return GetPropertyObject(Parameters, BindPaymentListAdditionalAnalytic(Parameters).DataPath, _Key);
EndFunction

// PaymentList.AdditionalAnalytic.Bind
Function BindPaymentListAdditionalAnalytic(Parameters)
DataPath = "PaymentList.AdditionalAnalytic";
Binding = New Structure();
Return BindSteps("BindVoid", DataPath, Binding, Parameters, "BindPaymentListAdditionalAnalytic");
EndFunction

#EndRegion

#Region PAYMENT_LIST_COMISSION_FINANCIAL_MOVEMENT_TYPE

// PaymentList.CommissionFinancialMovementType.Set
Procedure SetPaymentListCommissionFinancialMovementType(Parameters, Results) Export
Binding = BindPaymentListCommissionFinancialMovementType(Parameters);
SetterObject(Binding.StepsEnabler, Binding.DataPath, Parameters, Results);
EndProcedure

// PaymentList.CommissionFinancialMovementType.Get
Function GetPaymentListCommissionFinancialMovementType(Parameters, _Key)
Return GetPropertyObject(Parameters, BindPaymentListCommissionFinancialMovementType(Parameters).DataPath, _Key);
EndFunction

// PaymentList.CommissionFinancialMovementType.Bind
Function BindPaymentListCommissionFinancialMovementType(Parameters)
DataPath = "PaymentList.CommissionFinancialMovementType";
Binding = New Structure();
Return BindSteps("BindVoid", DataPath, Binding, Parameters, "BindPaymentListCommissionFinancialMovementType");
EndFunction

#EndRegion

#Region PAYMENT_LIST_REVENUE_TYPE

// PaymentList.RevenueType.Set
Expand Down Expand Up @@ -7676,8 +7737,7 @@ Function BindPaymentListTotalAmount(Parameters)
DataPath = "PaymentList.TotalAmount";
Binding = New Structure();
Binding.Insert("BankPayment",
"StepPaymentListCalculateCommission,
|StepPaymentListCalculations_IsTotalAmountChanged");
"StepPaymentListCalculations_IsTotalAmountChanged");

Binding.Insert("BankReceipt",
"StepPaymentListCalculateCommission,
Expand Down Expand Up @@ -7848,9 +7908,6 @@ EndFunction
Function BindPaymentListPaymentType(Parameters)
DataPath = "PaymentList.PaymentType";
Binding = New Structure();

Binding.Insert("BankPayment",
"StepPaymentListGetCommissionPercent");

Binding.Insert("BankReceipt",
"StepPaymentListGetCommissionPercent");
Expand Down Expand Up @@ -7904,10 +7961,7 @@ EndFunction
Function BindPaymentListBankTerm(Parameters)
DataPath = "PaymentList.BankTerm";
Binding = New Structure();

Binding.Insert("BankPayment",
"StepPaymentListGetCommissionPercent");


Binding.Insert("BankReceipt",
"StepPaymentListGetCommissionPercent");

Expand All @@ -7916,28 +7970,6 @@ EndFunction

#EndRegion

#Region PAYMENT_LIST_COMMISSION_IS_SEPARATE

// PaymentList.CommissionIsSeparate.Set
Procedure SetPaymentListCommissionIsSeparate(Parameters, Results) Export
Binding = BindPaymentListCommissionIsSeparate(Parameters);
SetterObject(Binding.StepsEnabler, Binding.DataPath, Parameters, Results);
EndProcedure

// PaymentList.CommissionIsSeparate.Get
Function GetPaymentListCommissionIsSeparate(Parameters, _Key)
Return GetPropertyObject(Parameters, BindPaymentListCommissionIsSeparate(Parameters).DataPath , _Key);
EndFunction

// PaymentList.CommissionIsSeparate.Bind
Function BindPaymentListCommissionIsSeparate(Parameters)
DataPath = "PaymentList.CommissionIsSeparate";
Binding = New Structure();
Return BindSteps("BindVoid", DataPath, Binding, Parameters, "BindPaymentListCommissionIsSeparate");
EndFunction

#EndRegion

#Region PAYMENT_LIST_COMMISSION

// PaymentList.Commission.OnChange
Expand Down Expand Up @@ -8013,9 +8045,6 @@ Function BindPaymentListCommissionPercent(Parameters)
DataPath = "PaymentList.CommissionPercent";
Binding = New Structure();

Binding.Insert("BankPayment",
"StepPaymentListCalculateCommission");

Binding.Insert("BankReceipt",
"StepPaymentListCalculateCommission");

Expand Down
Loading

0 comments on commit 37f31e0

Please sign in to comment.