diff --git a/IRP/src/Catalogs/Agreements/ManagerModule.bsl b/IRP/src/Catalogs/Agreements/ManagerModule.bsl index 201bc2c550..867efdf23d 100644 --- a/IRP/src/Catalogs/Agreements/ManagerModule.bsl +++ b/IRP/src/Catalogs/Agreements/ManagerModule.bsl @@ -190,7 +190,7 @@ Function GetDefaultChoiceRef(Parameters, AgreementParameters) Export EndIf; EndDo; If CountAgreementWithCompany = 1 Then - Agreement = TmpAgreement; + Agreement = TmpAgreement; EndIf; EndIf; diff --git a/IRP/src/CommonModules/ControllerClientServer_V2/Module.bsl b/IRP/src/CommonModules/ControllerClientServer_V2/Module.bsl index 58984f4934..140804e06c 100644 --- a/IRP/src/CommonModules/ControllerClientServer_V2/Module.bsl +++ b/IRP/src/CommonModules/ControllerClientServer_V2/Module.bsl @@ -1500,23 +1500,27 @@ Function BindTransactionType(Parameters) Binding = New Structure(); Binding.Insert("BankPayment", "StepChangeTransitAccountByAccount, - |StepClearByTransactionTypeBankPayment, + |StepClearByTransactionTypeBankPayment, + |StepPaymentListChangeAgreementByPartner, |StepChangeTaxVisible, |StepChangeVatRate_AgreementInList"); Binding.Insert("BankReceipt", "StepChangeTransitAccountByAccount, |StepClearByTransactionTypeBankReceipt, + |StepPaymentListChangeAgreementByPartner, |StepChangeTaxVisible, |StepChangeVatRate_AgreementInList"); Binding.Insert("CashPayment", "StepClearByTransactionTypeCashPayment, + |StepPaymentListChangeAgreementByPartner, |StepChangeTaxVisible, |StepChangeVatRate_AgreementInList"); Binding.Insert("CashReceipt", "StepClearByTransactionTypeCashReceipt, + |StepPaymentListChangeAgreementByPartner, |StepChangeCashAccountByTransactionType, |StepChangeTaxVisible, |StepChangeVatRate_AgreementInList"); @@ -6837,6 +6841,7 @@ Procedure StepPaymentListChangeAgreementByPartner(Parameters, Chain) Export Options.Agreement = GetPaymentListAgreement(Parameters, Row.Key); Options.Company = GetCompany(Parameters); Options.CurrentDate = GetDate(Parameters); + Options.TransactionType = GetTransactionType(Parameters); Options.Key = Row.Key; Options.StepName = "PaymentListChangeAgreementByPartner"; Chain.ChangeAgreementByPartner.Options.Add(Options); diff --git a/IRP/src/CommonModules/DocBankPaymentClient/Module.bsl b/IRP/src/CommonModules/DocBankPaymentClient/Module.bsl index ada585db42..3207a4f2b6 100644 --- a/IRP/src/CommonModules/DocBankPaymentClient/Module.bsl +++ b/IRP/src/CommonModules/DocBankPaymentClient/Module.bsl @@ -227,25 +227,13 @@ Procedure AgreementStartChoice(Object, Form, Item, ChoiceData, StandardProcessin If CurrentData = Undefined Then Return; EndIf; + + Parameters = New Structure(); + Parameters.Insert("Partner" , CurrentData.Partner); + Parameters.Insert("LegalName", CurrentData.Payee); + Parameters.Insert("Company" , Object.Company); - OpenSettings = DocumentsClient.GetOpenSettingsStructure(); - OpenSettings.ArrayOfFilters = New Array(); - OpenSettings.ArrayOfFilters.Add(DocumentsClientServer.CreateFilterItem("DeletionMark", True, - DataCompositionComparisonType.NotEqual)); - OpenSettings.ArrayOfFilters.Add(DocumentsClientServer.CreateFilterItem("Kind", PredefinedValue( - "Enum.AgreementKinds.Standard"), DataCompositionComparisonType.NotEqual)); - OpenSettings.FormParameters = New Structure(); - OpenSettings.FormParameters.Insert("Partner", CurrentData.Partner); - OpenSettings.FormParameters.Insert("IncludeFilterByPartner", True); - OpenSettings.FormParameters.Insert("IncludePartnerSegments", True); - OpenSettings.FormParameters.Insert("EndOfUseDate", Object.Date); - OpenSettings.FormParameters.Insert("IncludeFilterByEndOfUseDate", True); - OpenSettings.FillingData = New Structure(); - OpenSettings.FillingData.Insert("Partner", CurrentData.Partner); - OpenSettings.FillingData.Insert("LegalName", CurrentData.Payee); - OpenSettings.FillingData.Insert("Company", Object.Company); - - DocumentsClient.AgreementStartChoice(Object, Form, Item, ChoiceData, StandardProcessing, OpenSettings); + DocumentsClient.AgreementStartChoice_TransactionTypeFilter(Object, Form, Item, ChoiceData, StandardProcessing, Object.TransactionType, Parameters); EndProcedure Procedure AgreementTextChange(Object, Form, Item, Text, StandardProcessing) Export @@ -253,20 +241,11 @@ Procedure AgreementTextChange(Object, Form, Item, Text, StandardProcessing) Expo If CurrentData = Undefined Then Return; EndIf; - - ArrayOfFilters = New Array(); - ArrayOfFilters.Add(DocumentsClientServer.CreateFilterItem("DeletionMark", True, ComparisonType.NotEqual)); - ArrayOfFilters.Add(DocumentsClientServer.CreateFilterItem("Kind", PredefinedValue("Enum.AgreementKinds.Standard"), - ComparisonType.NotEqual)); - - AdditionalParameters = New Structure(); - AdditionalParameters.Insert("IncludeFilterByEndOfUseDate", True); - AdditionalParameters.Insert("IncludeFilterByPartner", True); - AdditionalParameters.Insert("IncludePartnerSegments", True); - AdditionalParameters.Insert("EndOfUseDate", Object.Date); - AdditionalParameters.Insert("Partner", CurrentData.Partner); - DocumentsClient.AgreementEditTextChange(Object, Form, Item, Text, StandardProcessing, ArrayOfFilters, - AdditionalParameters); + + Parameters = New Structure(); + Parameters.Insert("Partner", CurrentData.Partner); + + DocumentsClient.AgreementTextChange_TransactionTypeFilter(Object, Form, Item, Text, StandardProcessing, Object.TransactionType, Parameters); EndProcedure #EndRegion diff --git a/IRP/src/CommonModules/DocBankReceiptClient/Module.bsl b/IRP/src/CommonModules/DocBankReceiptClient/Module.bsl index ecc19a2df6..b1fe13e8f6 100644 --- a/IRP/src/CommonModules/DocBankReceiptClient/Module.bsl +++ b/IRP/src/CommonModules/DocBankReceiptClient/Module.bsl @@ -219,24 +219,12 @@ Procedure AgreementStartChoice(Object, Form, Item, ChoiceData, StandardProcessin Return; EndIf; - OpenSettings = DocumentsClient.GetOpenSettingsStructure(); - OpenSettings.ArrayOfFilters = New Array(); - OpenSettings.ArrayOfFilters.Add(DocumentsClientServer.CreateFilterItem("DeletionMark", True, - DataCompositionComparisonType.NotEqual)); - OpenSettings.ArrayOfFilters.Add(DocumentsClientServer.CreateFilterItem("Kind", PredefinedValue( - "Enum.AgreementKinds.Standard"), DataCompositionComparisonType.NotEqual)); - OpenSettings.FormParameters = New Structure(); - OpenSettings.FormParameters.Insert("Partner", CurrentData.Partner); - OpenSettings.FormParameters.Insert("IncludeFilterByPartner", True); - OpenSettings.FormParameters.Insert("IncludePartnerSegments", True); - OpenSettings.FormParameters.Insert("EndOfUseDate", Object.Date); - OpenSettings.FormParameters.Insert("IncludeFilterByEndOfUseDate", True); - OpenSettings.FillingData = New Structure(); - OpenSettings.FillingData.Insert("Partner", CurrentData.Partner); - OpenSettings.FillingData.Insert("LegalName", CurrentData.Payer); - OpenSettings.FillingData.Insert("Company", Object.Company); + Parameters = New Structure(); + Parameters.Insert("Partner" , CurrentData.Partner); + Parameters.Insert("LegalName", CurrentData.Payer); + Parameters.Insert("Company" , Object.Company); - DocumentsClient.AgreementStartChoice(Object, Form, Item, ChoiceData, StandardProcessing, OpenSettings); + DocumentsClient.AgreementStartChoice_TransactionTypeFilter(Object, Form, Item, ChoiceData, StandardProcessing, Object.TransactionType, Parameters); EndProcedure Procedure AgreementTextChange(Object, Form, Item, Text, StandardProcessing) Export @@ -245,19 +233,10 @@ Procedure AgreementTextChange(Object, Form, Item, Text, StandardProcessing) Expo Return; EndIf; - ArrayOfFilters = New Array(); - ArrayOfFilters.Add(DocumentsClientServer.CreateFilterItem("DeletionMark", True, ComparisonType.NotEqual)); - ArrayOfFilters.Add(DocumentsClientServer.CreateFilterItem("Kind", PredefinedValue("Enum.AgreementKinds.Standard"), - ComparisonType.NotEqual)); - - AdditionalParameters = New Structure(); - AdditionalParameters.Insert("IncludeFilterByEndOfUseDate", True); - AdditionalParameters.Insert("IncludeFilterByPartner", True); - AdditionalParameters.Insert("IncludePartnerSegments", True); - AdditionalParameters.Insert("EndOfUseDate", Object.Date); - AdditionalParameters.Insert("Partner", CurrentData.Partner); - DocumentsClient.AgreementEditTextChange(Object, Form, Item, Text, StandardProcessing, ArrayOfFilters, - AdditionalParameters); + Parameters = New Structure(); + Parameters.Insert("Partner", CurrentData.Partner); + + DocumentsClient.AgreementTextChange_TransactionTypeFilter(Object, Form, Item, Text, StandardProcessing, Object.TransactionType, Parameters); EndProcedure #EndRegion diff --git a/IRP/src/CommonModules/DocCashPaymentClient/Module.bsl b/IRP/src/CommonModules/DocCashPaymentClient/Module.bsl index 62966e2cab..a0b8952f31 100644 --- a/IRP/src/CommonModules/DocCashPaymentClient/Module.bsl +++ b/IRP/src/CommonModules/DocCashPaymentClient/Module.bsl @@ -196,24 +196,12 @@ Procedure AgreementStartChoice(Object, Form, Item, ChoiceData, StandardProcessin Return; EndIf; - OpenSettings = DocumentsClient.GetOpenSettingsStructure(); - OpenSettings.ArrayOfFilters = New Array(); - OpenSettings.ArrayOfFilters.Add(DocumentsClientServer.CreateFilterItem("DeletionMark", True, - DataCompositionComparisonType.NotEqual)); - OpenSettings.ArrayOfFilters.Add(DocumentsClientServer.CreateFilterItem("Kind", PredefinedValue( - "Enum.AgreementKinds.Standard"), DataCompositionComparisonType.NotEqual)); - OpenSettings.FormParameters = New Structure(); - OpenSettings.FormParameters.Insert("Partner", CurrentData.Partner); - OpenSettings.FormParameters.Insert("IncludeFilterByPartner", True); - OpenSettings.FormParameters.Insert("IncludePartnerSegments", True); - OpenSettings.FormParameters.Insert("EndOfUseDate", Object.Date); - OpenSettings.FormParameters.Insert("IncludeFilterByEndOfUseDate", True); - OpenSettings.FillingData = New Structure(); - OpenSettings.FillingData.Insert("Partner", CurrentData.Partner); - OpenSettings.FillingData.Insert("LegalName", CurrentData.Payee); - OpenSettings.FillingData.Insert("Company", Object.Company); + Parameters = New Structure(); + Parameters.Insert("Partner" , CurrentData.Partner); + Parameters.Insert("LegalName", CurrentData.Payee); + Parameters.Insert("Company" , Object.Company); - DocumentsClient.AgreementStartChoice(Object, Form, Item, ChoiceData, StandardProcessing, OpenSettings); + DocumentsClient.AgreementStartChoice_TransactionTypeFilter(Object, Form, Item, ChoiceData, StandardProcessing, Object.TransactionType, Parameters); EndProcedure Procedure AgreementTextChange(Object, Form, Item, Text, StandardProcessing) Export @@ -222,18 +210,10 @@ Procedure AgreementTextChange(Object, Form, Item, Text, StandardProcessing) Expo Return; EndIf; - ArrayOfFilters = New Array(); - ArrayOfFilters.Add(DocumentsClientServer.CreateFilterItem("DeletionMark", True, ComparisonType.NotEqual)); - ArrayOfFilters.Add(DocumentsClientServer.CreateFilterItem("Kind", PredefinedValue("Enum.AgreementKinds.Standard"), - ComparisonType.NotEqual)); - AdditionalParameters = New Structure(); - AdditionalParameters.Insert("IncludeFilterByEndOfUseDate", True); - AdditionalParameters.Insert("IncludeFilterByPartner", True); - AdditionalParameters.Insert("IncludePartnerSegments", True); - AdditionalParameters.Insert("EndOfUseDate", Object.Date); - AdditionalParameters.Insert("Partner", CurrentData.Partner); - DocumentsClient.AgreementEditTextChange(Object, Form, Item, Text, StandardProcessing, ArrayOfFilters, - AdditionalParameters); + Parameters = New Structure(); + Parameters.Insert("Partner", CurrentData.Partner); + + DocumentsClient.AgreementTextChange_TransactionTypeFilter(Object, Form, Item, Text, StandardProcessing, Object.TransactionType, Parameters); EndProcedure #EndRegion diff --git a/IRP/src/CommonModules/DocCashReceiptClient/Module.bsl b/IRP/src/CommonModules/DocCashReceiptClient/Module.bsl index d2a540150c..6cf899bb7c 100644 --- a/IRP/src/CommonModules/DocCashReceiptClient/Module.bsl +++ b/IRP/src/CommonModules/DocCashReceiptClient/Module.bsl @@ -201,24 +201,12 @@ Procedure AgreementStartChoice(Object, Form, Item, ChoiceData, StandardProcessin Return; EndIf; - OpenSettings = DocumentsClient.GetOpenSettingsStructure(); - OpenSettings.ArrayOfFilters = New Array(); - OpenSettings.ArrayOfFilters.Add(DocumentsClientServer.CreateFilterItem("DeletionMark", True, - DataCompositionComparisonType.NotEqual)); - OpenSettings.ArrayOfFilters.Add(DocumentsClientServer.CreateFilterItem("Kind", PredefinedValue( - "Enum.AgreementKinds.Standard"), DataCompositionComparisonType.NotEqual)); - OpenSettings.FormParameters = New Structure(); - OpenSettings.FormParameters.Insert("Partner", CurrentData.Partner); - OpenSettings.FormParameters.Insert("IncludeFilterByPartner", True); - OpenSettings.FormParameters.Insert("IncludePartnerSegments", True); - OpenSettings.FormParameters.Insert("EndOfUseDate", Object.Date); - OpenSettings.FormParameters.Insert("IncludeFilterByEndOfUseDate", True); - OpenSettings.FillingData = New Structure(); - OpenSettings.FillingData.Insert("Partner", CurrentData.Partner); - OpenSettings.FillingData.Insert("LegalName", CurrentData.Payer); - OpenSettings.FillingData.Insert("Company", Object.Company); + Parameters = New Structure(); + Parameters.Insert("Partner" , CurrentData.Partner); + Parameters.Insert("LegalName", CurrentData.Payer); + Parameters.Insert("Company" , Object.Company); - DocumentsClient.AgreementStartChoice(Object, Form, Item, ChoiceData, StandardProcessing, OpenSettings); + DocumentsClient.AgreementStartChoice_TransactionTypeFilter(Object, Form, Item, ChoiceData, StandardProcessing, Object.TransactionType, Parameters); EndProcedure Procedure AgreementTextChange(Object, Form, Item, Text, StandardProcessing) Export @@ -227,18 +215,10 @@ Procedure AgreementTextChange(Object, Form, Item, Text, StandardProcessing) Expo Return; EndIf; - ArrayOfFilters = New Array(); - ArrayOfFilters.Add(DocumentsClientServer.CreateFilterItem("DeletionMark", True, ComparisonType.NotEqual)); - ArrayOfFilters.Add(DocumentsClientServer.CreateFilterItem("Kind", PredefinedValue("Enum.AgreementKinds.Standard"), - ComparisonType.NotEqual)); - AdditionalParameters = New Structure(); - AdditionalParameters.Insert("IncludeFilterByEndOfUseDate", True); - AdditionalParameters.Insert("IncludeFilterByPartner", True); - AdditionalParameters.Insert("IncludePartnerSegments", True); - AdditionalParameters.Insert("EndOfUseDate", Object.Date); - AdditionalParameters.Insert("Partner", CurrentData.Partner); - DocumentsClient.AgreementEditTextChange(Object, Form, Item, Text, StandardProcessing, ArrayOfFilters, - AdditionalParameters); + Parameters = New Structure(); + Parameters.Insert("Partner", CurrentData.Partner); + + DocumentsClient.AgreementTextChange_TransactionTypeFilter(Object, Form, Item, Text, StandardProcessing, Object.TransactionType, Parameters); EndProcedure #EndRegion diff --git a/IRP/src/CommonModules/ModelClientServer_V2/Module.bsl b/IRP/src/CommonModules/ModelClientServer_V2/Module.bsl index c51afac19e..59944699cf 100644 --- a/IRP/src/CommonModules/ModelClientServer_V2/Module.bsl +++ b/IRP/src/CommonModules/ModelClientServer_V2/Module.bsl @@ -3341,10 +3341,16 @@ Function ClearByTransactionTypeBankPaymentExecute(Options) Export Or Options.TransactionType = Outgoing_ReturnToCustomerByPOS Then StrByType = " - |Partner, |Agreement, |Payee, |LegalNameContract"; + + PartnerType = ModelServer_V2.GetPartnerTypeByTransactionType(Options.TransactionType); + If (PartnerType = "Vendor" And CommonFunctionsServer.GetRefAttribute(Options.Partner, PartnerType)) + Or (PartnerType = "Customer" And CommonFunctionsServer.GetRefAttribute(Options.Partner, PartnerType)) Then + StrByType = StrByType + ", + |Partner"; + EndIf; If Options.TransactionType = Outgoing_ReturnToCustomerByPOS Then StrByType = StrByType + ", @@ -3360,10 +3366,15 @@ Function ClearByTransactionTypeBankPaymentExecute(Options) Export ElsIf Options.TransactionType = Outgoing_OtherPartner Then StrByType = " - |Partner, |Agreement, |Payee, - |LegalNameContract"; + |LegalNameContract"; + + PartnerType = ModelServer_V2.GetPartnerTypeByTransactionType(Options.TransactionType); + If PartnerType = "Other" And CommonFunctionsServer.GetRefAttribute(Options.Partner, PartnerType) Then + StrByType = StrByType + ", + |Partner"; + EndIf; ElsIf Options.TransactionType = Outgoing_RetailCustomerAdvance Then StrByType = " |RetailCustomer, @@ -3504,7 +3515,6 @@ Function ClearByTransactionTypeBankReceiptExecute(Options) Export Or Options.TransactionType = Incoming_PaymentFromCustomerByPOS Then StrByType = " - |Partner, |Agreement, |Payer, |LegalNameContract"; @@ -3528,12 +3538,23 @@ Function ClearByTransactionTypeBankReceiptExecute(Options) Export StrByType = StrByType + ", Project"; EndIf; + PartnerType = ModelServer_V2.GetPartnerTypeByTransactionType(Options.TransactionType); + If (PartnerType = "Vendor" And CommonFunctionsServer.GetRefAttribute(Options.Partner, PartnerType)) + Or (PartnerType = "Customer" And CommonFunctionsServer.GetRefAttribute(Options.Partner, PartnerType)) Then + StrByType = StrByType + ", + |Partner"; + EndIf; ElsIf Options.TransactionType = Incoming_OtherPartner Then StrByType = " - |Partner, |Agreement, |Payer, - |LegalNameContract"; + |LegalNameContract"; + + PartnerType = ModelServer_V2.GetPartnerTypeByTransactionType(Options.TransactionType); + If PartnerType = "Other" And CommonFunctionsServer.GetRefAttribute(Options.Partner, PartnerType) Then + StrByType = StrByType + ", + |Partner"; + EndIf; ElsIf Options.TransactionType = Incoming_TransferFromPOS Then StrByType = " |POSAccount, @@ -3642,17 +3663,28 @@ Function ClearByTransactionTypeCashPaymentExecute(Options) Export |RetailCustomer"; ElsIf Options.TransactionType = Outgoing_PaymentToVendor Or Options.TransactionType = Outgoing_ReturnToCustomer Then StrByType = " - |Partner, |Agreement, |Payee, |LegalNameContract, |Project"; + + PartnerType = ModelServer_V2.GetPartnerTypeByTransactionType(Options.TransactionType); + If (PartnerType = "Vendor" And CommonFunctionsServer.GetRefAttribute(Options.Partner, PartnerType)) + Or (PartnerType = "Customer" And CommonFunctionsServer.GetRefAttribute(Options.Partner, PartnerType)) Then + StrByType = StrByType + ", + |Partner"; + EndIf; ElsIf Options.TransactionType = Outgoing_OtherPartner Then StrByType = " - |Partner, |Agreement, |Payee, |LegalNameContract"; + + PartnerType = ModelServer_V2.GetPartnerTypeByTransactionType(Options.TransactionType); + If PartnerType = "Other" And CommonFunctionsServer.GetRefAttribute(Options.Partner, PartnerType) Then + StrByType = StrByType + ", + |Partner"; + EndIf; ElsIf Options.TransactionType = Outgoing_SalaryPayment Then StrByType = " |Employee, @@ -3739,17 +3771,28 @@ Function ClearByTransactionTypeCashReceiptExecute(Options) Export |AmountExchange"; ElsIf Options.TransactionType = Incoming_PaymentFromCustomer Or Options.TransactionType = Incoming_ReturnFromVendor Then StrByType = " - |Partner, |Agreement, |Payer, |LegalNameContract, |Project"; + + PartnerType = ModelServer_V2.GetPartnerTypeByTransactionType(Options.TransactionType); + If (PartnerType = "Vendor" And CommonFunctionsServer.GetRefAttribute(Options.Partner, PartnerType)) + Or (PartnerType = "Customer" And CommonFunctionsServer.GetRefAttribute(Options.Partner, PartnerType)) Then + StrByType = StrByType + ", + |Partner"; + EndIf; ElsIf Options.TransactionType = Incoming_OtherPartner Then StrByType = " - |Partner, |Agreement, |Payer, - |LegalNameContract"; + |LegalNameContract"; + + PartnerType = ModelServer_V2.GetPartnerTypeByTransactionType(Options.TransactionType); + If PartnerType = "Other" And CommonFunctionsServer.GetRefAttribute(Options.Partner, PartnerType) Then + StrByType = StrByType + ", + |Partner"; + EndIf; ElsIf Options.TransactionType = Incoming_RetailCustomerAdvance Then StrByType = " |RetailCustomer"; diff --git a/IRP/src/CommonModules/ModelServer_V2/Module.bsl b/IRP/src/CommonModules/ModelServer_V2/Module.bsl index 2a6d9650eb..90fb479d01 100644 --- a/IRP/src/CommonModules/ModelServer_V2/Module.bsl +++ b/IRP/src/CommonModules/ModelServer_V2/Module.bsl @@ -344,6 +344,18 @@ Function GetPartnerTypeByTransactionType(TransactionType) Export Map.Insert(Enums.RetailGoodsReceiptTransactionTypes.CourierDelivery , "Vendor"); Map.Insert(Enums.RetailShipmentConfirmationTransactionTypes.CourierDelivery , "Vendor"); + Map.Insert(Enums.OutgoingPaymentTransactionTypes.PaymentToVendor , "Vendor"); + Map.Insert(Enums.OutgoingPaymentTransactionTypes.ReturnToCustomer , "Customer"); + Map.Insert(Enums.OutgoingPaymentTransactionTypes.ReturnToCustomerByPOS , "Customer"); + Map.Insert(Enums.OutgoingPaymentTransactionTypes.OtherPartner , "Other"); + Map.Insert(Enums.OutgoingPaymentTransactionTypes.OtherExpense , "Other"); + + Map.Insert(Enums.IncomingPaymentTransactionType.ReturnFromVendor , "Vendor"); + Map.Insert(Enums.IncomingPaymentTransactionType.PaymentFromCustomer , "Customer"); + Map.Insert(Enums.IncomingPaymentTransactionType.PaymentFromCustomerByPOS , "Customer"); + Map.Insert(Enums.IncomingPaymentTransactionType.OtherPartner , "Other"); + Map.Insert(Enums.IncomingPaymentTransactionType.OtherIncome , "Other"); + Return Map.Get(TransactionType); EndFunction @@ -359,8 +371,10 @@ Function GetAgreementTypeByTransactionType(TransactionType) Export Return Enums.AgreementTypes.TradeAgent; ElsIf PartnerType = "RetailCustomer" Then Return Enums.AgreementTypes.EmptyRef(); + ElsIf PartnerType = "Other" Then + Return Enums.AgreementTypes.Other; Else - Raise StrTemplate("Unknown AgreementType by TransactionType [%1]", TransactionType); + Return Enums.AgreementTypes.EmptyRef(); EndIf; EndFunction diff --git a/IRP/src/Documents/BankPayment/Forms/DocumentForm/Form.form b/IRP/src/Documents/BankPayment/Forms/DocumentForm/Form.form index 2a9bfd6716..124cf126dc 100644 --- a/IRP/src/Documents/BankPayment/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/BankPayment/Forms/DocumentForm/Form.form @@ -812,7 +812,7 @@ UsualGroup - HorizontalIfPossible + AlwaysHorizontal true true Auto diff --git a/features/External/ImportData.feature b/features/External/ImportData.feature index 28523a5216..88ff22fa81 100644 --- a/features/External/ImportData.feature +++ b/features/External/ImportData.feature @@ -3556,8 +3556,10 @@ Scenario: Create information register UserSettings records (for PhysicalCountByL Scenario: Create information register Agreements records (NDB, Second Company) And I check or create catalog "Agreements" objects: - | 'Ref' | 'DeletionMark' | 'Code' | 'Number' | 'Date' | 'PartnerSegment' | 'Partner' | 'Company' | 'PriceType' | 'ItemSegment' | 'StartUsing' | 'EndOfUse' | 'ManagerSegment' | 'PriceIncludeTax' | 'DaysBeforeDelivery' | 'Store' | 'Type' | 'LegalName' | 'CurrencyMovementType' | 'ApArPostingDetail' | 'StandardAgreement' | 'Kind' | 'UseCreditLimit' | 'CreditLimitAmount' | 'PaymentTerm' | 'TradeAgentFeeType' | 'TradeAgentFeePercent' | 'TradeAgentFeeItem' | 'TradeAgentFeeItemKey' | 'TradeAgentFeeProfitLossCenter' | 'TradeAgentFeeExpenseRevenueType' | 'RecordPurchasePrices' | 'Account' | 'UseOrdersForSettlements' | 'Author' | 'Description_en' | 'Description_hash' | 'Description_ru' | 'Description_tr' | 'LocalFullDescription' | 'ForeignFullDescription' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | 'NotActive' | - | 'e1cib/data/Catalog.Agreements?ref=b7bf8c16981f994a11ef111ea2bd3db1' | 'False' | 132 | '' | '01.01.0001 00:00:00' | '' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf134a6a475a9' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf128cde918b4' | 'e1cib/data/Catalog.PriceTypes?refName=ManualPriceType' | '' | '01.01.0001 00:00:00' | '01.01.0001 00:00:00' | '' | 'False' | | '' | 'Enum.AgreementTypes.Customer' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced12eaf13c5c2df439' | 'e1cib/data/ChartOfCharacteristicTypes.CurrencyMovementType?ref=aa78120ed92fbced11eaf113ba6c185f' | 'Enum.ApArPostingDetail.ByAgreements' | '' | 'Enum.AgreementKinds.Regular' | 'False' | | '' | '' | | '' | '' | '' | '' | 'False' | '' | 'False' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'Partner term Second Company' | '' | '' | 'Turkish lira' | '' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '13.05.2024 14:48:25' | '13.05.2024 14:49:03' | 'False' | + | 'Ref' | 'DeletionMark' | 'Code' | 'Number' | 'Date' | 'PartnerSegment' | 'Partner' | 'Company' | 'PriceType' | 'ItemSegment' | 'StartUsing' | 'EndOfUse' | 'ManagerSegment' | 'PriceIncludeTax' | 'DaysBeforeDelivery' | 'Store' | 'Type' | 'LegalName' | 'CurrencyMovementType' | 'ApArPostingDetail' | 'StandardAgreement' | 'Kind' | 'UseCreditLimit' | 'CreditLimitAmount' | 'PaymentTerm' | 'TradeAgentFeeType' | 'TradeAgentFeePercent' | 'TradeAgentFeeItem' | 'TradeAgentFeeItemKey' | 'TradeAgentFeeProfitLossCenter' | 'TradeAgentFeeExpenseRevenueType' | 'RecordPurchasePrices' | 'Account' | 'UseOrdersForSettlements' | 'Author' | 'Description_en' | 'Description_hash' | 'Description_ru' | 'Description_tr' | 'LocalFullDescription' | 'ForeignFullDescription' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | 'NotActive' | + | 'e1cib/data/Catalog.Agreements?ref=b7bf8c16981f994a11ef111ea2bd3db1' | 'False' | 132 | '' | '01.01.0001 00:00:00' | '' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf134a6a475a9' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf128cde918b4' | 'e1cib/data/Catalog.PriceTypes?refName=ManualPriceType' | '' | '01.01.0001 00:00:00' | '01.01.0001 00:00:00' | '' | 'False' | | '' | 'Enum.AgreementTypes.Customer' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced12eaf13c5c2df439' | 'e1cib/data/ChartOfCharacteristicTypes.CurrencyMovementType?ref=aa78120ed92fbced11eaf113ba6c185f' | 'Enum.ApArPostingDetail.ByAgreements' | '' | 'Enum.AgreementKinds.Regular' | 'False' | | '' | '' | | '' | '' | '' | '' | 'False' | '' | 'False' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'Partner term Second Company' | '' | '' | 'Turkish lira' | '' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '21.05.2024 03:51:35' | '21.05.2024 16:16:26' | 'False' | + | 'e1cib/data/Catalog.Agreements?ref=b7bf8c16981f994a11ef175d0a567ca7' | 'False' | 133 | '' | '01.01.0001 00:00:00' | '' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf134a6a475a9' | '' | '' | '' | '01.01.0001 00:00:00' | '01.01.0001 00:00:00' | '' | 'False' | | '' | 'Enum.AgreementTypes.Other' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced12eaf13c5c2df439' | 'e1cib/data/ChartOfCharacteristicTypes.CurrencyMovementType?ref=aa78120ed92fbced11eaf113ba6c185f' | 'Enum.ApArPostingDetail.ByAgreements' | '' | 'Enum.AgreementKinds.Regular' | 'False' | | '' | '' | | '' | '' | '' | '' | 'False' | '' | 'False' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'NDB, Other' | '' | '' | 'Turkish lira' | '' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '21.05.2024 14:49:27' | '21.05.2024 16:01:12' | 'False' | + | 'e1cib/data/Catalog.Agreements?ref=b7bf8c16981f994a11ef175d0a567ca8' | 'False' | 134 | '' | '01.01.0001 00:00:00' | '' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf134a6a475a9' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf128cde918b4' | 'e1cib/data/Catalog.PriceTypes?refName=ManualPriceType' | '' | '01.01.0001 00:00:00' | '01.01.0001 00:00:00' | '' | 'False' | | '' | 'Enum.AgreementTypes.Vendor' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced12eaf13c5c2df439' | 'e1cib/data/ChartOfCharacteristicTypes.CurrencyMovementType?ref=aa78120ed92fbced11eaf113ba6c185f' | 'Enum.ApArPostingDetail.ByAgreements' | '' | 'Enum.AgreementKinds.Regular' | 'False' | | '' | '' | | '' | '' | '' | '' | 'False' | '' | 'False' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'Partner term Second Company Vendor' | '' | '' | 'Turkish lira' | '' | '' | '' | '' | '21.05.2024 16:21:09' | '01.01.0001 00:00:00' | 'False' | Scenario: Create catalog LegalNameContracts objects (Ferron, filters) diff --git a/features/External/Podgotovka.feature b/features/External/Podgotovka.feature index e9b2d34f65..b749e20f7e 100644 --- a/features/External/Podgotovka.feature +++ b/features/External/Podgotovka.feature @@ -2044,4 +2044,105 @@ Scenario: set True value to the constant Use source of origin | 'Use source of origin' | And I set "Use" checkbox in "FunctionalOptions" table And I click "Save" button - And I close current window \ No newline at end of file + And I close current window + + +Scenario: check filter by transaction type in CR/BR + And I click Select button of "Company" field + And I go to line in "List" table + | 'Description' | + | 'Main Company' | + And I select current line in "List" table + And I select "Payment from customer" exact value from the drop-down list named "TransactionType" + * Check filter for partner term (transaction type) + And in the table "PaymentList" I click the button named "PaymentListAdd" + And I select "ndb" by string from the drop-down list named "PaymentListPartner" in "PaymentList" table + And "PaymentList" table became equal + | 'Partner' | 'Payer' | 'Partner term' | + | 'NDB' | 'Company NDB' | 'Partner term NDB' | + And I select current line in "PaymentList" table + And I click choice button of the attribute named "PaymentListAgreement" in "PaymentList" table + And I remove checkbox named "FilterCompanyUse" + And "List" table became equal + | 'Description' | 'Type' | + | 'Partner term NDB' | 'Customer' | + | 'Partner term Second Company' | 'Customer' | + And I close current window + * Select transaction type Return from vendor + And I finish line editing in "PaymentList" table + And I select "Return from vendor" exact value from the drop-down list named "TransactionType" + And I click the button named "Button0" + And "PaymentList" table became equal + | 'Partner' | 'Payer' | 'Partner term' | + | 'NDB' | 'Company NDB' | 'Partner term vendor NDB' | + * Add second line and check partner term + And in the table "PaymentList" I click the button named "PaymentListAdd" + And I select "ndb" by string from the drop-down list named "PaymentListPartner" in "PaymentList" table + And "PaymentList" table became equal + | 'Partner' | 'Payer' | 'Partner term' | + | 'NDB' | 'Company NDB' | 'Partner term vendor NDB' | + | 'NDB' | 'Company NDB' | 'Partner term vendor NDB' | + * Select transaction type Other partner + And I select "Other partner" exact value from the drop-down list named "TransactionType" + And I click the button named "Button0" + And "PaymentList" table became equal + | 'Partner' | 'Payer' | 'Partner term' | + | 'NDB' | 'Company NDB' | 'NDB, Other' | + | 'NDB' | 'Company NDB' | 'NDB, Other' | + And in the table "PaymentList" I click the button named "PaymentListAdd" + And I select "ndb" by string from the drop-down list named "PaymentListPartner" in "PaymentList" table + And "PaymentList" table became equal + | 'Partner' | 'Payer' | 'Partner term' | + | 'NDB' | 'Company NDB' | 'NDB, Other' | + | 'NDB' | 'Company NDB' | 'NDB, Other' | + | 'NDB' | 'Company NDB' | 'NDB, Other' | + +Scenario: check filter by transaction type in CP/BP + And I click Select button of "Company" field + And I go to line in "List" table + | 'Description' | + | 'Main Company' | + And I select current line in "List" table + And I select "Payment to the vendor" exact value from the drop-down list named "TransactionType" + * Check filter for partner term (transaction type) + And in the table "PaymentList" I click the button named "PaymentListAdd" + And I select "ndb" by string from the drop-down list named "PaymentListPartner" in "PaymentList" table + And "PaymentList" table became equal + | 'Partner' | 'Payee' | 'Partner term' | + | 'NDB' | 'Company NDB' | 'Partner term vendor NDB' | + And I select current line in "PaymentList" table + And I click choice button of the attribute named "PaymentListAgreement" in "PaymentList" table + And I remove checkbox named "FilterCompanyUse" + And "List" table became equal + | 'Description' | 'Type' | + | 'Partner term Second Company Vendor' | 'Vendor' | + | 'Partner term vendor NDB' | 'Vendor' | + And I close current window + * Select transaction type Return to customer + And I finish line editing in "PaymentList" table + And I select "Return to customer" exact value from the drop-down list named "TransactionType" + And I click the button named "Button0" + And "PaymentList" table became equal + | 'Partner' | 'Payee' | 'Partner term' | + | 'NDB' | 'Company NDB' | 'Partner term NDB' | + * Add second line and check partner term + And in the table "PaymentList" I click the button named "PaymentListAdd" + And I select "ndb" by string from the drop-down list named "PaymentListPartner" in "PaymentList" table + And "PaymentList" table became equal + | 'Partner' | 'Payee' | 'Partner term' | + | 'NDB' | 'Company NDB' | 'Partner term NDB' | + | 'NDB' | 'Company NDB' | 'Partner term NDB' | + * Select transaction type Other partner + And I select "Other partner" exact value from the drop-down list named "TransactionType" + And I click the button named "Button0" + And "PaymentList" table became equal + | 'Partner' | 'Payee' | 'Partner term' | + | 'NDB' | 'Company NDB' | 'NDB, Other' | + | 'NDB' | 'Company NDB' | 'NDB, Other' | + And in the table "PaymentList" I click the button named "PaymentListAdd" + And I select "ndb" by string from the drop-down list named "PaymentListPartner" in "PaymentList" table + And "PaymentList" table became equal + | 'Partner' | 'Payee' | 'Partner term' | + | 'NDB' | 'Company NDB' | 'NDB, Other' | + | 'NDB' | 'Company NDB' | 'NDB, Other' | + | 'NDB' | 'Company NDB' | 'NDB, Other' | \ No newline at end of file diff --git a/features/Internal/_0500 Cash management/_0510PostingCashPayment.feature b/features/Internal/_0500 Cash management/_0510PostingCashPayment.feature index 9ef43a32de..438c80f557 100644 --- a/features/Internal/_0500 Cash management/_0510PostingCashPayment.feature +++ b/features/Internal/_0500 Cash management/_0510PostingCashPayment.feature @@ -537,7 +537,7 @@ Scenario: _051008 check basis document filter in Cash payment Given I open hyperlink "e1cib/list/Document.CashPayment" And I click the button named "FormCreate" * Filling in the details of the document - And I select "Payment to the vendor" exact value from "Transaction type" drop-down list + And I select "Return to customer" exact value from "Transaction type" drop-down list And I click Select button of "Company" field And I click the button named "FormChoose" And I click Select button of "Cash account" field @@ -547,7 +547,7 @@ Scenario: _051008 check basis document filter in Cash payment And I select current line in "List" table Then the form attribute named "CashAccount" became equal to "Cash desk №1" Then the form attribute named "Company" became equal to "Main Company" - Then the form attribute named "TransactionType" became equal to "Payment to the vendor" + Then the form attribute named "TransactionType" became equal to "Return to customer" * Filling in partner and legal name And in the table "PaymentList" I click the button named "PaymentListAdd" And I click choice button of "Partner" attribute in "PaymentList" table diff --git a/features/Internal/_0910 Forms/_1541InputBySearchInLine.feature b/features/Internal/_0910 Forms/_1541InputBySearchInLine.feature index 3249a2de99..8937a25cb2 100644 --- a/features/Internal/_0910 Forms/_1541InputBySearchInLine.feature +++ b/features/Internal/_0910 Forms/_1541InputBySearchInLine.feature @@ -149,7 +149,8 @@ Scenario: _0154052 check item and item key input by search in line in a document | 'Item' | 'Item key' | | 'Boots' | '36/18SD' | And in the table "ItemList" I click the button named "ItemListAdd" - And I input "J22001" text in "Item" field of "ItemList" table + And I input "J22001" text in "Item" field of "ItemList" table + And Delay 2 And drop-down list "Item" is equal to: | (J22001) Jacket J22001 | And I select "(J22001) Jacket J22001" exact value from "Item" drop-down list in "ItemList" table @@ -1011,7 +1012,7 @@ Scenario: _0154083 check company, Cash accounts, transaction type, currency, par And I select "co" from "Payee" drop-down list by string in "PaymentList" table * Partner term input by search in line And I activate "Partner term" field in "PaymentList" table - And I select "tr" from "Partner term" drop-down list by string in "PaymentList" table + And I select "usd" from "Partner term" drop-down list by string in "PaymentList" table * Check entered values Then the form attribute named "Company" became equal to "Main Company" Then the form attribute named "CashAccount" became equal to "Cash desk №3" @@ -1019,8 +1020,8 @@ Scenario: _0154083 check company, Cash accounts, transaction type, currency, par Then the form attribute named "TransactionType" became equal to "Payment to the vendor" Then the form attribute named "Currency" became equal to "TRY" And "PaymentList" table contains lines - | 'Partner' | 'Payee' | 'Partner term' | - | 'Ferron BP' | 'Company Ferron BP' | 'Basic Partner terms, TRY' | + | 'Partner' | 'Payee' | 'Partner term' | + | 'Ferron BP' | 'Company Ferron BP' | 'Vendor Ferron, USD' | And I close all client application windows @@ -1045,7 +1046,7 @@ Scenario: _0154084 check company, Cash/Bank accounts, transaction type, currency And I select "co" from "Payee" drop-down list by string in "PaymentList" table * Partner term input by search in line And I activate "Partner term" field in "PaymentList" table - And I select "tr" from "Partner term" drop-down list by string in "PaymentList" table + And I select "usd" from "Partner term" drop-down list by string in "PaymentList" table * Check entered values Then the form attribute named "Company" became equal to "Main Company" Then the form attribute named "Account" became equal to "Bank account, USD" @@ -1053,8 +1054,8 @@ Scenario: _0154084 check company, Cash/Bank accounts, transaction type, currency Then the form attribute named "TransactionType" became equal to "Payment to the vendor" Then the form attribute named "Currency" became equal to "USD" And "PaymentList" table contains lines - | 'Partner' | 'Payee' | 'Partner term' | - | 'Ferron BP' | 'Company Ferron BP' | 'Basic Partner terms, TRY' | + | 'Partner' | 'Payee' | 'Partner term' | + | 'Ferron BP' | 'Company Ferron BP' | 'Vendor Ferron, USD' | And I close all client application windows Scenario: _0154085 check company, Cash/Bank accounts, transaction type, currency, partner, payee, input by search in line in a Bank receipt (in english) @@ -1790,10 +1791,10 @@ Scenario: _01540114 check item input by search in line by code in a document Ban | 'Payee' | | 'Company Ferron BP' | * Partner term - And I select "46" from "Partner term" drop-down list by string in "PaymentList" table + And I select "49" from "Partner term" drop-down list by string in "PaymentList" table And "PaymentList" table contains lines - | 'Partner term' | - | 'Basic Partner terms, without VAT' | + | 'Partner term' | + | 'Vendor Ferron, USD' | * Financial movement type And I select "10" from "Financial movement type" drop-down list by string in "PaymentList" table And "PaymentList" table contains lines diff --git a/features/Internal/_0912 Filling documents/_2021Fillingdocument.feature b/features/Internal/_0912 Filling documents/_2021Fillingdocument.feature index 2e83e7fd85..a38f1eb5c8 100644 --- a/features/Internal/_0912 Filling documents/_2021Fillingdocument.feature +++ b/features/Internal/_0912 Filling documents/_2021Fillingdocument.feature @@ -104,6 +104,13 @@ Scenario: _0154100 preparation ( filling documents) And I select current line in "List" table And I click "Save and close" button And I close all client application windows + Given I open hyperlink "e1cib/list/Catalog.Partners" + And I go to line in "List" table + | 'Description' | + | 'NDB' | + And I select current line in "List" table + And I set checkbox named "Other" + And I click "Save and close" button * Preparation: creating a vendor partner term for Avira Vendor Given I open hyperlink "e1cib/list/Catalog.Agreements" And I click the button named "FormCreate" @@ -2837,7 +2844,7 @@ Scenario: _0154111 check filling in and refilling Cash payment (transaction type | 'Partner' | 'Partner term' | 'Payee' | | 'Veritas' | 'Posting by Standard Partner term (Veritas)' | 'Company Veritas' | And in the table "PaymentList" I click "Delete" button - * Check the display to select only available partner terms + * Check the display to select only available partner terms (for vendor) And in the table "PaymentList" I click the button named "PaymentListAdd" And I click Clear button of the attribute named "PaymentListPayee" in "PaymentList" And I click choice button of "Partner" attribute in "PaymentList" table @@ -2853,12 +2860,10 @@ Scenario: _0154111 check filling in and refilling Cash payment (transaction type And I click choice button of "Partner term" attribute in "PaymentList" table And "List" table contains lines | 'Description' | - | 'Basic Partner terms, TRY' | - | 'Basic Partner terms, without VAT' | | 'Vendor Ferron, TRY' | | 'Vendor Ferron, USD' | | 'Vendor Ferron, EUR' | - | 'Ferron, USD' | + Then the number of "List" table lines is "равно" "3" And I go to line in "List" table | 'Description' | | 'Vendor Ferron, TRY' | @@ -3131,12 +3136,10 @@ Scenario: _0154113 check filling in and refilling Bank payment (transaction type And I click choice button of "Partner term" attribute in "PaymentList" table And "List" table contains lines | 'Description' | - | 'Basic Partner terms, TRY' | - | 'Basic Partner terms, without VAT' | | 'Vendor Ferron, TRY' | | 'Vendor Ferron, USD' | | 'Vendor Ferron, EUR' | - | 'Ferron, USD' | + Then the number of "List" table lines is "равно" "3" And I go to line in "List" table | 'Description' | | 'Vendor Ferron, TRY' | @@ -4125,8 +4128,8 @@ Scenario: _0154118 check the details cleaning on the form Cash receipt Then "1C:Enterprise" window is opened And I click "OK" button And "PaymentList" table contains lines - | '#' | 'Partner' | 'Partner term' | 'Total amount' | 'Payer' | 'Basis document' | 'Planning transaction basis' | - | '1' | 'Nicoletta' | '' | '' | '' | '' | '' | + | '#' | 'Partner' | 'Partner term' | 'Total amount' | 'Payer' | 'Basis document' | 'Planning transaction basis' | + | '1' | 'Nicoletta' | 'Posting by Standard Partner term Customer' | '' | '' | '' | '' | * Check clearing fields 'Partner' when re-selecting the type of operation to Cash transfer order And I select "Cash transfer order" exact value from "Transaction type" drop-down list Then "1C:Enterprise" window is opened @@ -4160,6 +4163,7 @@ Scenario: _0154119 check the details cleaning on the form Cash payment when re-s | Code | | TRY | And I select current line in "List" table + And I select "Return to customer" exact value from "Transaction type" drop-down list * Fillin in Partner, Payer and Partner term And in the table "PaymentList" I click the button named "PaymentListAdd" And I activate "Partner" field in "PaymentList" table @@ -4225,8 +4229,8 @@ Scenario: _0154120 check the details cleaning on the form Bank receipt when re-s | Nicoletta | And I select current line in "List" table And "PaymentList" table contains lines - | 'Partner' | 'Partner term' | 'Payer' | - | 'Nicoletta' | 'Posting by Standard Partner term Customer' | 'Company Nicoletta' | + | 'Partner' | 'Partner term' | 'Payer' | + | 'Nicoletta' | 'Posting by Standard Partner term Customer' | 'Company Nicoletta' | * Check clearing fields 'Partner term' and 'Payer' when re-selecting the type of operation to Currency exchange And I select "Currency exchange" exact value from "Transaction type" drop-down list Then "1C:Enterprise" window is opened @@ -4276,6 +4280,7 @@ Scenario: _0154121 check the details cleaning on the form Bank payment when re-s | Code | | TRY | And I select current line in "List" table + And I select "Return to customer" exact value from "Transaction type" drop-down list * Fillin in Partner, Payer and Partner term And in the table "PaymentList" I click the button named "PaymentListAdd" And I activate "Partner" field in "PaymentList" table @@ -4285,23 +4290,23 @@ Scenario: _0154121 check the details cleaning on the form Bank payment when re-s | Nicoletta | And I select current line in "List" table And "PaymentList" table contains lines - | 'Partner' | 'Partner term' | 'Payee' | - | 'Nicoletta' | 'Posting by Standard Partner term Customer' | 'Company Nicoletta' | + | 'Partner' | 'Partner term' | 'Payee' | + | 'Nicoletta' | 'Posting by Standard Partner term Customer' | 'Company Nicoletta' | * Check clearing fields 'Partner term' and 'Payee' when re-selecting the type of operation to Currency exchange And I select "Currency exchange" exact value from "Transaction type" drop-down list Then "1C:Enterprise" window is opened And I click "OK" button And "PaymentList" table contains lines - | '#' | 'Total amount' | 'Planning transaction basis' | - | '1' | '' | '' | + | '#' | 'Total amount' | 'Planning transaction basis' | + | '1' | '' | '' | * Check filling in Transit account from Accountant Then the form attribute named "TransitAccount" became equal to "Transit Main" And I select "Payment to the vendor" exact value from "Transaction type" drop-down list Then "1C:Enterprise" window is opened And I click "OK" button And "PaymentList" table contains lines - | '#' | 'Partner' | 'Partner term' | 'Total amount' | 'Payee' | 'Basis document' | 'Planning transaction basis' | - | '1' | '' | '' | '' | '' | '' | '' | + | '#' | 'Partner' | 'Partner term' | 'Total amount' | 'Payee' | 'Basis document' | 'Planning transaction basis' | + | '1' | '' | '' | '' | '' | '' | '' | Then the form attribute named "TransitAccount" became equal to "" * Check clearing fields 'Partner' when re-selecting the type of operation to Cash transfer order And I select "Cash transfer order" exact value from "Transaction type" drop-down list @@ -4311,8 +4316,8 @@ Scenario: _0154121 check the details cleaning on the form Bank payment when re-s Then "1C:Enterprise" window is opened And I click "OK" button And "PaymentList" table contains lines - | '#' | 'Partner' | 'Partner term' | 'Total amount' | 'Payee' | 'Basis document' | 'Planning transaction basis' | - | '1' | '' | '' | '' | '' | '' | '' | + | '#' | 'Partner' | 'Partner term' | 'Total amount' | 'Payee' | 'Basis document' | 'Planning transaction basis' | + | '1' | '' | '' | '' | '' | '' | '' | And I close all client application windows @@ -5001,45 +5006,50 @@ Scenario: _0154131 check currency form in Bank Receipt * Basic recalculation at the rate And in the table "PaymentList" I click "Edit currencies" button And "CurrenciesTable" table became equal - | 'Movement type' | 'Type' | 'To' | 'From' | 'Multiplicity' | 'Rate' | 'Amount' | - | 'Local currency' | 'Legal' | 'TRY' | 'TRY' | '1' | '1' | '200' | - | 'Reporting currency' | 'Reporting' | 'USD' | 'TRY' | '1' | '0,171200' | '34,24' | + | 'Movement type' | 'Type' | 'To' | 'From' | 'Multiplicity' | 'Rate' | 'Amount' | + | 'Reporting currency' | 'Reporting' | 'USD' | 'TRY' | '1' | '0,171200' | '34,24' | + | 'Local currency' | 'Legal' | 'TRY' | 'TRY' | '1' | '1' | '200' | + | 'TRY' | 'Partner term' | 'TRY' | 'TRY' | '1' | '1' | '200' | And I close current window * Recalculation of Rate presentation when changing Amount And in the table "PaymentList" I click "Edit currencies" button And I input "35,00" text in "Amount" field of "CurrenciesTable" table And I finish line editing in "CurrenciesTable" table And "CurrenciesTable" table became equal - | 'Movement type' | 'Type' | 'To' | 'From' | 'Multiplicity' | 'Rate' | 'Amount' | - | 'Local currency' | 'Legal' | 'TRY' | 'TRY' | '1' | '1' | '200' | - | 'Reporting currency' | 'Reporting' | 'USD' | 'TRY' | '1' | '0,175000' | '35,00' | + | 'Movement type' | 'Type' | 'To' | 'From' | 'Multiplicity' | 'Rate' | 'Amount' | + | 'Reporting currency' | 'Reporting' | 'USD' | 'TRY' | '1' | '0,175000' | '35,00' | + | 'Local currency' | 'Legal' | 'TRY' | 'TRY' | '1' | '1' | '200' | + | 'TRY' | 'Partner term' | 'TRY' | 'TRY' | '1' | '1' | '200' | And I close current window * Recount Amount when changing Multiplicity And in the table "PaymentList" I click "Edit currencies" button And I input "2" text in "Multiplicity" field of "CurrenciesTable" table And I finish line editing in "CurrenciesTable" table And "CurrenciesTable" table became equal - | 'Movement type' | 'Type' | 'To' | 'From' | 'Multiplicity' | 'Rate' | 'Amount' | - | 'Local currency' | 'Legal' | 'TRY' | 'TRY' | '1' | '1' | '200' | - | 'Reporting currency' | 'Reporting' | 'USD' | 'TRY' | '2' | '0,171200' | '17,12' | + | 'Movement type' | 'Type' | 'To' | 'From' | 'Multiplicity' | 'Rate' | 'Amount' | + | 'Reporting currency' | 'Reporting' | 'USD' | 'TRY' | '2' | '0,171200' | '17,12' | + | 'Local currency' | 'Legal' | 'TRY' | 'TRY' | '1' | '1' | '200' | + | 'TRY' | 'Partner term' | 'TRY' | 'TRY' | '1' | '1' | '200' | And I close current window * Recount Amount when changing Multiplicity And in the table "PaymentList" I click "Edit currencies" button And I input "0,1667" text in "Rate" field of "CurrenciesTable" table And I finish line editing in "CurrenciesTable" table And "CurrenciesTable" table became equal - | 'Movement type' | 'Type' | 'To' | 'From' | 'Multiplicity' | 'Rate' | 'Amount' | - | 'Local currency' | 'Legal' | 'TRY' | 'TRY' | '1' | '1' | '200' | - | 'Reporting currency' | 'Reporting' | 'USD' | 'TRY' | '1' | '0,166700' | '33,34' | + | 'Movement type' | 'Type' | 'To' | 'From' | 'Multiplicity' | 'Rate' | 'Amount' | + | 'Reporting currency' | 'Reporting' | 'USD' | 'TRY' | '1' | '0,166700' | '33,34' | + | 'Local currency' | 'Legal' | 'TRY' | 'TRY' | '1' | '1' | '200' | + | 'TRY' | 'Partner term' | 'TRY' | 'TRY' | '1' | '1' | '200' | And I close current window * Recount Amount when changing payment amount And I input "250,00" text in the field named "PaymentListTotalAmount" of "PaymentList" table And I finish line editing in "PaymentList" table And in the table "PaymentList" I click "Edit currencies" button And "CurrenciesTable" table became equal - | 'Movement type' | 'Type' | 'To' | 'From' | 'Multiplicity' | 'Rate' | 'Amount' | - | 'Local currency' | 'Legal' | 'TRY' | 'TRY' | '1' | '1' | '250' | - | 'Reporting currency' | 'Reporting' | 'USD' | 'TRY' | '1' | '0,171200' | '42,80' | + | 'Movement type' | 'Type' | 'To' | 'From' | 'Multiplicity' | 'Rate' | 'Amount' | + | 'Reporting currency' | 'Reporting' | 'USD' | 'TRY' | '1' | '0,171200' | '42,80' | + | 'Local currency' | 'Legal' | 'TRY' | 'TRY' | '1' | '1' | '250' | + | 'TRY' | 'Partner term' | 'TRY' | 'TRY' | '1' | '1' | '250' | And I close current window * Check the standard currency rate when adding the next line And in the table "PaymentList" I click the button named "PaymentListAdd" @@ -5058,9 +5068,8 @@ Scenario: _0154131 check currency form in Bank Receipt And in the table "PaymentList" I click "Edit currencies" button And "CurrenciesTable" table became equal | 'Movement type' | 'Type' | 'To' | 'From' | 'Multiplicity' | 'Rate' | 'Amount' | - | 'Reporting currency' | 'Reporting' | 'USD' | 'TRY' | '1' | '0,171200' | '34,24' | | 'Local currency' | 'Legal' | 'TRY' | 'TRY' | '1' | '1' | '200' | - | 'TRY' | 'Partner term' | 'TRY' | 'TRY' | '1' | '1' | '200' | + | 'Reporting currency' | 'Reporting' | 'USD' | 'TRY' | '1' | '0,171200' | '34,24' | And I close current window * Recount when currency changes And I click Select button of "Account" field @@ -5072,7 +5081,6 @@ Scenario: _0154131 check currency form in Bank Receipt And "CurrenciesTable" table contains lines | 'Movement type' | 'Type' | 'To' | 'From' | 'Multiplicity' | 'Rate' | 'Amount' | | 'Local currency' | 'Legal' | 'TRY' | 'USD' | '1' | '5,627500' | '1 125,50' | - | 'TRY' | 'Partner term' | 'TRY' | 'USD' | '1' | '5,627500' | '1 125,50' | # * Reverse rate display check # Given double click at "reverse" picture # And I go to line in "PaymentList" table @@ -8825,9 +8833,74 @@ Scenario: _0154191 check filter by Company when select partner term Then the number of "List" table lines is "равно" 0 And I close all client application windows -Scenario: _0154192 check auto filling partner term in the CR (filter by Company) +Scenario: _0154192 check auto filling partner term in the CR (filter by transaction type) And I close all client application windows When Create information register Agreements records (NDB, Second Company) + * Open CR creation form + Given I open hyperlink "e1cib/list/Document.CashReceipt" + And I click the button named "FormCreate" + When check filter by transaction type in CR/BR + And I close all client application windows + +Scenario: _0154193 check auto filling partner term in the BR (filter by transaction type) + And I close all client application windows + * Open BR creation form + Given I open hyperlink "e1cib/list/Document.BankReceipt" + And I click the button named "FormCreate" + When check filter by transaction type in CR/BR + * Select transaction type Payment from customer by POS + And I select "Payment from customer by POS" exact value from the drop-down list named "TransactionType" + And I click the button named "Button0" + And "PaymentList" table became equal + | 'Partner' | 'Payer' | 'Partner term' | + | 'NDB' | 'Company NDB' | 'Partner term NDB' | + | 'NDB' | 'Company NDB' | 'Partner term NDB' | + | 'NDB' | 'Company NDB' | 'Partner term NDB' | + And I close all client application windows + +Scenario: _0154194 check auto filling partner term in the CP (filter by transaction type) + And I close all client application windows + * Open CR creation form + Given I open hyperlink "e1cib/list/Document.CashPayment" + And I click the button named "FormCreate" + When check filter by transaction type in CP/BP + And I close all client application windows + +Scenario: _0154195 check auto filling partner term in the BP (filter by transaction type) + And I close all client application windows + * Open CR creation form + Given I open hyperlink "e1cib/list/Document.BankPayment" + And I click the button named "FormCreate" + When check filter by transaction type in CP/BP + * Select transaction type Payment from customer by POS + And I select "Return to customer by POS" exact value from the drop-down list named "TransactionType" + And I click the button named "Button0" + And "PaymentList" table became equal + | 'Partner' | 'Payee' | 'Partner term' | + | 'NDB' | 'Company NDB' | 'Partner term NDB' | + | 'NDB' | 'Company NDB' | 'Partner term NDB' | + | 'NDB' | 'Company NDB' | 'Partner term NDB' | + And I close all client application windows + +Scenario: _0154196 check auto filling partner term in the BP (filter by transaction type) + And I close all client application windows + When Create information register Agreements records (NDB, Second Company) + * Open BR creation form + Given I open hyperlink "e1cib/list/Document.BankReceipt" + And I click the button named "FormCreate" + When check filter by transaction type in CR/BR + * Select transaction type Payment from customer by POS + And I select "Payment from customer by POS" exact value from the drop-down list named "TransactionType" + And I click the button named "Button0" + And "PaymentList" table became equal + | 'Partner' | 'Payer' | 'Partner term' | + | 'NDB' | 'Company NDB' | 'Partner term NDB' | + | 'NDB' | 'Company NDB' | 'Partner term NDB' | + | 'NDB' | 'Company NDB' | 'Partner term NDB' | + And I close all client application windows + +Scenario: _0154197 check auto filling partner term in the CR (filter by Company) + And I close all client application windows * Open CR creation form Given I open hyperlink "e1cib/list/Document.CashReceipt" And I click the button named "FormCreate" @@ -8844,7 +8917,7 @@ Scenario: _0154192 check auto filling partner term in the CR (filter by Company) | 'NDB' | 'Partner term Second Company' | And I close all client application windows -Scenario: _0154193 check auto filling partner term in the CP (filter by Company) +Scenario: _0154198 check auto filling partner term in the CP (filter by Company) And I close all client application windows * Open CP creation form Given I open hyperlink "e1cib/list/Document.CashPayment" @@ -8858,11 +8931,11 @@ Scenario: _0154193 check auto filling partner term in the CP (filter by Company) And in the table "PaymentList" I click the button named "PaymentListAdd" And I select "ndb" from "Partner" drop-down list by string in "PaymentList" table And "PaymentList" table contains lines - | 'Partner' | 'Partner term' | - | 'NDB' | 'Partner term Second Company' | + | 'Partner' | 'Partner term' | + | 'NDB' | 'Partner term Second Company Vendor' | And I close all client application windows -Scenario: _0154194 check auto filling partner term in the BP (filter by Company) +Scenario: _0154199 check auto filling partner term in the BP (filter by Company) And I close all client application windows * Open BP creation form Given I open hyperlink "e1cib/list/Document.BankPayment" @@ -8876,11 +8949,11 @@ Scenario: _0154194 check auto filling partner term in the BP (filter by Company) And in the table "PaymentList" I click the button named "PaymentListAdd" And I select "ndb" from "Partner" drop-down list by string in "PaymentList" table And "PaymentList" table contains lines - | 'Partner' | 'Partner term' | - | 'NDB' | 'Partner term Second Company' | + | 'Partner' | 'Partner term' | + | 'NDB' | 'Partner term Second Company Vendor' | And I close all client application windows -Scenario: _0154195 check auto filling partner term in the BR (filter by Company) +Scenario: _0154200 check auto filling partner term in the BR (filter by Company) And I close all client application windows * Open BR creation form Given I open hyperlink "e1cib/list/Document.BankReceipt" diff --git a/features/Internal/_0950 LinkedTransaction/_2050InvoiceMatchAndFillingReconcilationStatement - Copy.feature b/features/Internal/_0950 LinkedTransaction/_2050InvoiceMatchAndFillingReconcilationStatement - Copy.feature index a2342a7255..4f808d0544 100644 --- a/features/Internal/_0950 LinkedTransaction/_2050InvoiceMatchAndFillingReconcilationStatement - Copy.feature +++ b/features/Internal/_0950 LinkedTransaction/_2050InvoiceMatchAndFillingReconcilationStatement - Copy.feature @@ -140,7 +140,7 @@ Scenario: _2050001 preparation And I finish line editing in "PaymentList" table And I activate "Partner term" field in "PaymentList" table And I select current line in "PaymentList" table - And I select "Basic Partner terms, TRY" from "Partner term" drop-down list by string in "PaymentList" table + And I select "Vendor, TRY" from "Partner term" drop-down list by string in "PaymentList" table And I click the button named "FormPost" And I delete "$$BankPayment2050001$$" variable And I delete "$$NumberBankPayment2050001$$" variable @@ -276,7 +276,7 @@ Scenario: _2050001 preparation And I finish line editing in "PaymentList" table And I activate "Partner term" field in "PaymentList" table And I select current line in "PaymentList" table - And I select "Basic Partner terms, TRY" from "Partner term" drop-down list by string in "PaymentList" table + And I select "Vendor, TRY" from "Partner term" drop-down list by string in "PaymentList" table And I click the button named "FormPost" And I delete "$$CashPayment2050001$$" variable And I delete "$$NumberCashPayment2050001$$" variable