From 845bfc80aa4091683ca2069a2d4b9993e7e224c6 Mon Sep 17 00:00:00 2001 From: DitriXNew Date: Wed, 26 Jun 2024 14:22:31 +0300 Subject: [PATCH] Translate --- .../ManagerModule.bsl | 3 + .../ManagerModule.bsl | 26 +- .../R1040B_TaxesOutgoing.mdo | 110 +- .../ManagerModule.bsl | 3 + .../ManagerModule.bsl | 3 + .../R2040B_TaxesIncoming.mdo | 110 +- .../R5020B_PartnersBalance/ManagerModule.bsl | 71 +- .../R5041B_TaxesPayable/ManagerModule.bsl | 23 - .../R5041B_TaxesPayable/RecordSetModule.bsl | 0 .../R9541T_VacationUsage/ManagerModule.bsl | 50 + .../R9541T_VacationUsage.mdo} | 51 +- .../T1040T_AccountingAmounts.mdo | 86 + .../AccountingOperations.mdo | 112 +- .../AddAttributeAndPropertySets.mdo | 7 + .../ManagerModule.bsl | 7 + .../Forms/ItemForm/Form.form | 1 - .../ChequeBonds/Forms/PickUpForm/Form.form | 48 + .../Catalogs/Files/Forms/ItemForm/Form.form | 174 + .../Catalogs/Files/Forms/ItemForm/Module.bsl | 35 +- .../ItemKeys/Forms/ItemForm/Form.form | 287 +- .../ItemKeys/Forms/ItemForm/Module.bsl | 14 + .../Catalogs/Items/Forms/ItemForm/Module.bsl | 1 - .../Catalogs/LedgerTypes/ManagerModule.bsl | 15 +- .../SerialLotNumbers/Forms/ItemForm/Form.form | 6 +- .../SerialLotNumbers/SerialLotNumbers.mdo | 2 +- .../UserGroups/Forms/ItemForm/Form.form | 48 + IRP/src/CommonAttributes/Author/Author.mdo | 8 + IRP/src/CommonAttributes/Branch/Branch.mdo | 4 + .../CreateDate/CreateDate.mdo | 16 + .../Description/Description.mdo | 8 + IRP/src/CommonAttributes/Editor/Editor.mdo | 16 + .../ManualMovementsEdit.mdo | 16 + .../ModifyDate/ModifyDate.mdo | 16 + .../SourceNodeID/SourceNodeID.mdo | 16 + IRP/src/CommonForms/AttachFile/Form.form | 67 + IRP/src/CommonForms/AttachFile/Module.bsl | 34 +- .../CommonModules/AccountingClient/Module.bsl | 60 +- .../AccountingClientServer/Module.bsl | 2 +- .../CommonModules/AccountingServer/Module.bsl | 240 +- .../AdditionalDocumentTableControl/Module.bsl | 69 +- .../CatPartnersServer/Module.bsl | 37 + .../CommonFunctionsClientServer/Module.bsl | 7 + .../CommonFunctionsServer/Module.bsl | 29 +- .../ControllerClientServer_V2/Module.bsl | 1212 ++++-- .../CurrenciesClientServer/Module.bsl | 30 +- .../CommonModules/CurrenciesServer/Module.bsl | 321 +- .../DocCashExpenseRevenueServer/Module.bsl | 2 + .../DocCashPaymentServer/Module.bsl | 2 + .../DocCashReceiptServer/Module.bsl | 2 + .../Module.bsl | 2 + .../DocCreditDebitNoteClient/Module.bsl | 16 + .../DocCreditDebitNoteServer/Module.bsl | 2 + .../DocDebitCreditNoteClient/Module.bsl | 18 + .../DocDebitCreditNoteServer/Module.bsl | 8 +- .../Module.bsl | 2 + .../Module.bsl | 2 + .../DocEmployeeCashAdvanceServer/Module.bsl | 2 + .../Module.bsl | 2 + .../DocFixedAssetTransferServer/Module.bsl | 2 + .../Module.bsl | 2 + .../DocOpeningEntryClient/Module.bsl | 57 + .../CommonModules/DocPayrollServer/Module.bsl | 49 +- .../DocPurchaseReturnServer/Module.bsl | 2 + .../DocRetailReturnReceiptServer/Module.bsl | 2 + .../DocSalesReturnServer/Module.bsl | 2 + .../Module.bsl | 24 +- .../DocTaxesOperationClient.mdo | 18 + .../DocTaxesOperationClient/Module.bsl | 176 + .../DocTaxesOperationServer.mdo | 18 + .../DocTaxesOperationServer/Module.bsl | 223 ++ .../CommonModules/DocumentsClient/Module.bsl | 4 +- .../CommonModules/ExtensionServer/Module.bsl | 13 +- IRP/src/CommonModules/Localization/Module.bsl | 365 +- .../ModelClientServer_V2/Module.bsl | 17 +- .../CommonModules/ModelServer_V2/Module.bsl | 4 + .../PictureViewerClient/Module.bsl | 21 + .../PictureViewerServer/Module.bsl | 23 +- .../TaxesClientServer/Module.bsl | 24 +- IRP/src/CommonModules/TaxesServer/Module.bsl | 50 +- IRP/src/CommonModules/UniqueID/Module.bsl | 2 - .../CommonModules/ViewClient_V2/Module.bsl | 146 +- IRP/src/Configuration/Configuration.mdo | 12 +- .../AttachedFilesToDocumentsControl.mdo | 6 +- .../Forms/Form/Form.form | 929 ++--- .../Forms/Form/Module.bsl | 343 +- .../Forms/PictureViewer/Module.bsl | 9 +- .../Forms/Form/Module.bsl | 9 + .../typeAccountingDocuments.mdo | 1 + .../typeAddPropertyOwners.mdo | 1 + .../typeReconciliationStatementDocuments.mdo | 1 + .../CalculationDeservedVacations.mdo | 199 + .../Attributes/List/ExtInfo/ListSettings.dcss | 17 + .../Forms/ChoiceForm/Form.form | 585 +++ .../Forms/ChoiceForm/Module.bsl | 40 + .../Forms/DocumentForm/Form.form | 310 ++ .../Forms/DocumentForm/Module.bsl | 35 + .../Attributes/List/ExtInfo/ListSettings.dcss | 17 + .../Forms/ListForm/Form.form | 582 +++ .../Forms/ListForm/Module.bsl | 40 + .../ManagerModule.bsl | 233 ++ .../ObjectModule.bsl | 9 + IRP/src/Documents/CreditNote/CreditNote.mdo | 82 + .../CreditNote/Forms/DocumentForm/Form.form | 167 + .../CreditNote/Forms/DocumentForm/Module.bsl | 20 + .../Documents/CreditNote/ManagerModule.bsl | 138 +- .../DebitCreditNote/DebitCreditNote.mdo | 283 +- .../Forms/DocumentForm/Form.form | 976 ++++- .../Forms/DocumentForm/Module.bsl | 53 +- .../DebitCreditNote/ManagerModule.bsl | 228 +- .../DebitCreditNote/ObjectModule.bsl | 38 +- IRP/src/Documents/DebitNote/DebitNote.mdo | 82 + .../DebitNote/Forms/DocumentForm/Form.form | 167 + .../DebitNote/Forms/DocumentForm/Module.bsl | 20 + IRP/src/Documents/DebitNote/ManagerModule.bsl | 142 +- .../Forms/DocumentForm/Form.form | 118 + .../Forms/DocumentForm/Module.bsl | 10 + .../DepreciationCalculation/ManagerModule.bsl | 20 +- .../EmployeeCashAdvance.mdo | 5 +- .../EmployeeCashAdvance/ManagerModule.bsl | 72 +- .../EmployeeFiring/EmployeeFiring.mdo | 1 + .../EmployeeFiring/ManagerModule.bsl | 24 + .../EmployeeHiring/EmployeeHiring.mdo | 27 + .../Forms/DocumentForm/Form.form | 272 ++ .../Forms/DocumentForm/Module.bsl | 37 +- .../EmployeeHiring/ManagerModule.bsl | 62 +- .../EmployeeVacation/EmployeeVacation.mdo | 27 + .../Forms/DocumentForm/Form.form | 334 ++ .../Forms/DocumentForm/Module.bsl | 58 + .../EmployeeVacation/ManagerModule.bsl | 22 +- .../ForeignCurrencyRevaluation.mdo | 2 + .../ManagerModule.bsl | 338 +- .../Forms/DocumentForm/Module.bsl | 19 +- .../Documents/JournalEntry/ObjectModule.bsl | 1 + .../ManualRegisterEntry.mdo | 1 - .../OpeningEntry/Forms/DocumentForm/Form.form | 1500 ++++++- .../Forms/DocumentForm/Module.bsl | 104 +- .../Documents/OpeningEntry/ManagerModule.bsl | 105 + .../Documents/OpeningEntry/ObjectModule.bsl | 12 + .../Documents/OpeningEntry/OpeningEntry.mdo | 355 +- IRP/src/Documents/Payroll/ManagerModule.bsl | 12 +- .../Forms/DocumentForm/Form.form | 1 + .../PurchaseInvoice/ManagerModule.bsl | 9 +- .../Forms/DocumentForm/Form.form | 1 + .../Forms/DocumentForm/Form.form | 1 + .../PurchaseReturn/ManagerModule.bsl | 41 +- .../PurchaseReturn/PurchaseReturn.mdo | 2 +- .../Forms/DocumentForm/Form.form | 1 + .../SalesInvoice/Forms/DocumentForm/Form.form | 1 + .../Documents/SalesInvoice/ManagerModule.bsl | 39 +- .../SalesOrder/Forms/DocumentForm/Form.form | 1 + .../ManagerModule.bsl | 7 +- .../SalesReportToConsignor/ManagerModule.bsl | 7 +- .../SalesReturn/Forms/DocumentForm/Form.form | 1 + .../Documents/SalesReturn/ManagerModule.bsl | 46 +- IRP/src/Documents/SalesReturn/SalesReturn.mdo | 2 +- .../Forms/DocumentForm/Form.form | 1 + .../Forms/DocumentForm/Form.form | 146 +- .../Forms/DocumentForm/Module.bsl | 29 +- .../ManagerModule.bsl | 18 +- .../StockAdjustmentAsSurplus/ObjectModule.bsl | 2 +- .../StockAdjustmentAsSurplus.mdo | 56 +- .../Attributes/List/ExtInfo/ListSettings.dcss | 17 + .../TaxesOperation/Forms/ChoiceForm/Form.form | 624 +++ .../Forms/ChoiceForm/Module.bsl | 39 + .../DocumentForm/ConditionalAppearance.dcssca | 35 + .../Forms/DocumentForm/Form.form | 3542 +++++++++++++++++ .../Forms/DocumentForm/Module.bsl | 404 ++ .../Attributes/List/ExtInfo/ListSettings.dcss | 17 + .../TaxesOperation/Forms/ListForm/Form.form | 778 ++++ .../TaxesOperation/Forms/ListForm/Module.bsl | 40 + .../TaxesOperation/ManagerModule.bsl | 514 +++ .../Documents/TaxesOperation/ObjectModule.bsl | 48 + .../TaxesOperation/TaxesOperation.mdo | 981 +++++ .../TimeSheet/Forms/DocumentForm/Module.bsl | 2 +- .../IncomingPaymentTransactionType.mdo | 2 +- IRP/src/Enums/InvoiceType/InvoiceType.mdo | 53 + .../OutgoingPaymentTransactionTypes.mdo | 2 +- .../TaxesOperationTransactionType.mdo | 68 + .../FullExchange/FullExchange.mdo | 3 - .../FunctionalOptions/UseSalary/UseSalary.mdo | 3 + .../T2014S_AdvancesInfo/ManagerModule.bsl | 6 +- .../T2015S_TransactionsInfo/ManagerModule.bsl | 6 +- .../Forms/RecordForm/Form.form | 100 + .../T9013S_AccountsTax/RecordSetModule.bsl | 10 + .../T9013S_AccountsTax/T9013S_AccountsTax.mdo | 54 + .../Forms/RecordForm/Form.form | 243 ++ .../ManagerModule.bsl | 72 + .../T9545S_VacationDaysLimits.mdo | 146 + .../D0013_DocumentRegistrationsReport.mdo | 2 + .../Forms/ReportForm/Form.form | 3 - .../D4010_ActualStocks/CommandModule.bsl | 7 + .../D4010_ActualStocks/D4010_ActualStocks.mdo | 21 + .../MainDataCompositionSchema/Template.dcs | 2 +- .../MainDataCompositionSchema/Template.dcs | 2 +- .../MainDataCompositionSchema/Template.dcs | 56 +- .../MainDataCompositionSchema/Template.dcs | 2 +- ...umulationRegisters_R5041B_TaxesPayable.mdo | 16 - .../Rights.rights | 52 - .../AttachedFilesDelete.mdo | 16 + .../Roles/AttachedFilesDelete/Rights.rights | 25 + .../Document_TaxesOperation.mdo | 16 + .../Document_TaxesOperation/Rights.rights | 147 + .../Roles/FilterForUserSettings/Rights.rights | 46 + .../Roles/FullAccessOnlyRead/Rights.rights | 11 - .../Rights.rights | 28 +- IRP/src/Roles/TemplateDocument/Rights.rights | 688 ++-- .../Rights.rights | 11 + IRP/src/Subsystems/Salary/Salary.mdo | 2 + .../Salary/Subsystems/Settings/Settings.mdo | 1 + .../CashTransactions/CashTransactions.mdo | 1 + .../Module.bsl | 2 + .../Unit_DocumentRegistration/Module.bsl | 32 +- Unit/src/Configuration/Configuration.mdo | 1 + .../CalculationDeservedVacations.mdo | 16 + .../D0009_DocumentRegistrationsReport.mdo | 1 + features/External/ImportData.feature | 201 +- .../External/ImportDataAccessRights.feature | 8 +- .../ImportDataCurrencyRevaluation.feature | 4 +- .../ImportDataDebitCreditNote.feature | 64 +- features/External/ImportDocuments.feature | 8 +- .../ImportDocumentsSecondPart.feature | 48 +- .../Landed cost/ImportCatalogs.feature | 36 +- .../Landed cost/ImportDocuments.feature | 16 +- features/External/TestDataBase.feature | 261 +- .../_0042BasiccheckOther.feature | 7 - .../_0299SalesOrderNoReserve.feature | 113 +- .../_0404SalesInvoiceMovements.feature | 50 +- .../_407PurchaseInvoiceMovements.feature | 22 +- .../_413SalesReturnMovements.feature | 40 +- .../_416PurchaseReturnMovements.feature | 40 +- .../_430DebitNoteMovements.feature | 65 +- .../_431CreditNoteMovements.feature | 53 +- .../_432DebitCreditNoteMovements.feature | 268 +- ...SalesReportFromTradeAgentMovements.feature | 23 +- ...70SalesReportToConsignorsMovements.feature | 23 +- .../_1535AdditionalAttributes.feature | 45 + .../_0910 Forms/_2000UserSettings.feature | 2 +- .../_0910 Forms/_2063AuditLock.feature | 10 +- .../_2021Fillingdocument.feature | 143 +- .../_0920SerialLotNumber.feature | 6 +- .../_1100 Landed cost/BathBalance_005_4.mxl | Bin 43656 -> 43965 bytes .../_1100 Landed cost/BathBalance_006_51.mxl | Bin 51299 -> 51851 bytes .../_1100 Landed cost/BathBalance_010_6.mxl | Bin 32172 -> 32172 bytes .../_1100 Landed cost/LandedCost.feature | 9 +- .../SourceOfOrigin.feature | 24 +- .../_2000 LoadInfo/_2010LoadDataForm.feature | 4 +- .../_2990PhysicalInventory.feature | 42 +- .../_6005EditDocumentsMovements.feature | 41 +- .../Test pdf 1 page.pdf | Bin 0 -> 37051 bytes .../_40017AttachFilesControl.feature | 375 ++ .../_4000 TestWithExtension/test.docx | Bin 0 -> 11959 bytes .../_4000 TestWithExtension/testjpg1.jpg | Bin 0 -> 23817 bytes .../_4000 TestWithExtension/testjpg2.jpg | Bin 0 -> 24890 bytes .../_4000 TestWithExtension/testpng.png | Bin 0 -> 5657 bytes .../_4000 TestWithExtension/testpng2.png | Bin 0 -> 5895 bytes .../_4000 TestWithExtension/testtemplate.png | Bin 0 -> 6860 bytes .../_4000 TestWithExtension/testtemplate2.png | Bin 0 -> 6636 bytes .../_9601AccessRightsSystemRegisters.feature | 10 - .../_9770 Salary/_09770 Salary.feature | 36 + .../_9780MultiCurrencyRevaluation.feature | 16 +- .../_9910AccountingSettings.feature | 115 +- 261 files changed, 22987 insertions(+), 2786 deletions(-) delete mode 100644 IRP/src/AccumulationRegisters/R5041B_TaxesPayable/ManagerModule.bsl delete mode 100644 IRP/src/AccumulationRegisters/R5041B_TaxesPayable/RecordSetModule.bsl create mode 100644 IRP/src/AccumulationRegisters/R9541T_VacationUsage/ManagerModule.bsl rename IRP/src/AccumulationRegisters/{R5041B_TaxesPayable/R5041B_TaxesPayable.mdo => R9541T_VacationUsage/R9541T_VacationUsage.mdo} (51%) create mode 100644 IRP/src/CommonModules/DocTaxesOperationClient/DocTaxesOperationClient.mdo create mode 100644 IRP/src/CommonModules/DocTaxesOperationClient/Module.bsl create mode 100644 IRP/src/CommonModules/DocTaxesOperationServer/DocTaxesOperationServer.mdo create mode 100644 IRP/src/CommonModules/DocTaxesOperationServer/Module.bsl create mode 100644 IRP/src/Documents/CalculationDeservedVacations/CalculationDeservedVacations.mdo create mode 100644 IRP/src/Documents/CalculationDeservedVacations/Forms/ChoiceForm/Attributes/List/ExtInfo/ListSettings.dcss create mode 100644 IRP/src/Documents/CalculationDeservedVacations/Forms/ChoiceForm/Form.form create mode 100644 IRP/src/Documents/CalculationDeservedVacations/Forms/ChoiceForm/Module.bsl create mode 100644 IRP/src/Documents/CalculationDeservedVacations/Forms/DocumentForm/Form.form create mode 100644 IRP/src/Documents/CalculationDeservedVacations/Forms/DocumentForm/Module.bsl create mode 100644 IRP/src/Documents/CalculationDeservedVacations/Forms/ListForm/Attributes/List/ExtInfo/ListSettings.dcss create mode 100644 IRP/src/Documents/CalculationDeservedVacations/Forms/ListForm/Form.form create mode 100644 IRP/src/Documents/CalculationDeservedVacations/Forms/ListForm/Module.bsl create mode 100644 IRP/src/Documents/CalculationDeservedVacations/ManagerModule.bsl create mode 100644 IRP/src/Documents/CalculationDeservedVacations/ObjectModule.bsl create mode 100644 IRP/src/Documents/TaxesOperation/Forms/ChoiceForm/Attributes/List/ExtInfo/ListSettings.dcss create mode 100644 IRP/src/Documents/TaxesOperation/Forms/ChoiceForm/Form.form create mode 100644 IRP/src/Documents/TaxesOperation/Forms/ChoiceForm/Module.bsl create mode 100644 IRP/src/Documents/TaxesOperation/Forms/DocumentForm/ConditionalAppearance.dcssca create mode 100644 IRP/src/Documents/TaxesOperation/Forms/DocumentForm/Form.form create mode 100644 IRP/src/Documents/TaxesOperation/Forms/DocumentForm/Module.bsl create mode 100644 IRP/src/Documents/TaxesOperation/Forms/ListForm/Attributes/List/ExtInfo/ListSettings.dcss create mode 100644 IRP/src/Documents/TaxesOperation/Forms/ListForm/Form.form create mode 100644 IRP/src/Documents/TaxesOperation/Forms/ListForm/Module.bsl create mode 100644 IRP/src/Documents/TaxesOperation/ManagerModule.bsl create mode 100644 IRP/src/Documents/TaxesOperation/ObjectModule.bsl create mode 100644 IRP/src/Documents/TaxesOperation/TaxesOperation.mdo create mode 100644 IRP/src/Enums/InvoiceType/InvoiceType.mdo create mode 100644 IRP/src/Enums/TaxesOperationTransactionType/TaxesOperationTransactionType.mdo create mode 100644 IRP/src/InformationRegisters/T9545S_VacationDaysLimits/Forms/RecordForm/Form.form create mode 100644 IRP/src/InformationRegisters/T9545S_VacationDaysLimits/ManagerModule.bsl create mode 100644 IRP/src/InformationRegisters/T9545S_VacationDaysLimits/T9545S_VacationDaysLimits.mdo create mode 100644 IRP/src/Reports/D4010_ActualStocks/Commands/D4010_ActualStocks/CommandModule.bsl delete mode 100644 IRP/src/Roles/AccumulationRegisters_R5041B_TaxesPayable/AccumulationRegisters_R5041B_TaxesPayable.mdo delete mode 100644 IRP/src/Roles/AccumulationRegisters_R5041B_TaxesPayable/Rights.rights create mode 100644 IRP/src/Roles/AttachedFilesDelete/AttachedFilesDelete.mdo create mode 100644 IRP/src/Roles/AttachedFilesDelete/Rights.rights create mode 100644 IRP/src/Roles/Document_TaxesOperation/Document_TaxesOperation.mdo create mode 100644 IRP/src/Roles/Document_TaxesOperation/Rights.rights create mode 100644 Unit/src/Documents/CalculationDeservedVacations/CalculationDeservedVacations.mdo create mode 100644 features/Internal/_4000 TestWithExtension/Test pdf 1 page.pdf create mode 100644 features/Internal/_4000 TestWithExtension/_40017AttachFilesControl.feature create mode 100644 features/Internal/_4000 TestWithExtension/test.docx create mode 100644 features/Internal/_4000 TestWithExtension/testjpg1.jpg create mode 100644 features/Internal/_4000 TestWithExtension/testjpg2.jpg create mode 100644 features/Internal/_4000 TestWithExtension/testpng.png create mode 100644 features/Internal/_4000 TestWithExtension/testpng2.png create mode 100644 features/Internal/_4000 TestWithExtension/testtemplate.png create mode 100644 features/Internal/_4000 TestWithExtension/testtemplate2.png diff --git a/IRP/src/AccumulationRegisters/R1020B_AdvancesToVendors/ManagerModule.bsl b/IRP/src/AccumulationRegisters/R1020B_AdvancesToVendors/ManagerModule.bsl index 32c00e88de..4399166a23 100644 --- a/IRP/src/AccumulationRegisters/R1020B_AdvancesToVendors/ManagerModule.bsl +++ b/IRP/src/AccumulationRegisters/R1020B_AdvancesToVendors/ManagerModule.bsl @@ -227,6 +227,7 @@ Function R1020B_AdvancesToVendors_DebitCreditNote() Export | Doc.SendAgreement AS Agreement, | Doc.SendProject AS Project, | Doc.Amount, + | Doc.Key, | UNDEFINED AS VendorsAdvancesClosing |INTO R1020B_AdvancesToVendors |FROM @@ -261,6 +262,7 @@ Function R1020B_AdvancesToVendors_DebitCreditNote() Export | Doc.ReceiveAgreement AS Agreement, | Doc.ReceiveProject AS Project, | Doc.Amount, + | Doc.Key, | UNDEFINED |FROM | ReceiveAdvances AS Doc @@ -284,6 +286,7 @@ Function R1020B_AdvancesToVendors_DebitCreditNote() Export | OffsetOfAdvances.AdvanceAgreement, | OffsetOfAdvances.AdvanceProject, | OffsetOfAdvances.Amount, + | OffsetOfAdvances.Key, | OffsetOfAdvances.Recorder |FROM | InformationRegister.T2010S_OffsetOfAdvances AS OffsetOfAdvances diff --git a/IRP/src/AccumulationRegisters/R1021B_VendorsTransactions/ManagerModule.bsl b/IRP/src/AccumulationRegisters/R1021B_VendorsTransactions/ManagerModule.bsl index d1caf2a527..65bc272601 100644 --- a/IRP/src/AccumulationRegisters/R1021B_VendorsTransactions/ManagerModule.bsl +++ b/IRP/src/AccumulationRegisters/R1021B_VendorsTransactions/ManagerModule.bsl @@ -423,29 +423,6 @@ Function R1021B_VendorsTransactions_CreditNote() Export EndFunction Function R1021B_VendorsTransactions_DebitCreditNote() Export - -//IsSendAdvanceCustomer -//IsSendAdvanceVendor -// -//IsSendTransactionCustomer -//IsSendTransactionVendor -// -//IsReceiveAdvanceCustomer -//IsReceiveAdvanceVendor -// -//IsReceiveTransactionCustomer -//IsReceiveTransactionVendor - -//3. Vendor transactions (VT) - Customer advances (CA) - minus - plus -//4. Vendor transactions (VT) - Customer transactions (CT) - minus - minus -//16. Vendor transactions (VT) - Vendor transactions (VT) (CT)- minus - plus -// -//3. Vendor transactions (VT) - Customer advances (CA) - minus - plus -//4. Vendor transactions (VT) - Customer transactions (CT) - minus - minus -//16. Vendor transactions (VT) - Vendor transactions (VT) - minus - plus -//16. Vendor transactions (VT) - Vendor transactions (VT) (CT)- minus - plus -//16. Vendor transactions (VT) - Vendor transactions (VT) - minus - plus - Return "SELECT |case when Doc.PartnersIsEqual then @@ -475,6 +452,7 @@ Function R1021B_VendorsTransactions_DebitCreditNote() Export | Doc.SendBasisDocument AS Basis, | Doc.SendOrderSettlements AS Order, | Doc.Amount, + | Doc.Key, | UNDEFINED AS VendorsAdvancesClosing |INTO R1021B_VendorsTransactions |FROM @@ -508,6 +486,7 @@ Function R1021B_VendorsTransactions_DebitCreditNote() Export | Doc.ReceiveBasisDocument, | Doc.ReceiveOrderSettlements, | Doc.Amount, + | Doc.Key, | UNDEFINED |FROM | ReceiveTransactions AS Doc @@ -533,6 +512,7 @@ Function R1021B_VendorsTransactions_DebitCreditNote() Export | OffsetOfAdvances.TransactionDocument, | OffsetOfAdvances.TransactionOrder, | OffsetOfAdvances.Amount, + | OffsetOfAdvances.Key, | OffsetOfAdvances.Recorder |FROM | InformationRegister.T2010S_OffsetOfAdvances AS OffsetOfAdvances diff --git a/IRP/src/AccumulationRegisters/R1040B_TaxesOutgoing/R1040B_TaxesOutgoing.mdo b/IRP/src/AccumulationRegisters/R1040B_TaxesOutgoing/R1040B_TaxesOutgoing.mdo index 6446d47f2c..3eff28937c 100644 --- a/IRP/src/AccumulationRegisters/R1040B_TaxesOutgoing/R1040B_TaxesOutgoing.mdo +++ b/IRP/src/AccumulationRegisters/R1040B_TaxesOutgoing/R1040B_TaxesOutgoing.mdo @@ -24,40 +24,19 @@ true Managed true - - TaxableAmount - - en - Taxable amount - - - ru - Сумма оборота - - - tr - KDV Matrahı - - - DefinedType.typeAmount - - - - Use - - TaxAmount + Amount en - Tax amount + Amount ru - Сумма налогов + Сумма tr - Vergi tutarı + Tutar DefinedType.typeAmount @@ -154,25 +133,88 @@ Use true - - TaxMovementType + + InvoiceType + + en + Invoice type + + + ru + Тип инвойса + + + tr + Invoice type + + + EnumRef.InvoiceType + + + + Use + true + + + CurrencyMovementType + + en + Multi currency movement type + + + ru + Вид мультивалютной аналитики + + + tr + Çoklu döviz hareket tipi + + + ChartOfCharacteristicTypesRef.CurrencyMovementType + + + + Use + true + + + Currency + + en + Currency + + + ru + Валюта + + + tr + Döviz + + + CatalogRef.Currencies + + + + Use + true + + + TransactionCurrency en - Tax movement type + Transaction currency ru - Вид поступления + Валюта транзакции tr - Vergiler hareket tipi + İşlem para birimi - String - - 10 - + CatalogRef.Currencies diff --git a/IRP/src/AccumulationRegisters/R2020B_AdvancesFromCustomers/ManagerModule.bsl b/IRP/src/AccumulationRegisters/R2020B_AdvancesFromCustomers/ManagerModule.bsl index 60b69f95cb..57b1815ba6 100644 --- a/IRP/src/AccumulationRegisters/R2020B_AdvancesFromCustomers/ManagerModule.bsl +++ b/IRP/src/AccumulationRegisters/R2020B_AdvancesFromCustomers/ManagerModule.bsl @@ -230,6 +230,7 @@ Function R2020B_AdvancesFromCustomers_DebitCreditNote() Export | Doc.SendAgreement AS Agreement, | Doc.SendProject AS Project, | Doc.Amount, + | Doc.Key, | UNDEFINED AS CustomersAdvancesClosing |INTO R2020B_AdvancesFromCustomers |FROM @@ -264,6 +265,7 @@ Function R2020B_AdvancesFromCustomers_DebitCreditNote() Export | Doc.ReceiveAgreement AS Agreement, | Doc.ReceiveProject AS Project, | Doc.Amount, + | Doc.Key, | UNDEFINED |FROM | ReceiveAdvances AS Doc @@ -287,6 +289,7 @@ Function R2020B_AdvancesFromCustomers_DebitCreditNote() Export | OffsetOfAdvances.AdvanceAgreement, | OffsetOfAdvances.AdvanceProject, | OffsetOfAdvances.Amount, + | OffsetOfAdvances.Key, | OffsetOfAdvances.Recorder |FROM | InformationRegister.T2010S_OffsetOfAdvances AS OffsetOfAdvances diff --git a/IRP/src/AccumulationRegisters/R2021B_CustomersTransactions/ManagerModule.bsl b/IRP/src/AccumulationRegisters/R2021B_CustomersTransactions/ManagerModule.bsl index 3840c0567b..37bea7a7d3 100644 --- a/IRP/src/AccumulationRegisters/R2021B_CustomersTransactions/ManagerModule.bsl +++ b/IRP/src/AccumulationRegisters/R2021B_CustomersTransactions/ManagerModule.bsl @@ -402,6 +402,7 @@ Function R2021B_CustomersTransactions_DebitCreditNote() Export | Doc.SendBasisDocument AS Basis, | Doc.SendOrderSettlements AS Order, | Doc.Amount, + | Doc.Key, | UNDEFINED AS CustomersAdvancesClosing |INTO R2021B_CustomersTransactions |FROM @@ -437,6 +438,7 @@ Function R2021B_CustomersTransactions_DebitCreditNote() Export | Doc.ReceiveBasisDocument, | Doc.ReceiveOrderSettlements, | Doc.Amount, + | Doc.Key, | UNDEFINED |FROM | ReceiveTransactions AS Doc @@ -462,6 +464,7 @@ Function R2021B_CustomersTransactions_DebitCreditNote() Export | OffsetOfAdvances.TransactionDocument, | OffsetOfAdvances.TransactionOrder, | OffsetOfAdvances.Amount, + | OffsetOfAdvances.Key, | OffsetOfAdvances.Recorder |FROM | InformationRegister.T2010S_OffsetOfAdvances AS OffsetOfAdvances diff --git a/IRP/src/AccumulationRegisters/R2040B_TaxesIncoming/R2040B_TaxesIncoming.mdo b/IRP/src/AccumulationRegisters/R2040B_TaxesIncoming/R2040B_TaxesIncoming.mdo index afb318a88c..f14fdb8b22 100644 --- a/IRP/src/AccumulationRegisters/R2040B_TaxesIncoming/R2040B_TaxesIncoming.mdo +++ b/IRP/src/AccumulationRegisters/R2040B_TaxesIncoming/R2040B_TaxesIncoming.mdo @@ -24,40 +24,19 @@ true Managed true - - TaxableAmount - - en - Taxable amount - - - ru - Сумма оборота - - - tr - KDV Matrahı - - - DefinedType.typeAmount - - - - Use - - TaxAmount + Amount en - Tax amount + Amount ru - Сумма налогов + Сумма tr - Vergi tutarı + Tutar DefinedType.typeAmount @@ -154,25 +133,88 @@ Use true - - TaxMovementType + + InvoiceType + + en + Invoice type + + + ru + Тип инвойса + + + tr + Invoice type + + + EnumRef.InvoiceType + + + + Use + true + + + CurrencyMovementType + + en + Multi currency movement type + + + ru + Вид мультивалютной аналитики + + + tr + Çoklu döviz hareket tipi + + + ChartOfCharacteristicTypesRef.CurrencyMovementType + + + + Use + true + + + Currency + + en + Currency + + + ru + Валюта + + + tr + Döviz + + + CatalogRef.Currencies + + + + Use + true + + + TransactionCurrency en - Tax movement type + Transaction currency ru - Вид поступления + Валюта транзакции tr - Vergiler hareket tipi + İşlem para birimi - String - - 10 - + CatalogRef.Currencies diff --git a/IRP/src/AccumulationRegisters/R5020B_PartnersBalance/ManagerModule.bsl b/IRP/src/AccumulationRegisters/R5020B_PartnersBalance/ManagerModule.bsl index 2aa9f95b6c..f231f5140a 100644 --- a/IRP/src/AccumulationRegisters/R5020B_PartnersBalance/ManagerModule.bsl +++ b/IRP/src/AccumulationRegisters/R5020B_PartnersBalance/ManagerModule.bsl @@ -1892,6 +1892,7 @@ Function R5020B_PartnersBalance_DebitCreditNote() Export | VALUE(AccumulationRecordType.Expense) AS RecordType, | | SendAdvances.Period, + | SendAdvances.Key, | SendAdvances.Company, | SendAdvances.SendBranch AS Branch, | SendAdvances.SendPartner AS Partner, @@ -1920,7 +1921,6 @@ Function R5020B_PartnersBalance_DebitCreditNote() Export | // Vendor advance (receipt) |SELECT - //| VALUE(AccumulationRecordType.Receipt), | | case when ReceiveAdvances.IsSendAdvanceCustomer and ReceiveAdvances.IsReceiveAdvanceVendor then | VALUE(AccumulationRecordType.Expense) @@ -1929,6 +1929,7 @@ Function R5020B_PartnersBalance_DebitCreditNote() Export | end, | | ReceiveAdvances.Period, + | ReceiveAdvances.Key, | ReceiveAdvances.Company, | ReceiveAdvances.ReceiveBranch AS Branch, | ReceiveAdvances.ReceivePartner AS Partner, @@ -1959,6 +1960,7 @@ Function R5020B_PartnersBalance_DebitCreditNote() Export | VALUE(AccumulationRecordType.Receipt), | | SendAdvances.Period, + | SendAdvances.Key, | SendAdvances.Company, | SendAdvances.SendBranch AS Branch, | SendAdvances.SendPartner AS Partner, @@ -1989,6 +1991,7 @@ Function R5020B_PartnersBalance_DebitCreditNote() Export | VALUE(AccumulationRecordType.Expense), | | ReceiveAdvances.Period, + | ReceiveAdvances.Key, | ReceiveAdvances.Company, | ReceiveAdvances.ReceiveBranch AS Branch, | ReceiveAdvances.ReceivePartner AS Partner, @@ -2019,6 +2022,7 @@ Function R5020B_PartnersBalance_DebitCreditNote() Export | VALUE(AccumulationRecordType.Receipt) AS RecordType, | | SendTransactions.Period, + | SendTransactions.Key, | SendTransactions.Company, | SendTransactions.SendBranch AS Branch, | SendTransactions.SendPartner AS Partner, @@ -2054,6 +2058,7 @@ Function R5020B_PartnersBalance_DebitCreditNote() Export | end, | | ReceiveTransactions.Period, + | ReceiveTransactions.Key, | ReceiveTransactions.Company, | ReceiveTransactions.ReceiveBranch AS Branch, | ReceiveTransactions.ReceivePartner AS Partner, @@ -2084,6 +2089,7 @@ Function R5020B_PartnersBalance_DebitCreditNote() Export | VALUE(AccumulationRecordType.Expense), | | SendTransactions.Period, + | SendTransactions.Key, | SendTransactions.Company, | SendTransactions.SendBranch AS Branch, | SendTransactions.SendPartner AS Partner, @@ -2119,6 +2125,7 @@ Function R5020B_PartnersBalance_DebitCreditNote() Export | end, | | ReceiveTransactions.Period, + | ReceiveTransactions.Key, | ReceiveTransactions.Company, | ReceiveTransactions.ReceiveBranch AS Branch, | ReceiveTransactions.ReceivePartner AS Partner, @@ -2152,6 +2159,7 @@ Function R5020B_PartnersBalance_DebitCreditNote() Export | ELSE VALUE(AccumulationRecordType.Expense) | END, | OffsetOfAdvances.Period, + | OffsetOfAdvances.Key, | OffsetOfAdvances.Company, | OffsetOfAdvances.Branch, | OffsetOfAdvances.Partner, @@ -2190,6 +2198,7 @@ Function R5020B_PartnersBalance_DebitCreditNote() Export | ELSE VALUE(AccumulationRecordType.Receipt) | END, | OffsetOfAdvances.Period, + | OffsetOfAdvances.Key, | OffsetOfAdvances.Company, | OffsetOfAdvances.Branch, | OffsetOfAdvances.Partner, @@ -2229,6 +2238,7 @@ Function R5020B_PartnersBalance_DebitCreditNote() Export | ELSE VALUE(AccumulationRecordType.Receipt) | END, | OffsetOfAdvances.Period, + | OffsetOfAdvances.Key, | OffsetOfAdvances.Company, | OffsetOfAdvances.Branch, | OffsetOfAdvances.Partner, @@ -2267,6 +2277,7 @@ Function R5020B_PartnersBalance_DebitCreditNote() Export | ELSE VALUE(AccumulationRecordType.Expense) | END, | OffsetOfAdvances.Period, + | OffsetOfAdvances.Key, | OffsetOfAdvances.Company, | OffsetOfAdvances.Branch, | OffsetOfAdvances.Partner, @@ -2297,6 +2308,7 @@ Function R5020B_PartnersBalance_DebitCreditNote() Export | |"; EndFunction + Function R5020B_PartnersBalance_Payroll() Export Return // Other transaction @@ -2326,6 +2338,61 @@ Function R5020B_PartnersBalance_Payroll() Export | TRUE"; EndFunction +Function R5020B_PartnersBalance_TaxesOperation() Export + Return + // Other transaction + "SELECT + | VALUE(AccumulationRecordType.Expense) AS RecordType, + | TaxesDifference.Period, + | TaxesDifference.Company, + | TaxesDifference.Branch, + | TaxesDifference.Partner, + | TaxesDifference.LegalName, + | TaxesDifference.Agreement, + | UNDEFINED AS Document, + | TaxesDifference.Currency, + | 0 AS Amount, + | 0 AS CustomerTransaction, + | 0 AS CustomerAdvance, + | 0 AS VendorTransaction, + | 0 AS VendorAdvance, + | TaxesDifference.Amount AS OtherTransaction, + | UNDEFINED AS AdvancesClosing, + | UNDEFINED AS Key + |INTO R5020B_PartnersBalance + |FROM + | TaxesDifference AS TaxesDifference + |WHERE + | NOT TaxesDifference.IncomingVatRate.Ref IS NULL + | AND TaxesDifference.OutgoingVatRate.Ref IS NULL + | + |UNION ALL + | + |SELECT + | VALUE(AccumulationRecordType.Receipt) AS RecordType, + | TaxesDifference.Period, + | TaxesDifference.Company, + | TaxesDifference.Branch, + | TaxesDifference.Partner, + | TaxesDifference.LegalName, + | TaxesDifference.Agreement, + | UNDEFINED AS Document, + | TaxesDifference.Currency, + | 0 AS Amount, + | 0 AS CustomerTransaction, + | 0 AS CustomerAdvance, + | 0 AS VendorTransaction, + | 0 AS VendorAdvance, + | TaxesDifference.Amount AS OtherTransaction, + | UNDEFINED AS AdvancesClosing, + | UNDEFINED AS Key + |FROM + | TaxesDifference AS TaxesDifference + |WHERE + | NOT TaxesDifference.OutgoingVatRate.Ref IS NULL + | AND TaxesDifference.IncomingVatRate.Ref IS NULL"; +EndFunction + Procedure AdditionalDataFilling(MovementsValueTable) Export For Each Row In MovementsValueTable Do If ValueIsFilled(Row.AdvancesClosing) Then @@ -2338,4 +2405,4 @@ Procedure AdditionalDataFilling(MovementsValueTable) Export + Row.VendorAdvance + Row.OtherTransaction; EndDo; -EndProcedure \ No newline at end of file +EndProcedure diff --git a/IRP/src/AccumulationRegisters/R5041B_TaxesPayable/ManagerModule.bsl b/IRP/src/AccumulationRegisters/R5041B_TaxesPayable/ManagerModule.bsl deleted file mode 100644 index 56007a8e46..0000000000 --- a/IRP/src/AccumulationRegisters/R5041B_TaxesPayable/ManagerModule.bsl +++ /dev/null @@ -1,23 +0,0 @@ -#Region AccessObject - -// Get access key. -// See Role.TemplateAccumulationRegisters - Parameters orders has to be the same -// -// Returns: -// Structure - Get access key: -// * Company - CatalogRef.Companies - -Function GetAccessKey() Export - AccessKeyStructure = New Structure; - AccessKeyStructure.Insert("Company", Catalogs.Companies.EmptyRef()); - Return AccessKeyStructure; -EndFunction - -#EndRegion - -// Additional data filling. -// -// Parameters: -// MovementsValueTable - ValueTable -Procedure AdditionalDataFilling(MovementsValueTable) Export - Return; -EndProcedure \ No newline at end of file diff --git a/IRP/src/AccumulationRegisters/R5041B_TaxesPayable/RecordSetModule.bsl b/IRP/src/AccumulationRegisters/R5041B_TaxesPayable/RecordSetModule.bsl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/IRP/src/AccumulationRegisters/R9541T_VacationUsage/ManagerModule.bsl b/IRP/src/AccumulationRegisters/R9541T_VacationUsage/ManagerModule.bsl new file mode 100644 index 0000000000..982e70655f --- /dev/null +++ b/IRP/src/AccumulationRegisters/R9541T_VacationUsage/ManagerModule.bsl @@ -0,0 +1,50 @@ +#Region AccessObject + +// Get access key. +// See Role.TemplateAccumulationRegisters - Parameters orders has to be the same +// +// Returns: +// Structure - Get access key: +// * Company - CatalogRef.Companies - +// * Branch - CatalogRef.BusinessUnits - +Function GetAccessKey() Export + AccessKeyStructure = New Structure; + AccessKeyStructure.Insert("Company", Catalogs.Companies.EmptyRef()); + Return AccessKeyStructure; +EndFunction + +#EndRegion + +// Additional data filling. +// +// Parameters: +// MovementsValueTable - ValueTable +Procedure AdditionalDataFilling(MovementsValueTable) Export + Return; +EndProcedure + +Function GetAvailableDays(Company, Employee, Date) Export + + Query = New Query; + Query.Text = + "SELECT ALLOWED + | R9541T_VacationUsageBalance.Employee, + | R9541T_VacationUsageBalance.DaysBalance AS Days + |FROM + | AccumulationRegister.R9541T_VacationUsage.Balance(&Date, Company = &Company + | AND Employee = &Employee) AS R9541T_VacationUsageBalance + |WHERE + | R9541T_VacationUsageBalance.DaysBalance > 0"; + + Query.SetParameter("Date", Date); + Query.SetParameter("Company", Company); + Query.SetParameter("Employee", Employee); + + QuerySelection = Query.Execute().Select(); + If QuerySelection.Next() Then + Return QuerySelection.Days; + EndIf; + + Return 0; + +EndFunction \ No newline at end of file diff --git a/IRP/src/AccumulationRegisters/R5041B_TaxesPayable/R5041B_TaxesPayable.mdo b/IRP/src/AccumulationRegisters/R9541T_VacationUsage/R9541T_VacationUsage.mdo similarity index 51% rename from IRP/src/AccumulationRegisters/R5041B_TaxesPayable/R5041B_TaxesPayable.mdo rename to IRP/src/AccumulationRegisters/R9541T_VacationUsage/R9541T_VacationUsage.mdo index e9979b6f1c..d1d128b0bb 100644 --- a/IRP/src/AccumulationRegisters/R5041B_TaxesPayable/R5041B_TaxesPayable.mdo +++ b/IRP/src/AccumulationRegisters/R9541T_VacationUsage/R9541T_VacationUsage.mdo @@ -1,51 +1,54 @@ - + - - - - - - + + + + + + - R5041B_TaxesPayable + R9541T_VacationUsage en - R5041 Taxes payable + R9541T Vacation usage ru - R5041 Налоги к оплате + R9541T Использование отпуска tr - R5041 Ödenecek vergiler + R9541T Vacation usage true Managed true - - Amount + + Days en - Amount + Days ru - Сумма + Дни tr - Tutar + Days - DefinedType.typeAmount + Number + + 5 + Use - + Company en @@ -67,22 +70,22 @@ Use true - - Tax + + Employee en - Tax + Employee ru - Налог + Сотрудник tr - Vergi + Personel - CatalogRef.Taxes + CatalogRef.Partners diff --git a/IRP/src/AccumulationRegisters/T1040T_AccountingAmounts/T1040T_AccountingAmounts.mdo b/IRP/src/AccumulationRegisters/T1040T_AccountingAmounts/T1040T_AccountingAmounts.mdo index 83ff21dfdd..67a1b7c260 100644 --- a/IRP/src/AccumulationRegisters/T1040T_AccountingAmounts/T1040T_AccountingAmounts.mdo +++ b/IRP/src/AccumulationRegisters/T1040T_AccountingAmounts/T1040T_AccountingAmounts.mdo @@ -46,6 +46,48 @@ Use + + DrCurrencyAmount + + en + Dr currency amount + + + ru + Сумма в валюте Дт + + + tr + Dr currency amount + + + DefinedType.typeAmount + + + + Use + + + CrCurrencyAmount + + en + Cr currency amount + + + ru + Сумма в валюте Кт + + + tr + Cr currency amount + + + DefinedType.typeAmount + + + + Use + DeferredCalculation @@ -202,4 +244,48 @@ Use true + + DrCurrency + + en + Dr currency + + + ru + Валюта Дт + + + tr + Borç döviz + + + CatalogRef.Currencies + + + + Use + true + + + CrCurrency + + en + Cr currency + + + ru + Валюта Кт + + + tr + Alacak dövizi + + + CatalogRef.Currencies + + + + Use + true + \ No newline at end of file diff --git a/IRP/src/Catalogs/AccountingOperations/AccountingOperations.mdo b/IRP/src/Catalogs/AccountingOperations/AccountingOperations.mdo index 8df594224a..4ad010f332 100644 --- a/IRP/src/Catalogs/AccountingOperations/AccountingOperations.mdo +++ b/IRP/src/Catalogs/AccountingOperations/AccountingOperations.mdo @@ -369,7 +369,7 @@ - SalesInvoice_DR_R5021T_Revenues_CR_R2040B_TaxesIncoming + SalesInvoice_DR_R2021B_CustomersTransactions_CR_R2040B_TaxesIncoming 16 @@ -531,6 +531,34 @@ 128 + + ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R1040B_TaxesOutgoing + + + 140 + + + + ForeignCurrencyRevaluation_DR_R1040B_TaxesOutgoing_CR_R5021T_Revenues + + + 141 + + + + ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R2040B_TaxesIncoming + + + 142 + + + + ForeignCurrencyRevaluation_DR_R2040B_TaxesIncoming_CR_R5021T_Revenues + + + 143 + + Document_CashPayment @@ -704,6 +732,20 @@ 139 + + DebitNote_DR_R1021B_VendorsTransactions_CR_R2040B_TaxesIncoming + + + 148 + + + + DebitNote_DR_R2021B_CustomersTransactions_CR_R2040B_TaxesIncoming + + + 149 + + Document_CreditNote @@ -743,6 +785,20 @@ 101 + + CreditNote_DR_R1040B_TaxesOutgoing_CR_R1021B_VendorsTransactions + + + 150 + + + + CreditNote_DR_R1040B_TaxesOutgoing_CR_R2021B_CustomersTransactions + + + 151 + + Document_MoneyTransfer @@ -941,6 +997,20 @@ 100 + + DebitCreditNote_DR_R5020B_PartnersBalance_CR_R5021_Revenues + + + 148 + + + + DebitCreditNote_DR_R5022T_Expenses_CR_R5020B_PartnersBalance + + + 149 + + Document_ExpenseAccruals @@ -1007,6 +1077,13 @@ 110 + + EmployeeCashAdvance_DR_R1040B_TaxesOutgoing_CR_R3027B_EmployeeCashAdvance + + + 152 + + Document_SalesReturn @@ -1030,7 +1107,7 @@ - SalesReturn_DR_R5021T_Revenues_CR_R1040B_TaxesOutgoing + SalesReturn_DR_R1040B_TaxesOutgoing_CR_R2021B_CustomersTransactions 132 @@ -1066,7 +1143,7 @@ - PurchaseReturn_DR_R2040B_TaxesIncoming_CR_R1021B_VendorsTransactions + PurchaseReturn_DR_R1021B_VendorsTransactions_CR_R2040B_TaxesIncoming 137 @@ -1081,6 +1158,35 @@ true + + Document_TaxesOperation + + + 144 + + true + + TaxesOperation_DR_R2040B_TaxesIncoming_CR_R1040B_TaxesOutgoing + + + 145 + + + + TaxesOperation_DR_R2040B_TaxesIncoming_CR_R5015B_OtherPartnersTransactions + + + 146 + + + + TaxesOperation_DR_R5015B_OtherPartnersTransactions_CR_R1040B_TaxesOutgoing + + + 147 + + + InDialog BothWays diff --git a/IRP/src/Catalogs/AddAttributeAndPropertySets/AddAttributeAndPropertySets.mdo b/IRP/src/Catalogs/AddAttributeAndPropertySets/AddAttributeAndPropertySets.mdo index 5cd9c066cf..e1ee0672c3 100644 --- a/IRP/src/Catalogs/AddAttributeAndPropertySets/AddAttributeAndPropertySets.mdo +++ b/IRP/src/Catalogs/AddAttributeAndPropertySets/AddAttributeAndPropertySets.mdo @@ -948,6 +948,13 @@ 152 + + Document_TaxesOperation + + + 153 + + InDialog BothWays diff --git a/IRP/src/Catalogs/AddAttributeAndPropertySets/ManagerModule.bsl b/IRP/src/Catalogs/AddAttributeAndPropertySets/ManagerModule.bsl index 3a810f4ae0..7a392c866d 100644 --- a/IRP/src/Catalogs/AddAttributeAndPropertySets/ManagerModule.bsl +++ b/IRP/src/Catalogs/AddAttributeAndPropertySets/ManagerModule.bsl @@ -59,6 +59,13 @@ Function GetExtensionAttributesListByObjectMetadata(ObjectMetadata, Ref) Export For Each Attribute In ObjectMetadata.Attributes Do AttributeNames.Add(Attribute.Name); EndDo; + + For Each Attribute In Metadata.CommonAttributes Do + If CommonFunctionsServer.isCommonAttributeUseForMetadata(Attribute.Name, ObjectMetadata) Then + AttributeNames.Add(Attribute.Name); + EndIf; + EndDo; + Query = New Query(); Query.Text = "SELECT diff --git a/IRP/src/Catalogs/AttachedDocumentSettings/Forms/ItemForm/Form.form b/IRP/src/Catalogs/AttachedDocumentSettings/Forms/ItemForm/Form.form index 0597cf25c4..4604e678c5 100644 --- a/IRP/src/Catalogs/AttachedDocumentSettings/Forms/ItemForm/Form.form +++ b/IRP/src/Catalogs/AttachedDocumentSettings/Forms/ItemForm/Form.form @@ -102,7 +102,6 @@ true true true - true diff --git a/IRP/src/Catalogs/ChequeBonds/Forms/PickUpForm/Form.form b/IRP/src/Catalogs/ChequeBonds/Forms/PickUpForm/Form.form index 39bceb7d1d..46bc11a186 100644 --- a/IRP/src/Catalogs/ChequeBonds/Forms/PickUpForm/Form.form +++ b/IRP/src/Catalogs/ChequeBonds/Forms/PickUpForm/Form.form @@ -561,6 +561,54 @@ true + + ChequeBond + 103 + true + true + + + List.ChequeBond + + + ChequeBondExtendedTooltip + 105 + true + true + + true + + Label + true + true + + Left + + + + ChequeBondContextMenu + 104 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + None ListCommandBar diff --git a/IRP/src/Catalogs/Files/Forms/ItemForm/Form.form b/IRP/src/Catalogs/Files/Forms/ItemForm/Form.form index 28975bd5f5..4267cd2d20 100644 --- a/IRP/src/Catalogs/Files/Forms/ItemForm/Form.form +++ b/IRP/src/Catalogs/Files/Forms/ItemForm/Form.form @@ -599,6 +599,96 @@ GroupPicture 30 + + PDF + 81 + true + true + + true + + + PDF + + None + + PDFExtendedTooltip + 83 + true + true + + true + + Label + true + true + + Left + + + + PDFContextMenu + 82 + true + true + + true + + true + + PDFDocumentField + Enter + true + Left + true + + + true + true + + true + + PDFViewStatus + 84 + + PDFViewStatusExtendedTooltip + 86 + true + true + + true + + Label + true + true + + Left + + + + PDFViewStatusContextMenu + 85 + true + true + + true + + true + + ViewStatusAddition + PDFViewStatus + + true + + + 50 + true + 10 + true + true + true + + Picture 36 @@ -949,6 +1039,36 @@ UserCmds Auto + + FormDownload + 87 + true + true + + true + + + FormDownloadExtendedTooltip + 88 + true + true + + true + + Label + true + true + + Left + + + Form.Command.Download + Auto + true + true + UserCmds + Auto + true true @@ -1071,6 +1191,31 @@ true + + PDF + + <key>en</key> + <value>PDF</value> + + + <key>ru</key> + <value>PDF</value> + + + <key>tr</key> + <value>PDF</value> + + 5 + + PDFDocument + + + true + + + true + + Upload @@ -1100,6 +1245,35 @@ <representation>TextPicture</representation> <currentRowUse>Auto</currentRowUse> </formCommands> + <formCommands> + <name>Download</name> + <title> + <key>en</key> + <value>Download</value> + + + <key>ru</key> + <value>Скачать</value> + + + <key>tr</key> + <value>İndir</value> + + 2 + + true + + + StdPicture.MoveDown + + + + Download + + + TextPicture + Auto + diff --git a/IRP/src/Catalogs/Files/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/Files/Forms/ItemForm/Module.bsl index 38cb582af1..e6a4bf198b 100644 --- a/IRP/src/Catalogs/Files/Forms/ItemForm/Module.bsl +++ b/IRP/src/Catalogs/Files/Forms/ItemForm/Module.bsl @@ -1,3 +1,4 @@ + #Region FormEvents &AtServer @@ -26,12 +27,20 @@ EndProcedure &AtClient Procedure OnOpen(Cancel) - ShowPicture(); + ShowData(); EndProcedure &AtClient Procedure AfterWrite(WriteParameters) - ShowPicture(); + ShowData(); +EndProcedure + +&AtClient +Procedure Download(Command) + PictureParameters = CreatePictureParameters(); + URL = PictureViewerClient.GetPictureURL(PictureParameters); + Dialog = New GetFilesDialogParameters(); + GetFileFromServerAsync(URL, Object.Description, Dialog); EndProcedure #EndRegion @@ -56,12 +65,22 @@ Function CreatePictureParameters() EndFunction &AtClient -Procedure ShowPicture() - If Not Object.Volume.IsEmpty() And PictureViewerServer.isImage("." + Object.Extension) Then - PictureParameters = CreatePictureParameters(); - - ThisObject.PictureViewHTML = ""; +Procedure ShowData() + If Not Object.Volume.IsEmpty() Then + + If PictureViewerServer.isImage("." + Object.Extension) Then + PictureParameters = CreatePictureParameters(); + ThisObject.PictureViewHTML = ""; + Items.Picture.Visible = True; + Items.PDF.Visible = False; + ElsIf StrCompare(Object.Extension, "pdf") = 0 Then + PictureViewerClient.SetPDFForView(Object.Ref, PDF); + Items.Picture.Visible = False; + Items.PDF.Visible = True; + Else + Items.Picture.Visible = False; + Items.PDF.Visible = False; + EndIf; EndIf; EndProcedure diff --git a/IRP/src/Catalogs/ItemKeys/Forms/ItemForm/Form.form b/IRP/src/Catalogs/ItemKeys/Forms/ItemForm/Form.form index 0bc0ecc713..25392d4b03 100644 --- a/IRP/src/Catalogs/ItemKeys/Forms/ItemForm/Form.form +++ b/IRP/src/Catalogs/ItemKeys/Forms/ItemForm/Form.form @@ -430,20 +430,209 @@ Auto - - PackageUnit - 126 + + GroupPackageUnit + 178 + + InheritPackageUnit + 183 + true + + true + + + InheritPackageUnit + + + InheritPackageUnitExtendedTooltip + 185 + true + true + + true + + Label + true + true + + Left + + + + InheritPackageUnitContextMenu + 184 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + true + + + + OwnPackageUnit + 126 + true + true + + true + + + Object.PackageUnit + + + OwnPackageUnitExtendedTooltip + 128 + true + true + + true + + Label + true + true + + Left + + + + OwnPackageUnitContextMenu + 127 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + PackageUnitMode + 180 + true + true + + true + + + PackageUnitMode + + None + + OnChange + PackageUnitModeOnChange + + + PackageUnitModeExtendedTooltip + 182 + true + true + + true + + Label + true + true + + Left + + + + PackageUnitModeContextMenu + 181 + true + true + + true + + true + + RadioButtonField + Enter + true + Left + true + + Tumbler + + + en + Own + + + ru + Собственная + + + tr + Kendi çekimiz + + + Own + + + + + en + Inherit + + + ru + Унаследованная + + + tr + Üst öğeden al + + + Inherit + + + + true true true - - Object.PackageUnit - + + <key>en</key> + <value>Group of Package unit</value> + + + <key>ru</key> + <value>Группа ед.изм. упаковки</value> + + + <key>tr</key> + <value>Group of Package unit</value> + - PackageUnitExtendedTooltip - 128 + GroupPackageUnitExtendedTooltip + 179 true true @@ -456,28 +645,14 @@ Left - - PackageUnitContextMenu - 127 - true - true - - true - - true - - InputField - Enter - true - Left - true - - true - true - true - true - true - true + UsualGroup + + AlwaysHorizontal + Auto + true + true + Auto + Auto @@ -2893,6 +3068,58 @@ + + PackageUnitMode + + <key>en</key> + <value>Package unit mode</value> + + + <key>ru</key> + <value>Режим ед.изм. упаковки</value> + + + <key>tr</key> + <value>Package unit mode</value> + + 12 + + String + + + + true + + + true + + true + + + InheritPackageUnit + + <key>en</key> + <value>Inherit package unit</value> + + + <key>ru</key> + <value>Унаследованная ед.изм. упаковки</value> + + + <key>tr</key> + <value>Inherit package unit</value> + + 13 + + CatalogRef.Units + + + true + + + true + + diff --git a/IRP/src/Catalogs/ItemKeys/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/ItemKeys/Forms/ItemForm/Module.bsl index 97e5b03c6b..5d814a4ab0 100644 --- a/IRP/src/Catalogs/ItemKeys/Forms/ItemForm/Module.bsl +++ b/IRP/src/Catalogs/ItemKeys/Forms/ItemForm/Module.bsl @@ -1,3 +1,4 @@ + &AtServer Procedure OnCreateAtServer(Cancel, StandardProcessing) CatalogsServer.OnCreateAtServerObject(ThisObject, Object, Cancel, StandardProcessing); @@ -22,6 +23,7 @@ Procedure OnCreateAtServer(Cancel, StandardProcessing) EndDo; EndIf; ThisObject.UnitMode = ?(ValueIsFilled(Object.Unit), "Own", "Inherit"); + ThisObject.PackageUnitMode = ?(ValueIsFilled(Object.PackageUnit), "Own", "Inherit"); ThisObject.ConsignorInfoMode = ?(Object.ConsignorsInfo.Count()>0, "Own", "Inherit"); ThisObject.SpecificationMode = ValueIsFilled(Object.Specification); SetVisible(); @@ -125,6 +127,14 @@ Procedure UnitModeOnChange(Item) SetVisible(); EndProcedure +&AtClient +Procedure PackageUnitModeOnChange(Item) + If ThisObject.PackageUnitMode = "Inherit" Then + Object.PackageUnit = Undefined; + EndIf; + SetVisible(); +EndProcedure + &AtClient Procedure ConsignorInfoModeOnChange(Item) If ThisObject.ConsignorInfoMode = "Inherit" Then @@ -175,6 +185,9 @@ Procedure SetVisible() Items.OwnUnit.Visible = ThisObject.UnitMode = "Own"; Items.InheritUnit.Visible = ThisObject.UnitMode = "Inherit"; + Items.OwnPackageUnit.Visible = ThisObject.PackageUnitMode = "Own"; + Items.InheritPackageUnit.Visible = ThisObject.PackageUnitMode = "Inherit"; + Items.ConsignorsInfo.Visible = ThisObject.ConsignorInfoMode = "Own"; Items.InheritConsignorsInfo.Visible = ThisObject.ConsignorInfoMode = "Inherit"; @@ -183,6 +196,7 @@ Procedure SetVisible() Items.SpecificationMode.Visible = Not GetTypeOfItemType(Object.Item) = PredefinedValue("Enum.ItemTypes.Service"); ThisObject.InheritUnit = ?(ValueIsFilled(Object.Item), Object.Item.Unit, Undefined); + ThisObject.InheritPackageUnit = ?(ValueIsFilled(Object.Item), Object.Item.PackageUnit, Undefined); ThisObject.ItemType = ?(ValueIsFilled(Object.Item), Object.Item.ItemType, Undefined); EndProcedure diff --git a/IRP/src/Catalogs/Items/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/Items/Forms/ItemForm/Module.bsl index 23f851e15c..822d1d4b37 100644 --- a/IRP/src/Catalogs/Items/Forms/ItemForm/Module.bsl +++ b/IRP/src/Catalogs/Items/Forms/ItemForm/Module.bsl @@ -168,7 +168,6 @@ EndProcedure &AtClient Procedure Tree_RefreshData(Command) RefreshDetailsTreeAtServer(); - Tree_ExpandAll(Command); EndProcedure &AtClient diff --git a/IRP/src/Catalogs/LedgerTypes/ManagerModule.bsl b/IRP/src/Catalogs/LedgerTypes/ManagerModule.bsl index 566b54efb5..8653c82950 100644 --- a/IRP/src/Catalogs/LedgerTypes/ManagerModule.bsl +++ b/IRP/src/Catalogs/LedgerTypes/ManagerModule.bsl @@ -1,7 +1,7 @@ #Region RegularAccountingOperations -Function ProfitLostOffset(Company, LedgerType, Ref, Date) Export +Function ProfitLostOffset(Company, LedgerType, Ref, Date, DeletionMark, RegisterRecords) Export Query = New Query(); Query.Text = "SELECT @@ -65,6 +65,13 @@ Function ProfitLostOffset(Company, LedgerType, Ref, Date) Export EndIf; EndDo; + + RegisterRecords.Clear(); + AccountingServer.SetDataRegisterRecords(DataTable, LedgerType, RegisterRecords); + For Each Record In RegisterRecords Do + Record.Active = Not DeletionMark; + EndDo; + RegisterRecords.Write(); EndDo; Return DataTable; @@ -117,11 +124,7 @@ Function GetAccountBalance(Company, LedgerType, Ref, Date, Account, BalanceType, Query.SetParameter("LedgerType" , LedgerType); Query.SetParameter("Account" , Account); - If ValueIsFilled(Ref) Then - Query.SetParameter("BalancePeriod", New Boundary(Ref.PointInTime(), BoundaryType.Excluding)); - Else - Query.SetParameter("BalancePeriod", EndOfDay(Date)); - EndIf; + Query.SetParameter("BalancePeriod", New Boundary(Ref.PointInTime(), BoundaryType.Including)); QueryResult = Query.Execute(); QueryTable = QueryResult.Unload(); diff --git a/IRP/src/Catalogs/SerialLotNumbers/Forms/ItemForm/Form.form b/IRP/src/Catalogs/SerialLotNumbers/Forms/ItemForm/Form.form index 98622e07b9..e764e5f500 100644 --- a/IRP/src/Catalogs/SerialLotNumbers/Forms/ItemForm/Form.form +++ b/IRP/src/Catalogs/SerialLotNumbers/Forms/ItemForm/Form.form @@ -1499,7 +1499,7 @@ <key>tr</key> - <value>Related serial lot numbers</value> + <value>İlişkili seri lotlar</value> en @@ -1511,7 +1511,7 @@ tr - Group related serial lot numbers + Grup ilişkili seri lotlar GroupRelatedSerialLotNumbersExtendedTooltip @@ -1542,7 +1542,7 @@ tr - Related serial lot numbers + İlişkili seri lotlar true true diff --git a/IRP/src/Catalogs/SerialLotNumbers/SerialLotNumbers.mdo b/IRP/src/Catalogs/SerialLotNumbers/SerialLotNumbers.mdo index eb4b96e2a2..4e6fd77be7 100644 --- a/IRP/src/Catalogs/SerialLotNumbers/SerialLotNumbers.mdo +++ b/IRP/src/Catalogs/SerialLotNumbers/SerialLotNumbers.mdo @@ -543,7 +543,7 @@ tr - Related serial lot numbers + İlişkili seri lotlar SerialLotNumber diff --git a/IRP/src/Catalogs/UserGroups/Forms/ItemForm/Form.form b/IRP/src/Catalogs/UserGroups/Forms/ItemForm/Form.form index 7e8040e482..f5d134c9b4 100644 --- a/IRP/src/Catalogs/UserGroups/Forms/ItemForm/Form.form +++ b/IRP/src/Catalogs/UserGroups/Forms/ItemForm/Form.form @@ -244,6 +244,54 @@ true + + UsersRef + 33 + true + true + + + Users.Ref + + + UsersRefExtendedTooltip + 35 + true + true + + true + + Label + true + true + + Left + + + + UsersRefContextMenu + 34 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + UsersCommandBar 4 diff --git a/IRP/src/CommonAttributes/Author/Author.mdo b/IRP/src/CommonAttributes/Author/Author.mdo index 503c995642..06ba0be2cf 100644 --- a/IRP/src/CommonAttributes/Author/Author.mdo +++ b/IRP/src/CommonAttributes/Author/Author.mdo @@ -116,6 +116,10 @@ Document.ChequeBondTransaction Use + + Document.CalculationDeservedVacations + Use + Catalog.Users Use @@ -696,6 +700,10 @@ Document.FixedAssetTransfer Use + + Document.TaxesOperation + Use + DontUse DontUse DontUse diff --git a/IRP/src/CommonAttributes/Branch/Branch.mdo b/IRP/src/CommonAttributes/Branch/Branch.mdo index 2fbc01bd96..bd5eb24c63 100644 --- a/IRP/src/CommonAttributes/Branch/Branch.mdo +++ b/IRP/src/CommonAttributes/Branch/Branch.mdo @@ -357,6 +357,10 @@ Document.ForeignCurrencyRevaluation Use + + Document.TaxesOperation + Use + DontUse DontUse DontUse diff --git a/IRP/src/CommonAttributes/CreateDate/CreateDate.mdo b/IRP/src/CommonAttributes/CreateDate/CreateDate.mdo index dff2150ce5..de8cfdb5f2 100644 --- a/IRP/src/CommonAttributes/CreateDate/CreateDate.mdo +++ b/IRP/src/CommonAttributes/CreateDate/CreateDate.mdo @@ -117,6 +117,10 @@ Document.ChequeBondTransaction Use + + Document.CalculationDeservedVacations + Use + Catalog.Users Use @@ -149,6 +153,10 @@ Document.AdditionalCostAllocation Use + + Document.ExpenseAccruals + Use + Catalog.Countries Use @@ -481,6 +489,10 @@ Document.SalesOrderClosing Use + + Document.RevenueAccruals + Use + Document.RetailSalesReceipt Use @@ -697,6 +709,10 @@ Document.RevenueAccruals Use + + Document.TaxesOperation + Use + DontUse DontUse DontUse diff --git a/IRP/src/CommonAttributes/Description/Description.mdo b/IRP/src/CommonAttributes/Description/Description.mdo index 6a20afb640..c628b750ea 100644 --- a/IRP/src/CommonAttributes/Description/Description.mdo +++ b/IRP/src/CommonAttributes/Description/Description.mdo @@ -81,6 +81,10 @@ Document.ChequeBondTransaction Use + + Document.CalculationDeservedVacations + Use + Document.BatchReallocateIncoming Use @@ -137,6 +141,10 @@ Document.StockAdjustmentAsSurplus Use + + Document.TaxesOperation + Use + Document.EmployeeTransfer Use diff --git a/IRP/src/CommonAttributes/Editor/Editor.mdo b/IRP/src/CommonAttributes/Editor/Editor.mdo index 3f05962b00..d7146e167b 100644 --- a/IRP/src/CommonAttributes/Editor/Editor.mdo +++ b/IRP/src/CommonAttributes/Editor/Editor.mdo @@ -116,6 +116,10 @@ Document.ChequeBondTransaction Use + + Document.CalculationDeservedVacations + Use + Catalog.Users Use @@ -148,6 +152,10 @@ Document.AdditionalCostAllocation Use + + Document.ExpenseAccruals + Use + Catalog.Countries Use @@ -480,6 +488,10 @@ Document.SalesOrderClosing Use + + Document.RevenueAccruals + Use + Document.RetailSalesReceipt Use @@ -696,6 +708,10 @@ Document.RevenueAccruals Use + + Document.TaxesOperation + Use + DontUse DontUse DontUse diff --git a/IRP/src/CommonAttributes/ManualMovementsEdit/ManualMovementsEdit.mdo b/IRP/src/CommonAttributes/ManualMovementsEdit/ManualMovementsEdit.mdo index dd6f0bd121..3c6ed6be9a 100644 --- a/IRP/src/CommonAttributes/ManualMovementsEdit/ManualMovementsEdit.mdo +++ b/IRP/src/CommonAttributes/ManualMovementsEdit/ManualMovementsEdit.mdo @@ -72,6 +72,10 @@ Document.ChequeBondTransaction Use + + Document.CalculationDeservedVacations + Use + Document.BatchReallocateIncoming Use @@ -80,6 +84,10 @@ Document.AdditionalCostAllocation Use + + Document.ExpenseAccruals + Use + Document.SalesReturn Use @@ -244,6 +252,10 @@ Document.SalesOrderClosing Use + + Document.RevenueAccruals + Use + Document.RetailSalesReceipt Use @@ -368,6 +380,10 @@ Document.RevenueAccruals Use + + Document.TaxesOperation + Use + DontUse DontUse DontUse diff --git a/IRP/src/CommonAttributes/ModifyDate/ModifyDate.mdo b/IRP/src/CommonAttributes/ModifyDate/ModifyDate.mdo index cd82c2e54c..49e4b09063 100644 --- a/IRP/src/CommonAttributes/ModifyDate/ModifyDate.mdo +++ b/IRP/src/CommonAttributes/ModifyDate/ModifyDate.mdo @@ -117,6 +117,10 @@ Document.ChequeBondTransaction Use + + Document.CalculationDeservedVacations + Use + Catalog.Users Use @@ -149,6 +153,10 @@ Document.AdditionalCostAllocation Use + + Document.ExpenseAccruals + Use + Catalog.Countries Use @@ -481,6 +489,10 @@ Document.SalesOrderClosing Use + + Document.RevenueAccruals + Use + Document.RetailSalesReceipt Use @@ -697,6 +709,10 @@ Document.RevenueAccruals Use + + Document.TaxesOperation + Use + DontUse DontUse DontUse diff --git a/IRP/src/CommonAttributes/SourceNodeID/SourceNodeID.mdo b/IRP/src/CommonAttributes/SourceNodeID/SourceNodeID.mdo index 18e299f58d..39adc5e3a7 100644 --- a/IRP/src/CommonAttributes/SourceNodeID/SourceNodeID.mdo +++ b/IRP/src/CommonAttributes/SourceNodeID/SourceNodeID.mdo @@ -111,6 +111,10 @@ Document.ChequeBondTransaction Use + + Document.CalculationDeservedVacations + Use + Catalog.Users Use @@ -127,6 +131,10 @@ Document.AdditionalCostAllocation Use + + Document.ExpenseAccruals + Use + Catalog.Countries Use @@ -423,6 +431,10 @@ Document.SalesOrderClosing Use + + Document.RevenueAccruals + Use + Document.RetailSalesReceipt Use @@ -627,6 +639,10 @@ Document.RevenueAccruals Use + + Document.TaxesOperation + Use + DontUse DontUse DontUse diff --git a/IRP/src/CommonForms/AttachFile/Form.form b/IRP/src/CommonForms/AttachFile/Form.form index 96ce45f89b..f422a60bbb 100644 --- a/IRP/src/CommonForms/AttachFile/Form.form +++ b/IRP/src/CommonForms/AttachFile/Form.form @@ -316,6 +316,43 @@ FileListContextMenu 3 + + FileListContextMenuDeleteFile + 52 + true + true + + + true + Role.FullAccess + + + true + Role.AttachedFilesDelete + + + + FileListContextMenuDeleteFileExtendedTooltip + 53 + true + true + + true + + Label + true + true + + Left + + + Form.Command.DeleteFiles + Auto + true + true + UserCmds + Auto + true true @@ -324,6 +361,7 @@ true HierarchicalList + true true true true @@ -770,6 +808,35 @@ Auto + + DeleteFiles + + <key>en</key> + <value>Delete files</value> + + + <key>ru</key> + <value>Удаление файлов</value> + + + <key>tr</key> + <value>Dosyaları sil</value> + + 2 + + true + + + StdPicture.Delete + + + + DeleteSelectedFiles + + + TextPicture + Auto + Owner diff --git a/IRP/src/CommonForms/AttachFile/Module.bsl b/IRP/src/CommonForms/AttachFile/Module.bsl index 2e1f5affdd..1cbad8a324 100644 --- a/IRP/src/CommonForms/AttachFile/Module.bsl +++ b/IRP/src/CommonForms/AttachFile/Module.bsl @@ -1,3 +1,4 @@ + &AtServer Procedure OnCreateAtServer(Cancel, StandardProcessing) Owner = Parameters.Owner; @@ -64,4 +65,35 @@ EndProcedure &AtServer Function CreatePictureParameters(File) Return PictureViewerServer.CreatePictureParameters(File); -EndFunction \ No newline at end of file +EndFunction + +&AtClient +Procedure DeleteSelectedFiles(Command) + If Items.FileList.CurrentData = Undefined Then + Return; + EndIf; + + FileKeys = New Array; + For Each SelectedRow In Items.FileList.SelectedRows Do + FileKeys.Add(SelectedRow); + EndDo; + + DeleteFilesAtServer(FileKeys); + Items.FileList.Refresh(); +EndProcedure + +&AtServerNoContext +Procedure DeleteFilesAtServer(FileKeys) + + RecordManager = InformationRegisters.AttachedFiles.CreateRecordManager(); + + For Each FileKey In FileKeys Do + RecordManager.Owner = FileKey.Owner; + RecordManager.File = FileKey.File; + RecordManager.Read(); + If RecordManager.Selected() Then + RecordManager.Delete(); + EndIf; + EndDo; + +EndProcedure \ No newline at end of file diff --git a/IRP/src/CommonModules/AccountingClient/Module.bsl b/IRP/src/CommonModules/AccountingClient/Module.bsl index ddffddca33..945a5d4afd 100644 --- a/IRP/src/CommonModules/AccountingClient/Module.bsl +++ b/IRP/src/CommonModules/AccountingClient/Module.bsl @@ -57,8 +57,64 @@ Procedure EditAccounting(Result, AdditionalParameters) Export DebitType = PredefinedValue("Enum.AccountingAnalyticTypes.Debit"); CreditType = PredefinedValue("Enum.AccountingAnalyticTypes.Credit"); - Form.AccountingRowAnalytics.Clear(); - Form.AccountingExtDimensions.Clear(); + ArrayForDelete_Analytics = New Array(); + ArrayForDelete_Dimensions = New Array(); + + ProcessedKeys = New Array(); + + For Each Row In Result.AccountingAnalytics Do + If ProcessedKeys.Find(Row.Key) <> Undefined Then + Continue; + EndIf; + + If ValueIsFilled(Row.Key) Then + ProcessedKeys.Add(Row.Key); + + For Each Row_Analytics In Form.AccountingRowAnalytics Do + If Row_Analytics.Key = Row.Key Then + ArrayForDelete_Analytics.Add(Row_Analytics); + EndIf; + EndDo; + + For Each Row_Dimensions In Form.AccountingExtDimensions Do + If Row_Dimensions.Key = Row.Key Then + ArrayForDelete_Dimensions.Add(Row_Dimensions); + EndIf; + EndDo; + + EndIf; + EndDo; + + For Each ArrayItem In ArrayForDelete_Analytics Do + Form.AccountingRowAnalytics.Delete(ArrayItem); + EndDo; + + For Each ArrayItem In ArrayForDelete_Dimensions Do + Form.AccountingExtDimensions.Delete(ArrayItem); + EndDo; + + ArrayForDelete_Analytics.Clear(); + ArrayForDelete_Dimensions.Clear(); + + For Each Row In Form.AccountingRowAnalytics Do + If Not ValueIsFilled(Row.Key) Then + ArrayForDelete_Analytics.Add(Row); + EndIf; + EndDo; + + For Each ArrayItem In ArrayForDelete_Analytics Do + Form.AccountingRowAnalytics.Delete(ArrayItem); + EndDo; + + For Each Row In Form.AccountingExtDimensions Do + If Not ValueIsFilled(Row.Key) Then + ArrayForDelete_Dimensions.Add(Row); + EndIf; + EndDo; + + For Each ArrayItem In ArrayForDelete_Dimensions Do + Form.AccountingExtDimensions.Delete(ArrayItem); + EndDo; For Each Row In Result.AccountingAnalytics Do NewRow = Form.AccountingRowAnalytics.Add(); diff --git a/IRP/src/CommonModules/AccountingClientServer/Module.bsl b/IRP/src/CommonModules/AccountingClientServer/Module.bsl index 95bd6ccafa..1fdef3a4c6 100644 --- a/IRP/src/CommonModules/AccountingClientServer/Module.bsl +++ b/IRP/src/CommonModules/AccountingClientServer/Module.bsl @@ -90,7 +90,7 @@ Function GetDocumentMainTable(Doc) Export ElsIf CommonFunctionsClientServer.ObjectHasProperty(Doc, "Calculations") Then MainTable = "Calculations"; ElsIf CommonFunctionsClientServer.ObjectHasProperty(Doc, "CostList") Then - MainTable = "CostList"; + MainTable = "CostList"; EndIf; Return MainTable; EndFunction diff --git a/IRP/src/CommonModules/AccountingServer/Module.bsl b/IRP/src/CommonModules/AccountingServer/Module.bsl index c2fe512a59..0dcf899cf6 100644 --- a/IRP/src/CommonModules/AccountingServer/Module.bsl +++ b/IRP/src/CommonModules/AccountingServer/Module.bsl @@ -114,6 +114,8 @@ Function GetOperationsDefinition() Map.Insert(AO.DebitNote_DR_R2021B_CustomersTransactions_CR_R5021_Revenues , New Structure("ByRow", True)); Map.Insert(AO.DebitNote_DR_R5015B_OtherPartnersTransactions_CR_R5021_Revenues , New Structure("ByRow", True)); Map.Insert(AO.DebitNote_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransactions , New Structure("ByRow", True)); + Map.Insert(AO.DebitNote_DR_R1021B_VendorsTransactions_CR_R2040B_TaxesIncoming , New Structure("ByRow", True)); + Map.Insert(AO.DebitNote_DR_R2021B_CustomersTransactions_CR_R2040B_TaxesIncoming , New Structure("ByRow", True)); // Credit note Map.Insert(AO.CreditNote_DR_R5022T_Expenses_CR_R2021B_CustomersTransactions , New Structure("ByRow", True)); @@ -121,6 +123,8 @@ Function GetOperationsDefinition() Map.Insert(AO.CreditNote_DR_R1021B_VendorsTransactions_CR_R1020B_AdvancesToVendors , New Structure("ByRow", True)); Map.Insert(AO.CreditNote_DR_R5022T_Expenses_CR_R1021B_VendorsTransactions , New Structure("ByRow", True)); Map.Insert(AO.CreditNote_DR_R5022T_Expenses_CR_R5015B_OtherPartnersTransactions , New Structure("ByRow", True)); + Map.Insert(AO.CreditNote_DR_R1040B_TaxesOutgoing_CR_R1021B_VendorsTransactions , New Structure("ByRow", True)); + Map.Insert(AO.CreditNote_DR_R1040B_TaxesOutgoing_CR_R2021B_CustomersTransactions , New Structure("ByRow", True)); // Purchase invoice // receipt inventory @@ -141,7 +145,7 @@ Function GetOperationsDefinition() Map.Insert(AO.SalesInvoice_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransactions, New Structure("ByRow, TransactionType", False, Enums.SalesTransactionTypes.Sales)); - Map.Insert(AO.SalesInvoice_DR_R5021T_Revenues_CR_R2040B_TaxesIncoming, + Map.Insert(AO.SalesInvoice_DR_R2021B_CustomersTransactions_CR_R2040B_TaxesIncoming, New Structure("ByRow, TransactionType", True, Enums.SalesTransactionTypes.Sales)); Map.Insert(AO.SalesInvoice_DR_R5022T_Expenses_CR_R4050B_StockInventory, New Structure("ByRow, TransactionType", True, Enums.SalesTransactionTypes.Sales)); @@ -180,6 +184,12 @@ Function GetOperationsDefinition() Map.Insert(AO.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R8510B_BookValueOfFixedAsset, New Structure("ByRow, RequestTable", True, True)); Map.Insert(AO.ForeignCurrencyRevaluation_DR_R8510B_BookValueOfFixedAsset_CR_R5021T_Revenues, New Structure("ByRow, RequestTable", True, True)); + Map.Insert(AO.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R1040B_TaxesOutgoing, New Structure("ByRow, RequestTable", True, True)); + Map.Insert(AO.ForeignCurrencyRevaluation_DR_R1040B_TaxesOutgoing_CR_R5021T_Revenues, New Structure("ByRow, RequestTable", True, True)); + + Map.Insert(AO.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R2040B_TaxesIncoming, New Structure("ByRow, RequestTable", True, True)); + Map.Insert(AO.ForeignCurrencyRevaluation_DR_R2040B_TaxesIncoming_CR_R5021T_Revenues, New Structure("ByRow, RequestTable", True, True)); + // Money transfer Map.Insert(AO.MoneyTransfer_DR_R3010B_CashOnHand_CR_R3010B_CashOnHand , New Structure("ByRow", False)); Map.Insert(AO.MoneyTransfer_DR_R3010B_CashOnHand_CR_R3021B_CashInTransit , New Structure("ByRow", False)); @@ -215,6 +225,8 @@ Function GetOperationsDefinition() Map.Insert(AO.DebitCreditNote_R5020B_PartnersBalance, New Structure("ByRow", False)); Map.Insert(AO.DebitCreditNote_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransactions_Offset, New Structure("ByRow", False)); Map.Insert(AO.DebitCreditNote_DR_R1021B_VendorsTransactions_CR_R1020B_AdvancesToVendors_Offset, New Structure("ByRow", False)); + Map.Insert(AO.DebitCreditNote_DR_R5020B_PartnersBalance_CR_R5021_Revenues, New Structure("ByRow", False)); + Map.Insert(AO.DebitCreditNote_DR_R5022T_Expenses_CR_R5020B_PartnersBalance, New Structure("ByRow", False)); ArrayOfAccrualsTransactionTypes = New Array(); ArrayOfAccrualsTransactionTypes.Add(Enums.AccrualsTransactionType.Accrual); @@ -231,6 +243,7 @@ Function GetOperationsDefinition() // Employee cash advance Map.Insert(AO.EmployeeCashAdvance_DR_R5022T_Expenses_CR_R3027B_EmployeeCashAdvance, New Structure("ByRow", True)); Map.Insert(AO.EmployeeCashAdvance_DR_R1021B_VendorsTransactions_CR_R3027B_EmployeeCashAdvance, New Structure("ByRow", True)); + Map.Insert(AO.EmployeeCashAdvance_DR_R1040B_TaxesOutgoing_CR_R3027B_EmployeeCashAdvance, New Structure("ByRow", True)); // Sales return Map.Insert(AO.SalesReturn_DR_R2021B_CustomersTransactions_CR_R2020B_AdvancesFromCustomers, @@ -239,7 +252,7 @@ Function GetOperationsDefinition() Map.Insert(AO.SalesReturn_DR_R5021T_Revenues_CR_R2021B_CustomersTransactions, New Structure("ByRow, TransactionType", True, Enums.SalesReturnTransactionTypes.ReturnFromCustomer)); - Map.Insert(AO.SalesReturn_DR_R5021T_Revenues_CR_R1040B_TaxesOutgoing, + Map.Insert(AO.SalesReturn_DR_R1040B_TaxesOutgoing_CR_R2021B_CustomersTransactions, New Structure("ByRow, TransactionType", True, Enums.SalesReturnTransactionTypes.ReturnFromCustomer)); Map.Insert(AO.SalesReturn_DR_R5022T_Expenses_CR_R4050B_StockInventory, @@ -252,8 +265,26 @@ Function GetOperationsDefinition() Map.Insert(AO.PurchaseReturn_DR_R1021B_VendorsTransactions_CR_R4050B_StockInventory, New Structure("ByRow, TransactionType", True, Enums.PurchaseReturnTransactionTypes.ReturnToVendor)); - Map.Insert(AO.PurchaseReturn_DR_R2040B_TaxesIncoming_CR_R1021B_VendorsTransactions, + Map.Insert(AO.PurchaseReturn_DR_R1021B_VendorsTransactions_CR_R2040B_TaxesIncoming, New Structure("ByRow, TransactionType", True, Enums.PurchaseReturnTransactionTypes.ReturnToVendor)); + + // Taxes operation + ArrayOfTaxesOperationTransactionTypes_Offset = New Array(); + ArrayOfTaxesOperationTransactionTypes_Offset.Add(Enums.TaxesOperationTransactionType.TaxOffsetAndPayment); + ArrayOfTaxesOperationTransactionTypes_Offset.Add(Enums.TaxesOperationTransactionType.TaxOffset); + + Map.Insert(AO.TaxesOperation_DR_R2040B_TaxesIncoming_CR_R1040B_TaxesOutgoing, + New Structure("ByRow, TransactionType", True, ArrayOfTaxesOperationTransactionTypes_Offset)); + + ArrayOfTaxesOperationTransactionTypes_Payment = New Array(); + ArrayOfTaxesOperationTransactionTypes_Payment.Add(Enums.TaxesOperationTransactionType.TaxOffsetAndPayment); + ArrayOfTaxesOperationTransactionTypes_Payment.Add(Enums.TaxesOperationTransactionType.TaxPayment); + + Map.Insert(AO.TaxesOperation_DR_R2040B_TaxesIncoming_CR_R5015B_OtherPartnersTransactions, + New Structure("ByRow, TransactionType", True, ArrayOfTaxesOperationTransactionTypes_Payment)); + + Map.Insert(AO.TaxesOperation_DR_R5015B_OtherPartnersTransactions_CR_R1040B_TaxesOutgoing, + New Structure("ByRow, TransactionType", True, ArrayOfTaxesOperationTransactionTypes_Payment)); Return Map; EndFunction @@ -389,7 +420,10 @@ Function GetDataByAccountingAnalytics(BasisRef, AnalyticRow) Export Parameters.Insert("CurrencyMovementType", AnalyticRow.LedgerType.CurrencyMovementType); Parameters.Insert("IsCurrencyRevaluation", TypeOf(BasisRef) = Type("DocumentRef.ForeignCurrencyRevaluation")); - + Parameters.Insert("IsDebitCreditNoteDifference", + AnalyticRow.Operation = Catalogs.AccountingOperations.DebitCreditNote_DR_R5020B_PartnersBalance_CR_R5021_Revenues + Or AnalyticRow.Operation = Catalogs.AccountingOperations.DebitCreditNote_DR_R5022T_Expenses_CR_R5020B_PartnersBalance); + Data = GetAccountingData(Parameters); Result = GetAccountingDataResult(); @@ -1006,7 +1040,9 @@ Function __GetT9013S_AccountsTax(Period, Company, LedgerTypeVariant, Tax, VatRat | ByVatRate.Tax, | ByVatRate.VatRate, | ByVatRate.IncomingAccount, + | ByVatRate.IncomingAccountReturn, | ByVatRate.OutgoingAccount, + | ByVatRate.OutgoingAccountReturn, | 0 AS Priority |INTO Accounts |FROM @@ -1022,7 +1058,9 @@ Function __GetT9013S_AccountsTax(Period, Company, LedgerTypeVariant, Tax, VatRat | ByTax.Tax, | ByTax.VatRate, | ByTax.IncomingAccount, + | ByTax.IncomingAccountReturn, | ByTax.OutgoingAccount, + | ByTax.OutgoingAccountReturn, | 1 |FROM | InformationRegister.T9013S_AccountsTax.SliceLast(&Period, Company = &Company @@ -1037,7 +1075,9 @@ Function __GetT9013S_AccountsTax(Period, Company, LedgerTypeVariant, Tax, VatRat | ByCompany.Tax, | ByCompany.VatRate, | ByCompany.IncomingAccount, + | ByCompany.IncomingAccountReturn, | ByCompany.OutgoingAccount, + | ByCompany.OutgoingAccountReturn, | 2 |FROM | InformationRegister.T9013S_AccountsTax.SliceLast(&Period, Company = &Company @@ -1052,7 +1092,9 @@ Function __GetT9013S_AccountsTax(Period, Company, LedgerTypeVariant, Tax, VatRat | Accounts.Tax, | Accounts.VatRate, | Accounts.IncomingAccount, + | Accounts.IncomingAccountReturn, | Accounts.OutgoingAccount, + | Accounts.OutgoingAccountReturn, | Accounts.Priority AS Priority |FROM | Accounts AS Accounts @@ -1066,10 +1108,12 @@ Function __GetT9013S_AccountsTax(Period, Company, LedgerTypeVariant, Tax, VatRat Query.SetParameter("VatRate" , VatRate); QueryResult = Query.Execute(); QuerySelection = QueryResult.Select(); - Result = New Structure("IncomingAccount, OutgoingAccount", Undefined, Undefined); + Result = New Structure("IncomingAccount, OutgoingAccount, IncomingAccountReturn, OutgoingAccountReturn"); If QuerySelection.Next() Then Result.IncomingAccount = QuerySelection.IncomingAccount; + Result.IncomingAccountReturn = QuerySelection.IncomingAccountReturn; Result.OutgoingAccount = QuerySelection.OutgoingAccount; + Result.OutgoingAccountReturn = QuerySelection.OutgoingAccountReturn; EndIf; Return Result; EndFunction @@ -1527,6 +1571,11 @@ Procedure UpdateAccountingTables(Object, Continue; EndIf; + If IsNotUsedOperation(Operation.OperationInfo.Operation, ObjectData, Undefined) Then + AddNotUsedOperation(ArrayOfNotUsedOperations, Operation.OperationInfo.Operation, Undefined); + Continue; + EndIf; + Parameters = New Structure(); Parameters.Insert("Object" , Object); Parameters.Insert("Operation" , Operation.OperationInfo.Operation); @@ -1542,7 +1591,7 @@ Procedure UpdateAccountingTables(Object, FillAccountingRowAnalytics(Parameters); EndDo; - If MainTableName = Undefined Then + If MainTableName = Undefined Then // reques table For Each Operation In OperationsByLedgerType Do If Not Operation.OperationInfo.RequestTable Then Continue; @@ -1616,6 +1665,14 @@ Function IsNotUsedOperation(Operation, ObjectData, RowData) Return IsNotUsedOperation_CreditNote(Operation, ObjectData, RowData); ElsIf DocMetadata = Metadata.Documents.DebitNote Then Return IsNotUsedOperation_DebitNote(Operation, ObjectData, RowData); + ElsIf DocMetadata = Metadata.Documents.DebitCreditNote Then + Return IsNotUsedOperation_DebitCreditNote(Operation, ObjectData, RowData); + ElsIf DocMetadata = Metadata.Documents.TaxesOperation Then + Return IsNotUsedOperation_TaxesOperation(Operation, ObjectData, RowData); + ElsIf DocMetadata = Metadata.Documents.Payroll Then + Return IsNotUsedOperation_Payroll(Operation, ObjectData, RowData); + ElsIf DocMetadata = Metadata.Documents.EmployeeCashAdvance Then + Return IsNotUsedOperation_EmployeeCashAdvance(Operation, ObjectData, RowData); EndIf; Return False; // is used operation @@ -1662,7 +1719,7 @@ Function GetDocumentData(Object, TableRow, MainTableName) TaxInfo.Insert("VatRate", TableRow.VatRate); Result.RowData.Insert("TaxInfo", TaxInfo); EndIf; - + Else Result.RowData.Insert("Key", ""); EndIf; @@ -2101,8 +2158,45 @@ Function GetAccountingData(Parameters) Query = New Query(); Query.Text = "SELECT - | case when &IsRevaluationCurrency then Amounts.RevaluatedCurrency else Amounts.Currency end as Currency, - | SUM(case when &IsRevaluationCurrency then 0 else Amounts.Amount end) AS Amount + | case + | when &IsRevaluationCurrency then + | Amounts.RevaluatedCurrency + | else + | case when not Amounts.DrCurrency.ref is null then + | Amounts.DrCurrency + | else + | Amounts.Currency end end as DrCurrency, + | + | case + | when &IsRevaluationCurrency then + | Amounts.RevaluatedCurrency + | else + | case when not Amounts.CrCurrency.ref is null then + | Amounts.CrCurrency + | else + | Amounts.Currency end end as CrCurrency, + | + | + | SUM(case + | when &IsRevaluationCurrency Or &IsDebitCreditNoteDifference then + | 0 + | else + | case when Amounts.DrCurrencyAmount <> 0 then + | Amounts.DrCurrencyAmount + | else + | Amounts.Amount end end) AS DrCurrencyAmount, + | + | SUM(case + | when &IsRevaluationCurrency Or &IsDebitCreditNoteDifference then + | 0 + | else + | case when Amounts.CrCurrencyAmount <> 0 then + | Amounts.CrCurrencyAmount + | else + | Amounts.Amount end end) AS CrCurrencyAmount + | + | + | |FROM | AccumulationRegister.T1040T_AccountingAmounts AS Amounts |WHERE @@ -2115,7 +2209,23 @@ Function GetAccountingData(Parameters) | else True | end |GROUP BY - | case when &IsRevaluationCurrency then Amounts.RevaluatedCurrency else Amounts.Currency end + | case + | when &IsRevaluationCurrency then + | Amounts.RevaluatedCurrency + | else + | case when not Amounts.DrCurrency.ref is null then + | Amounts.DrCurrency + | else + | Amounts.Currency end end, + | + | case + | when &IsRevaluationCurrency then + | Amounts.RevaluatedCurrency + | else + | case when not Amounts.CrCurrency.ref is null then + | Amounts.CrCurrency + | else + | Amounts.Currency end end |; | |//////////////////////////////////////////////////////////////////////////////// @@ -2161,6 +2271,7 @@ Function GetAccountingData(Parameters) Query.SetParameter("Operation" , Parameters.Operation); Query.SetParameter("FilterByRowKey" , ValueIsFilled(RowKey)); Query.SetParameter("RowKey" , RowKey); + Query.SetParameter("IsDebitCreditNoteDifference", Parameters.IsDebitCreditNoteDifference); If Parameters.IsCurrencyRevaluation Then Query.SetParameter("RevaluationCurrency", Parameters.CurrencyMovementType); @@ -2169,7 +2280,7 @@ Function GetAccountingData(Parameters) Query.SetParameter("RevaluationCurrency", ChartsOfCharacteristicTypes.CurrencyMovementType.SettlementCurrency); Query.SetParameter("IsRevaluationCurrency", False); EndIf; - + QueryResults = Query.ExecuteBatch(); Result = GetAccountingDataResult(); @@ -2177,10 +2288,10 @@ Function GetAccountingData(Parameters) // Currency amount QuerySelection = QueryResults[0].Select(); If QuerySelection.Next() Then - Result.CurrencyDr = QuerySelection.Currency; - Result.CurrencyAmountDr = QuerySelection.Amount; - Result.CurrencyCr = QuerySelection.Currency; - Result.CurrencyAmountCr = QuerySelection.Amount; + Result.CurrencyDr = QuerySelection.DrCurrency; + Result.CurrencyAmountDr = QuerySelection.DrCurrencyAmount; + Result.CurrencyCr = QuerySelection.CrCurrency; + Result.CurrencyAmountCr = QuerySelection.CrCurrencyAmount; EndIf; // Amount @@ -2411,6 +2522,10 @@ Function IsNotUsedOperation_CreditNote(Operation, ObjectData, RowData) Return False; ElsIf IsOther And Operation = AO.CreditNote_DR_R5022T_Expenses_CR_R5015B_OtherPartnersTransactions Then Return False; + ElsIf IsVendor And Operation = AO.CreditNote_DR_R1040B_TaxesOutgoing_CR_R1021B_VendorsTransactions Then + Return Not ValueIsFilled(RowData.TaxAmount); + ElsIf IsCustomer And Operation = AO.CreditNote_DR_R1040B_TaxesOutgoing_CR_R2021B_CustomersTransactions Then + Return Not ValueIsFilled(RowData.TaxAmount); EndIf; Return True; EndFunction @@ -2439,7 +2554,102 @@ Function IsNotUsedOperation_DebitNote(Operation, ObjectData, RowData) Return False; ElsIf IsOther And Operation = AO.DebitNote_DR_R5015B_OtherPartnersTransactions_CR_R5021_Revenues Then Return False; + ElsIf IsVendor And Operation = AO.DebitNote_DR_R1021B_VendorsTransactions_CR_R2040B_TaxesIncoming Then + Return Not ValueIsFilled(RowData.TaxAmount); + ElsIf IsCustomer And Operation = AO.DebitNote_DR_R2021B_CustomersTransactions_CR_R2040B_TaxesIncoming Then + Return Not ValueIsFilled(RowData.TaxAmount); + EndIf; + Return True; +EndFunction + +Function IsNotUsedOperation_DebitCreditNote(Operation, ObjectData, RowData) + AO = Catalogs.AccountingOperations; + + If Operation = AO.DebitCreditNote_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransactions_Offset Then + If ObjectData.ReceiveDebtType = Enums.DebtTypes.AdvanceCustomer + Or ObjectData.ReceiveDebtType = Enums.DebtTypes.TransactionCustomer Then + Return False; + EndIf; + Return True; + ElsIf Operation = AO.DebitCreditNote_DR_R1021B_VendorsTransactions_CR_R1020B_AdvancesToVendors_Offset Then + If ObjectData.ReceiveDebtType = Enums.DebtTypes.AdvanceVendor + Or ObjectData.ReceiveDebtType = Enums.DebtTypes.TransactionVendor Then + Return False; + EndIf; + Return True; + EndIf; + + Return False; +EndFunction + +Function IsNotUsedOperation_TaxesOperation(Operation, ObjectData, RowData) + AO = Catalogs.AccountingOperations; + If RowData = Undefined Then + Return True; EndIf; + + If Operation = AO.TaxesOperation_DR_R2040B_TaxesIncoming_CR_R1040B_TaxesOutgoing Then + If ValueIsFilled(RowData.IncomingVatRate) And ValueIsFilled(RowData.OutgoingVatRate) Then + Return False; + Else + Return True; + EndIf; + ElsIf Operation = AO.TaxesOperation_DR_R2040B_TaxesIncoming_CR_R5015B_OtherPartnersTransactions Then + If ValueIsFilled(RowData.IncomingVatRate) And Not ValueIsFilled(RowData.OutgoingVatRate) Then + Return False; + Else + Return True; + EndIf; + ElsIf Operation = AO.TaxesOperation_DR_R5015B_OtherPartnersTransactions_CR_R1040B_TaxesOutgoing Then + If Not ValueIsFilled(RowData.IncomingVatRate) And ValueIsFilled(RowData.OutgoingVatRate) Then + Return False; + Else + Return True; + EndIf; + EndIf; + Return True; +EndFunction + +Function IsNotUsedOperation_Payroll(Operation, ObjectData, RowData) + AO = Catalogs.AccountingOperations; + If RowData = Undefined Then + Return True; + EndIf; + + If Operation = AO.Payroll_DR_R9510B_SalaryPayment_CR_R5015B_OtherPartnersTransactions_Taxes Then + If ValueIsFilled(RowData.Tax) And RowData.Tax.TaxPayer <> Enums.TaxPayers.Employee Then + Return True; + Else + Return False; + EndIf; + ElsIf Operation = AO.Payroll_DR_R5022T_Expenses_CR_R5015B_OtherPartnersTransactions_Taxes Then + If ValueIsFilled(RowData.Tax) And RowData.Tax.TaxPayer <> Enums.TaxPayers.Company Then + Return True; + Else + Return False; + EndIf; + EndIf; + Return False; +EndFunction + +Function IsNotUsedOperation_EmployeeCashAdvance(Operation, ObjectData, RowData) + AO = Catalogs.AccountingOperations; + If RowData = Undefined Then + Return True; + EndIf; + If Operation = AO.EmployeeCashAdvance_DR_R5022T_Expenses_CR_R3027B_EmployeeCashAdvance Then + If Not ValueIsFilled(RowData.Invoice) Then + Return False; + EndIf; + ElsIf Operation = AO.EmployeeCashAdvance_DR_R1040B_TaxesOutgoing_CR_R3027B_EmployeeCashAdvance Then + If Not ValueIsFilled(RowData.Invoice) Then + Return False; + EndIf; + ElsIf Operation = AO.EmployeeCashAdvance_DR_R1021B_VendorsTransactions_CR_R3027B_EmployeeCashAdvance Then + If ValueIsFilled(RowData.Invoice) Then + Return False; + EndIf; + EndIf; Return True; EndFunction diff --git a/IRP/src/CommonModules/AdditionalDocumentTableControl/Module.bsl b/IRP/src/CommonModules/AdditionalDocumentTableControl/Module.bsl index 08c00c6967..eee082360c 100644 --- a/IRP/src/CommonModules/AdditionalDocumentTableControl/Module.bsl +++ b/IRP/src/CommonModules/AdditionalDocumentTableControl/Module.bsl @@ -209,35 +209,36 @@ EndFunction Function CheckDocumentsResult(Document, DocName) Result = AdditionalDocumentTableControlReuse.GetQuery(DocName); - Query = New Query(Result.Query); - Query.SetParameter("Headers", GetHeaderTable(Document)); - - If Result.Tables.ItemList = Undefined Then - Result.Tables.ItemList = Document.ItemList.Unload(); - EndIf; - If Result.Tables.RowIDInfo = Undefined Then - Result.Tables.RowIDInfo = Document.RowIDInfo.Unload(); - EndIf; - If Result.Tables.SpecialOffers = Undefined Then - Result.Tables.SpecialOffers = Document.SpecialOffers.Unload(); - EndIf; - If Result.Tables.SerialLotNumbers = Undefined Then - Result.Tables.SerialLotNumbers = Document.SerialLotNumbers.Unload(); - EndIf; - If Result.Tables.SourceOfOrigins = Undefined Then - Result.Tables.SourceOfOrigins = Document.SourceOfOrigins.Unload(); - EndIf; - If Result.Tables.Payments = Undefined Then - Result.Tables.Payments = Document.Payments.Unload(); - EndIf; - If Result.Tables.PaymentList = Undefined Then - Result.Tables.PaymentList = Document.PaymentList.Unload(); - EndIf; - + EmptyTable = New ValueTable(); + + Tables = New Structure; + Tables.Insert("ItemList", EmptyTable); + Tables.Insert("RowIDInfo", EmptyTable); + Tables.Insert("SpecialOffers", EmptyTable); + Tables.Insert("SerialLotNumbers", EmptyTable); + Tables.Insert("SourceOfOrigins", EmptyTable); + Tables.Insert("Payments", EmptyTable); + Tables.Insert("PaymentList", EmptyTable); + + Tables.ItemList = + ?(Result.Tables.ItemList = Undefined, Document.ItemList.Unload(), Result.Tables.ItemList); + Tables.RowIDInfo = + ?(Result.Tables.RowIDInfo = Undefined, Document.RowIDInfo.Unload(), Result.Tables.RowIDInfo); + Tables.SpecialOffers = + ?(Result.Tables.SpecialOffers = Undefined, Document.SpecialOffers.Unload(), Result.Tables.SpecialOffers); + Tables.SerialLotNumbers = + ?(Result.Tables.SerialLotNumbers = Undefined, Document.SerialLotNumbers.Unload(), Result.Tables.SerialLotNumbers); + Tables.SourceOfOrigins = + ?(Result.Tables.SourceOfOrigins = Undefined, Document.SourceOfOrigins.Unload(), Result.Tables.SourceOfOrigins); + Tables.Payments = + ?(Result.Tables.Payments = Undefined, Document.Payments.Unload(), Result.Tables.Payments); + Tables.PaymentList = + ?(Result.Tables.PaymentList = Undefined, Document.PaymentList.Unload(), Result.Tables.PaymentList); + TypeDescriptionArray = New Array; // Array of Type TypeDescriptionArray.Add(TypeOf(Document.Ref)); RefTypeDescription = New TypeDescription(TypeDescriptionArray); - For Each TableKeyValue In Result.Tables Do + For Each TableKeyValue In Tables Do CurrentTable = TableKeyValue.Value; // ValueTable If CurrentTable <> Undefined And CurrentTable.Columns.Find("Ref") = Undefined Then CurrentTable.Columns.Add("Ref", RefTypeDescription); @@ -247,13 +248,15 @@ Function CheckDocumentsResult(Document, DocName) EndIf; EndDo; - Query.SetParameter("ItemList", Result.Tables.ItemList); - Query.SetParameter("RowIDInfo", Result.Tables.RowIDInfo); - Query.SetParameter("SpecialOffers", Result.Tables.SpecialOffers); - Query.SetParameter("SerialLotNumbers", Result.Tables.SerialLotNumbers); - Query.SetParameter("SourceOfOrigins", Result.Tables.SourceOfOrigins); - Query.SetParameter("Payments", Result.Tables.Payments); - Query.SetParameter("PaymentList", Result.Tables.PaymentList); + Query = New Query(Result.Query); + Query.SetParameter("Headers", GetHeaderTable(Document)); + Query.SetParameter("ItemList", Tables.ItemList); + Query.SetParameter("RowIDInfo", Tables.RowIDInfo); + Query.SetParameter("SpecialOffers", Tables.SpecialOffers); + Query.SetParameter("SerialLotNumbers", Tables.SerialLotNumbers); + Query.SetParameter("SourceOfOrigins", Tables.SourceOfOrigins); + Query.SetParameter("Payments", Tables.Payments); + Query.SetParameter("PaymentList", Tables.PaymentList); Return Query.ExecuteBatch(); EndFunction diff --git a/IRP/src/CommonModules/CatPartnersServer/Module.bsl b/IRP/src/CommonModules/CatPartnersServer/Module.bsl index aef9530d9c..1eaddf5161 100644 --- a/IRP/src/CommonModules/CatPartnersServer/Module.bsl +++ b/IRP/src/CommonModules/CatPartnersServer/Module.bsl @@ -37,4 +37,41 @@ Function GetPartnersByCompanies(CompaniesArray) Export Return ReturnValue; +EndFunction + +Function GetChoiceListForDocument(DocumentName, Company, TransactionType) Export + + Query = New Query; + Query.Text = + "SELECT DISTINCT TOP 10 ALLOWED + | DocTable.Partner, + | MAX(DocTable.Date) AS Date + |FROM + | Document.SalesOrder AS DocTable + |WHERE + | &Condition + |GROUP BY + | DocTable.Partner + | + |ORDER BY + | Date DESC"; + + ConditionText = "(Author = &User OR Editor = &User)"; + Query.SetParameter("User", SessionParameters.CurrentUser); + + If ValueIsFilled(Company) Then + ConditionText = ConditionText + " AND Company = &Company"; + Query.SetParameter("Company", Company); + EndIf; + + If ValueIsFilled(TransactionType) Then + ConditionText = ConditionText + " AND TransactionType = &TransactionType"; + Query.SetParameter("TransactionType", TransactionType); + EndIf; + + Query.Text = StrReplace(Query.Text, "&Condition", ConditionText); + Query.Text = StrReplace(Query.Text, "SalesOrder", DocumentName); + + Return Query.Execute().Unload().UnloadColumn("Partner"); + EndFunction \ No newline at end of file diff --git a/IRP/src/CommonModules/CommonFunctionsClientServer/Module.bsl b/IRP/src/CommonModules/CommonFunctionsClientServer/Module.bsl index e787c0ffbd..f59ed4db16 100644 --- a/IRP/src/CommonModules/CommonFunctionsClientServer/Module.bsl +++ b/IRP/src/CommonModules/CommonFunctionsClientServer/Module.bsl @@ -228,3 +228,10 @@ Function isBase64Value(Value) Export Return True; EndFunction + +Procedure LoadFormItemChoiceList(Form, ItemName, ChoiceList) Export + If ObjectHasProperty(Form.Items, ItemName) Then + Form.Items[ItemName].ChoiceList.Clear(); + Form.Items[ItemName].ChoiceList.LoadValues(ChoiceList); + EndIf; +EndProcedure diff --git a/IRP/src/CommonModules/CommonFunctionsServer/Module.bsl b/IRP/src/CommonModules/CommonFunctionsServer/Module.bsl index 09adfb43f1..d05ce3f0e1 100644 --- a/IRP/src/CommonModules/CommonFunctionsServer/Module.bsl +++ b/IRP/src/CommonModules/CommonFunctionsServer/Module.bsl @@ -347,22 +347,31 @@ Function isMetadataAvailableByCurrentFunctionalOptions(ValidatedMetadata, hasTyp If hasType And ValidatedMetadata.Type.Types().Count() = 1 Then MetadataByType = Metadata.FindByType(ValidatedMetadata.Type.Types()[0]); EndIf; - If MetadataByType = Undefined Then - MetadataByType = ValidatedMetadata; - EndIf; - UsedInFunctionalOptions = False; + MetadataUsedInFunctionalOptions = False; + MetadataAvailableInFunctionalOptions = False; + TypeUsedInFunctionalOptions = False; + TypeAvailableInFunctionalOptions = ?(hasType And MetadataByType <> Undefined, False, True); For Each FunctionalOption In Metadata.FunctionalOptions Do - If FunctionalOption.Content.Contains(ValidatedMetadata) Or FunctionalOption.Content.Contains(MetadataByType) Then - UsedInFunctionalOptions = True; - If GetFunctionalOption(FunctionalOption.Name) = True Then - Return True; - EndIf; + + If NOT MetadataAvailableInFunctionalOptions And FunctionalOption.Content.Contains(ValidatedMetadata) Then + MetadataUsedInFunctionalOptions = True; + MetadataAvailableInFunctionalOptions = (GetFunctionalOption(FunctionalOption.Name) = True); + EndIf; + + If NOT TypeAvailableInFunctionalOptions And FunctionalOption.Content.Contains(MetadataByType) Then + TypeUsedInFunctionalOptions = True; + TypeAvailableInFunctionalOptions = (GetFunctionalOption(FunctionalOption.Name) = True); + EndIf; + + If MetadataAvailableInFunctionalOptions And TypeAvailableInFunctionalOptions Then + Break; EndIf; EndDo; - Return Not UsedInFunctionalOptions; + Return (NOT MetadataUsedInFunctionalOptions OR MetadataAvailableInFunctionalOptions) And + (NOT TypeUsedInFunctionalOptions OR TypeAvailableInFunctionalOptions); EndFunction diff --git a/IRP/src/CommonModules/ControllerClientServer_V2/Module.bsl b/IRP/src/CommonModules/ControllerClientServer_V2/Module.bsl index 140804e06c..9207fc6f89 100644 --- a/IRP/src/CommonModules/ControllerClientServer_V2/Module.bsl +++ b/IRP/src/CommonModules/ControllerClientServer_V2/Module.bsl @@ -30,6 +30,8 @@ Function GetFormParameters(Form) Export Result.Insert("TaxVisible", Undefined); // Undefined - do not change visible, True or False - change visible Result.Insert("TaxChoiceList", New Array()); + Result.Insert("PartnerChoiceList", Undefined); + Result.Insert("PropertyBeforeChange", New Structure("Object, Form, List", New Structure(), New Structure(), New Structure())); Result.PropertyBeforeChange.Object.Insert("Names" , ""); @@ -74,6 +76,8 @@ Function CreateParameters(ServerParameters, FormParameters, LoadParameters) Parameters.Insert("TaxVisible" , FormParameters.TaxVisible); Parameters.Insert("TaxChoiceList", FormParameters.TaxChoiceList); + + Parameters.Insert("PartnerChoiceList", FormParameters.PartnerChoiceList); Parameters.Insert("CacheForm" , New Structure()); // cache for form attributes Parameters.Insert("ViewNotify" , New Array()); @@ -381,11 +385,16 @@ Function GetEventHandlerMap(Parameters, DataPath, IsBuilder) EventHandlerMap.Insert("ItemList.RetailSalesReceipt" , "SetItemListSalesDocument"); If Parameters.ObjectMetadataInfo.MetadataName = "SalesReportToConsignor" Then - EventHandlerMap.Insert("ItemList.TotalAmount", "StepItemListChangePriceTypeAsManual_IsTotalAmountChange, - |StepItemListCalculations_IsTotalAmountChanged_Without_SpecialOffers"); + EventHandlerMap.Insert("ItemList.TotalAmount", + "StepItemListChangePriceTypeAsManual_IsTotalAmountChange, + |StepItemListCalculations_IsTotalAmountChanged_Without_SpecialOffers"); + ElsIf Parameters.ObjectMetadataInfo.MetadataName = "StockAdjustmentAsSurplus" Then + EventHandlerMap.Insert("ItemList.TotalAmount", + "StepItemListCalculations_IsTotalAmountChanged_StockDocuments"); Else - EventHandlerMap.Insert("ItemList.TotalAmount", "StepItemListChangePriceTypeAsManual_IsTotalAmountChange, - |StepItemListCalculations_IsTotalAmountChanged"); + EventHandlerMap.Insert("ItemList.TotalAmount", + "StepItemListChangePriceTypeAsManual_IsTotalAmountChange, + |StepItemListCalculations_IsTotalAmountChanged"); EndIf; EventHandlerMap.Insert("ItemList.VatRate", "SetItemListVatRate"); @@ -595,6 +604,7 @@ Function GetAllBindingsByDefault(Parameters) Binding.Insert("ItemList.VatRate" , BindDefaultItemListVatRate(Parameters)); Binding.Insert("PaymentList.VatRate" , BindDefaultPaymentListVatRate(Parameters)); + Binding.Insert("Transactions.VatRate" , BindDefaultTransactionsVatRate(Parameters)); Binding.Insert("PaymentList.Currency" , BindDefaultPaymentListCurrency(Parameters)); @@ -640,6 +650,10 @@ Function BindFormOnCreateAtServer(Parameters) "StepGenerateNewSendUUID, |StepGenerateNewReceiptUUID"); + Binding.Insert("DebitCreditNote", + "StepGenerateNewSendUUID, + |StepGenerateNewReceiptUUID"); + Binding.Insert("CashRevenue", "StepPaymentListCalculations_RecalculationsOnCopy"); @@ -675,6 +689,32 @@ Procedure StepChangeTaxVisible(Parameters, Chain) Export Chain.ChangeTaxVisible.Options.Add(Options); EndProcedure +// PartnerChoiceList.Set +Procedure SetPartnerChoiceList(Parameters, Results) Export + If Results.Count() > 0 Then + Parameters.PartnerChoiceList = Results[0].Value; + Else + Parameters.PartnerChoiceList = New Array; + EndIf; +EndProcedure + +// Form.StepChangePartnerChoiceList.Step +Procedure StepChangePartnerChoiceList(Parameters, Chain) Export + Chain.ChangePartnerChoiceList.Enable = True; + If Chain.Idle Then + Return; + EndIf; + Chain.ChangePartnerChoiceList.Setter = "SetPartnerChoiceList"; + Options = ModelClientServer_V2.ChangePartnerChoiceListOptions(); + Options.DocumentName = Parameters.ObjectMetadataInfo.MetadataName; + Options.Company = GetCompany(Parameters); + If CommonFunctionsClientServer.ObjectHasProperty(Parameters.Object, "TransactionType") Then + Options.TransactionType = GetTransactionType(Parameters); + EndIf; + Options.StepName = "StepChangePartnerChoiceList"; + Chain.ChangePartnerChoiceList.Options.Add(Options); +EndProcedure + // Form.OnOpen Procedure FormOnOpen(Parameters) Export AddViewNotify("OnOpenFormNotify", Parameters); @@ -689,15 +729,15 @@ Function BindFormOnOpen(Parameters) Binding.Insert("CashExpense" , "StepChangeTaxVisible, StepExtractDataCurrencyFromAccount"); Binding.Insert("CashRevenue" , "StepChangeTaxVisible, StepExtractDataCurrencyFromAccount"); - Binding.Insert("SalesOrder" , "StepChangeTaxVisible"); - Binding.Insert("SalesInvoice" , "StepChangeTaxVisible"); - Binding.Insert("SalesReturnOrder" , "StepChangeTaxVisible"); - Binding.Insert("SalesReturn" , "StepChangeTaxVisible"); + Binding.Insert("SalesOrder" , "StepChangeTaxVisible, StepChangePartnerChoiceList"); + Binding.Insert("SalesInvoice" , "StepChangeTaxVisible, StepChangePartnerChoiceList"); + Binding.Insert("SalesReturnOrder" , "StepChangeTaxVisible, StepChangePartnerChoiceList"); + Binding.Insert("SalesReturn" , "StepChangeTaxVisible, StepChangePartnerChoiceList"); - Binding.Insert("PurchaseOrder" , "StepChangeTaxVisible"); - Binding.Insert("PurchaseInvoice" , "StepChangeTaxVisible"); - Binding.Insert("PurchaseReturnOrder" , "StepChangeTaxVisible"); - Binding.Insert("PurchaseReturn" , "StepChangeTaxVisible"); + Binding.Insert("PurchaseOrder" , "StepChangeTaxVisible, StepChangePartnerChoiceList"); + Binding.Insert("PurchaseInvoice" , "StepChangeTaxVisible, StepChangePartnerChoiceList"); + Binding.Insert("PurchaseReturnOrder" , "StepChangeTaxVisible, StepChangePartnerChoiceList"); + Binding.Insert("PurchaseReturn" , "StepChangeTaxVisible, StepChangePartnerChoiceList"); Binding.Insert("RetailSalesReceipt" , "StepChangeTaxVisible"); Binding.Insert("RetailReceiptCorrection" , "StepChangeTaxVisible"); @@ -713,6 +753,11 @@ Function BindFormOnOpen(Parameters) Binding.Insert("SalesReportToConsignor" , "StepChangeTaxVisible"); Binding.Insert("WorkOrder" , "StepChangeTaxVisible"); + Binding.Insert("DebitNote" , "StepChangeTaxVisible"); + Binding.Insert("CreditNote" , "StepChangeTaxVisible"); + + Binding.Insert("StockAdjustmentAsSurplus" , "StepChangeTaxVisible"); + Return BindSteps("BindVoid", DataPath, Binding, Parameters, "BindFormOnOpen"); EndFunction @@ -1031,6 +1076,7 @@ Function BindCommandRecalculationWhenBasedOn(Parameters) Binding.Insert("SalesReturn" , "StepItemListCalculations_IsRecalculationWhenBasedOn"); Binding.Insert("SalesReturnOrder" , "StepItemListCalculations_IsRecalculationWhenBasedOn"); Binding.Insert("WorkOrder" , "StepItemListCalculations_IsRecalculationWhenBasedOn"); + Binding.Insert("StockAdjustmentAsSurplus", "StepItemListCalculations_IsRecalculationWhenBasedOn_StockDocuments"); Return BindSteps("BindVoid", "", Binding, Parameters, "BindCommandRecalculationWhenBasedOn"); EndFunction @@ -1503,37 +1549,37 @@ Function BindTransactionType(Parameters) |StepClearByTransactionTypeBankPayment, |StepPaymentListChangeAgreementByPartner, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInList"); + |StepPaymentListChangeVatRate_AgreementInList"); Binding.Insert("BankReceipt", "StepChangeTransitAccountByAccount, |StepClearByTransactionTypeBankReceipt, |StepPaymentListChangeAgreementByPartner, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInList"); + |StepPaymentListChangeVatRate_AgreementInList"); Binding.Insert("CashPayment", "StepClearByTransactionTypeCashPayment, |StepPaymentListChangeAgreementByPartner, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInList"); + |StepPaymentListChangeVatRate_AgreementInList"); Binding.Insert("CashReceipt", "StepClearByTransactionTypeCashReceipt, |StepPaymentListChangeAgreementByPartner, |StepChangeCashAccountByTransactionType, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInList"); + |StepPaymentListChangeVatRate_AgreementInList"); Binding.Insert("CashExpense", "StepClearByTransactionTypeCashExpense, |StepChangeTaxVisible, - |StepChangeVatRate_WithoutAgreement"); + |StepPaymentListChangeVatRate_WithoutAgreement"); Binding.Insert("CashRevenue", "StepClearByTransactionTypeCashRevenue, |StepChangeTaxVisible, - |StepChangeVatRate_WithoutAgreement"); + |StepPaymentListChangeVatRate_WithoutAgreement"); Binding.Insert("OutgoingPaymentOrder", "StepClearByTransactionTypeOutgoingPaymentOrder"); @@ -1549,47 +1595,54 @@ Function BindTransactionType(Parameters) |StepChangePartnerByRetailCustomerAndTransactionType, |StepChangeLegalNameByRetailCustomerAndTransactionType"); - Binding.Insert("PurchaseInvoice", "StepChangePartnerByTransactionType, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepChangePartnerChoiceList, + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("PurchaseOrder", "StepChangePartnerByTransactionType, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepChangePartnerChoiceList, + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("PurchaseReturn", "StepChangePartnerByTransactionType, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepChangePartnerChoiceList, + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("PurchaseReturnOrder", "StepChangePartnerByTransactionType, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepChangePartnerChoiceList, + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("SalesInvoice", "StepChangePartnerByTransactionType, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepChangePartnerChoiceList, + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("SalesOrder", "StepChangePartnerByTransactionType, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader, + |StepChangePartnerChoiceList, + |StepItemListChangeVatRate_AgreementInHeader, |StepChangeShipmentModeByTransactionType"); Binding.Insert("SalesReturn", "StepChangePartnerByTransactionType, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepChangePartnerChoiceList, + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("SalesReturnOrder", "StepChangePartnerByTransactionType, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepChangePartnerChoiceList, + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("Production", "StepChangePlanningPeriodByDateAndBusinessUnit, @@ -2118,6 +2171,8 @@ Function BindReceiveCurrency(Parameters) "StepChangeReceiveAmountBySendAmount, |StepChangeTransitAccountBySendAccount"); + Binding.Insert("DebitCreditNote", "StepChangeReceiveAmountBySendAmount"); + Return BindSteps("BindVoid", DataPath, Binding, Parameters, "BindReceiveCurrency"); EndFunction @@ -2135,6 +2190,20 @@ Procedure StepChangeReceiveCurrencyByAccount(Parameters, Chain) Export Chain.ChangeCurrencyByAccount.Options.Add(Options); EndProcedure +// ReceiveCurrency.ChangeCurrencyByAgreement.Step +Procedure StepChangeReceiveCurrencyByAgreement(Parameters, Chain) Export + Chain.ChangeCurrencyByAgreement.Enable = True; + If Chain.Idle Then + Return; + EndIf; + Chain.ChangeCurrencyByAgreement.Setter = "SetReceiveCurrency"; + Options = ModelClientServer_V2.ChangeCurrencyByAgreementOptions(); + Options.Agreement = GetReceiveAgreement(Parameters); + Options.CurrentCurrency = GetReceiveCurrency(Parameters); + Options.StepName = "StepChangeReceiveCurrencyByAgreement"; + Chain.ChangeCurrencyByAgreement.Options.Add(Options); +EndProcedure + #EndRegion #Region CURRENCY_SEND @@ -2168,6 +2237,8 @@ Function BindSendCurrency(Parameters) "StepChangeReceiveAmountBySendAmount, |StepChangeTransitAccountBySendAccount"); + Binding.Insert("DebitCreditNote", "StepChangeReceiveAmountBySendAmount"); + Return BindSteps("BindVoid", DataPath, Binding, Parameters, "BindSendCurrency"); EndFunction @@ -2185,6 +2256,20 @@ Procedure StepChangeSendCurrencyByAccount(Parameters, Chain) Export Chain.ChangeCurrencyByAccount.Options.Add(Options); EndProcedure +// SendCurrency.ChangeCurrencyByAgreement.Step +Procedure StepChangeSendCurrencyByAgreement(Parameters, Chain) Export + Chain.ChangeCurrencyByAgreement.Enable = True; + If Chain.Idle Then + Return; + EndIf; + Chain.ChangeCurrencyByAgreement.Setter = "SetSendCurrency"; + Options = ModelClientServer_V2.ChangeCurrencyByAgreementOptions(); + Options.Agreement = GetSendAgreement(Parameters); + Options.CurrentCurrency = GetSendCurrency(Parameters); + Options.StepName = "StepChangeSendCurrencyByAgreement"; + Chain.ChangeCurrencyByAgreement.Options.Add(Options); +EndProcedure + #EndRegion #Region CURRENCY_EXCHANGE @@ -2241,6 +2326,7 @@ Function BindSendAmount(Parameters) Binding = New Structure(); Binding.Insert("CashTransferOrder" , "StepChangeReceiveAmountBySendAmount"); Binding.Insert("MoneyTransfer" , "StepChangeReceiveAmountBySendAmount"); + Binding.Insert("DebitCreditNote" , "StepChangeReceiveAmountBySendAmount"); Return BindSteps("BindVoid", DataPath, Binding, Parameters, "BindSendAmount"); EndFunction @@ -2441,7 +2527,7 @@ Function BindDate(Parameters) |StepChangeDeliveryDateByAgreement, |StepChangeAgreementByPartner_AgreementTypeByTransactionType, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader, + |StepItemListChangeVatRate_AgreementInHeader, |StepUpdatePaymentTerms"); Binding.Insert("WorkOrder", @@ -2449,7 +2535,7 @@ Function BindDate(Parameters) |StepItemListChangePriceByPriceType, |StepChangeAgreementByPartner_AgreementTypeIsCustomer, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("SalesInvoice", "StepItemListChangePriceTypeByAgreement, @@ -2457,7 +2543,7 @@ Function BindDate(Parameters) |StepChangeDeliveryDateByAgreement, |StepChangeAgreementByPartner_AgreementTypeIsCustomer, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader, + |StepItemListChangeVatRate_AgreementInHeader, |StepUpdatePaymentTerms"); Binding.Insert("RetailSalesReceipt", @@ -2465,39 +2551,39 @@ Function BindDate(Parameters) |StepItemListChangePriceByPriceType, |StepChangeAgreementByPartner_AgreementTypeIsCustomer, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("RetailReceiptCorrection", "StepItemListChangePriceTypeByAgreement, |StepItemListChangePriceByPriceType, |StepChangeAgreementByPartner_AgreementTypeIsCustomer, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("SalesReturnOrder", "StepChangeAgreementByPartner_AgreementTypeByTransactionType, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("SalesReturn", "StepChangeAgreementByPartner_AgreementTypeByTransactionType, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("PurchaseReturnOrder", "StepChangeAgreementByPartner_AgreementTypeByTransactionType, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("PurchaseReturn", "StepChangeAgreementByPartner_AgreementTypeByTransactionType, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("RetailReturnReceipt", "StepChangeAgreementByPartner_AgreementTypeIsCustomer, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader, + |StepItemListChangeVatRate_AgreementInHeader, |StepChangeConsolidatedRetailSalesByWorkstation"); Binding.Insert("PurchaseOrder", @@ -2506,7 +2592,7 @@ Function BindDate(Parameters) |StepChangeDeliveryDateByAgreement, |StepChangeAgreementByPartner_AgreementTypeByTransactionType, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader, + |StepItemListChangeVatRate_AgreementInHeader, |StepUpdatePaymentTerms"); Binding.Insert("PurchaseInvoice", @@ -2515,7 +2601,7 @@ Function BindDate(Parameters) |StepChangeDeliveryDateByAgreement, |StepChangeAgreementByPartner_AgreementTypeByTransactionType, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader, + |StepItemListChangeVatRate_AgreementInHeader, |StepUpdatePaymentTerms"); Binding.Insert("SalesReportFromTradeAgent", @@ -2523,46 +2609,46 @@ Function BindDate(Parameters) |StepItemListChangePriceByPriceType, |StepChangeAgreementByPartner_AgreementTypeIsTradeAgent, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("SalesReportToConsignor", "StepItemListChangePriceTypeByAgreement, |StepItemListChangePriceByPriceType, |StepChangeAgreementByPartner_AgreementTypeIsConsignor, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("BankPayment", "StepChangeTaxVisible, - |StepChangeVatRate_AgreementInList"); + |StepPaymentListChangeVatRate_AgreementInList"); Binding.Insert("BankReceipt", "StepChangeTaxVisible, - |StepChangeVatRate_AgreementInList"); + |StepPaymentListChangeVatRate_AgreementInList"); Binding.Insert("CashPayment", "StepChangeTaxVisible, - |StepChangeVatRate_AgreementInList"); + |StepPaymentListChangeVatRate_AgreementInList"); Binding.Insert("CashReceipt", "StepChangeTaxVisible, - |StepChangeVatRate_AgreementInList, + |StepPaymentListChangeVatRate_AgreementInList, |StepChangeConsolidatedRetailSalesByWorkstation"); Binding.Insert("CashExpense", "StepChangeTaxVisible, - |StepChangeVatRate_WithoutAgreement"); + |StepPaymentListChangeVatRate_WithoutAgreement"); Binding.Insert("CashRevenue", "StepChangeTaxVisible, - |StepChangeVatRate_WithoutAgreement"); + |StepPaymentListChangeVatRate_WithoutAgreement"); Binding.Insert("MoneyTransfer", "StepChangeConsolidatedRetailSalesByWorkstation"); Binding.Insert("EmployeeCashAdvance", "StepChangeTaxVisible, - |StepChangeVatRate_WithoutAgreement"); + |StepPaymentListChangeVatRate_WithoutAgreement"); Binding.Insert("ProductionPlanning", "StepChangePlanningPeriodByDateAndBusinessUnit"); @@ -2596,6 +2682,18 @@ Function BindDate(Parameters) Binding.Insert("EmployeeHiring", "StepChangeSalaryByPosition"); + Binding.Insert("DebitNote", + "StepChangeTaxVisible, + |StepTransactionsChangeVatRate_AgreementInList"); + + Binding.Insert("CreditNote", + "StepChangeTaxVisible, + |StepTransactionsChangeVatRate_AgreementInList"); + + Binding.Insert("StockAdjustmentAsSurplus", + "StepChangeTaxVisible, + |StepItemListChangeVatRate_StockDocuments"); + Return BindSteps("BindVoid", DataPath, Binding, Parameters, "BindDate"); EndFunction @@ -2628,23 +2726,25 @@ Function BindCompany(Parameters) Binding = New Structure(); Binding.Insert("SalesOrder", "StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader, + |StepChangePartnerChoiceList, + |StepItemListChangeVatRate_AgreementInHeader, |StepItemListChangeRevenueTypeByItemKey"); Binding.Insert("WorkOrder", "StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("SalesInvoice", "StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader, + |StepChangePartnerChoiceList, + |StepItemListChangeVatRate_AgreementInHeader, |StepItemListChangeInventoryOriginByItemKey, |StepItemListChangeConsignorByItemKey, |StepItemListChangeRevenueTypeByItemKey"); Binding.Insert("RetailSalesReceipt", "StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader, + |StepItemListChangeVatRate_AgreementInHeader, |StepItemListChangeRevenueTypeByItemKey, |StepChangeConsolidatedRetailSalesByWorkstation, |StepItemListChangeInventoryOriginByItemKey, @@ -2652,7 +2752,7 @@ Function BindCompany(Parameters) Binding.Insert("RetailReceiptCorrection", "StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader, + |StepItemListChangeVatRate_AgreementInHeader, |StepItemListChangeRevenueTypeByItemKey, |StepChangeConsolidatedRetailSalesByWorkstation, |StepItemListChangeInventoryOriginByItemKey, @@ -2662,32 +2762,37 @@ Function BindCompany(Parameters) Binding.Insert("PurchaseOrder", "StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader, + |StepChangePartnerChoiceList, + |StepItemListChangeVatRate_AgreementInHeader, |StepItemListChangeExpenseTypeByItemKey"); Binding.Insert("PurchaseInvoice", "StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader, + |StepChangePartnerChoiceList, + |StepItemListChangeVatRate_AgreementInHeader, |StepItemListChangeExpenseTypeByItemKey"); Binding.Insert("SalesReportFromTradeAgent", "StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader, + |StepChangePartnerChoiceList, + |StepItemListChangeVatRate_AgreementInHeader, |StepItemListChangeTradeAgentFeeAmountByTradeAgentFeeType"); Binding.Insert("SalesReportToConsignor", "StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader, + |StepItemListChangeVatRate_AgreementInHeader, |StepItemListChangeTradeAgentFeeAmountByTradeAgentFeeType"); Binding.Insert("SalesReturnOrder", "StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader, + |StepChangePartnerChoiceList, + |StepItemListChangeVatRate_AgreementInHeader, |StepItemListChangeRevenueTypeByItemKey"); Binding.Insert("SalesReturn", "StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader, + |StepChangePartnerChoiceList, + |StepItemListChangeVatRate_AgreementInHeader, |StepItemListChangeInventoryOriginByItemKey, |StepItemListChangeConsignorByItemKey, @@ -2695,17 +2800,19 @@ Function BindCompany(Parameters) Binding.Insert("PurchaseReturnOrder", "StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader, + |StepChangePartnerChoiceList, + |StepItemListChangeVatRate_AgreementInHeader, |StepItemListChangeExpenseTypeByItemKey"); Binding.Insert("PurchaseReturn", "StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader, + |StepChangePartnerChoiceList, + |StepItemListChangeVatRate_AgreementInHeader, |StepItemListChangeExpenseTypeByItemKey"); Binding.Insert("RetailReturnReceipt", "StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader, + |StepItemListChangeVatRate_AgreementInHeader, |StepItemListChangeInventoryOriginByItemKey, |StepItemListChangeConsignorByItemKey, @@ -2717,37 +2824,37 @@ Function BindCompany(Parameters) Binding.Insert("BankPayment", "StepChangeTaxVisible, - |StepChangeVatRate_AgreementInList, + |StepPaymentListChangeVatRate_AgreementInList, |StepChangeCashAccountByCompany_AccountTypeIsBank"); Binding.Insert("BankReceipt", "StepChangeTaxVisible, - |StepChangeVatRate_AgreementInList, + |StepPaymentListChangeVatRate_AgreementInList, |StepChangeCashAccountByCompany_AccountTypeIsBank"); Binding.Insert("CashPayment", "StepChangeTaxVisible, - |StepChangeVatRate_AgreementInList, + |StepPaymentListChangeVatRate_AgreementInList, |StepChangeCashAccountByCompany_AccountTypeIsCash"); Binding.Insert("CashReceipt", "StepChangeTaxVisible, - |StepChangeVatRate_AgreementInList, + |StepPaymentListChangeVatRate_AgreementInList, |StepChangeCashAccountByCompany_CashReceipt"); Binding.Insert("CashExpense", "StepChangeTaxVisible, - |StepChangeVatRate_WithoutAgreement, + |StepPaymentListChangeVatRate_WithoutAgreement, |StepChangeCashAccountByCompany_AccountTypeIsCash"); Binding.Insert("CashRevenue", "StepChangeTaxVisible, - |StepChangeVatRate_WithoutAgreement, + |StepPaymentListChangeVatRate_WithoutAgreement, |StepChangeCashAccountByCompany_AccountTypeIsCash"); Binding.Insert("EmployeeCashAdvance", "StepChangeTaxVisible, - |StepChangeVatRate_WithoutAgreement"); + |StepPaymentListChangeVatRate_WithoutAgreement"); Binding.Insert("MoneyTransfer", "StepChangeAccountSenderByCompany, @@ -2759,7 +2866,9 @@ Function BindCompany(Parameters) |StepChangeAccountReceiverByCompany"); Binding.Insert("StockAdjustmentAsSurplus", - "StepChangeLandedCostCurrencyByCompany"); + "StepChangeLandedCostCurrencyByCompany, + |StepChangeTaxVisible, + |StepItemListChangeVatRate_StockDocuments"); Binding.Insert("StockAdjustmentAsWriteOff", "StepChangeLandedCostCurrencyByCompany"); @@ -2790,6 +2899,14 @@ Function BindCompany(Parameters) Binding.Insert("EmployeeHiring", "StepChangeAccrualTypeByCompany"); + Binding.Insert("DebitNote", + "StepChangeTaxVisible, + |StepTransactionsChangeVatRate_AgreementInList"); + + Binding.Insert("CreditNote", + "StepChangeTaxVisible, + |StepTransactionsChangeVatRate_AgreementInList"); + Return BindSteps("BindVoid", DataPath, Binding, Parameters, "BindCompany"); EndFunction @@ -3183,6 +3300,10 @@ Function BindPartner(Parameters) "StepChangeAgreementByPartner_AgreementTypeIsOther, |StepChangeLegalNameByPartner"); + Binding.Insert("TaxesOperation", + "StepChangeAgreementByPartner_AgreementTypeByTransactionType, + |StepChangeLegalNameByPartner"); + Return BindSteps("BindVoid", DataPath, Binding, Parameters, "BindPartner"); EndFunction @@ -4994,7 +5115,7 @@ Function BindAgreement(Parameters) |StepChangePriceIncludeTaxByAgreement, |StepChangePaymentTermsByAgreement, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("WorkOrder", "StepChangeCompanyByAgreement, @@ -5002,7 +5123,7 @@ Function BindAgreement(Parameters) |StepItemListChangePriceTypeByAgreement, |StepChangePriceIncludeTaxByAgreement, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("SalesInvoice", "StepChangeCompanyByAgreement, @@ -5013,7 +5134,7 @@ Function BindAgreement(Parameters) |StepChangePriceIncludeTaxByAgreement, |StepChangePaymentTermsByAgreement, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("RetailSalesReceipt", "StepChangeCompanyByAgreement, @@ -5022,7 +5143,7 @@ Function BindAgreement(Parameters) |StepItemListChangePriceTypeByAgreement, |StepChangePriceIncludeTaxByAgreement, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("RetailReceiptCorrection", "StepChangeCompanyByAgreement, @@ -5031,7 +5152,7 @@ Function BindAgreement(Parameters) |StepItemListChangePriceTypeByAgreement, |StepChangePriceIncludeTaxByAgreement, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("RetailReturnReceipt", "StepChangeCompanyByAgreement, @@ -5040,7 +5161,7 @@ Function BindAgreement(Parameters) |StepItemListChangePriceTypeByAgreement, |StepChangePriceIncludeTaxByAgreement, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("PurchaseReturnOrder", "StepChangeCompanyByAgreement, @@ -5049,7 +5170,7 @@ Function BindAgreement(Parameters) |StepItemListChangePriceTypeByAgreement, |StepChangePriceIncludeTaxByAgreement, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("PurchaseReturn", "StepChangeCompanyByAgreement, @@ -5058,7 +5179,7 @@ Function BindAgreement(Parameters) |StepItemListChangePriceTypeByAgreement, |StepChangePriceIncludeTaxByAgreement, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("SalesReturnOrder", "StepChangeCompanyByAgreement, @@ -5067,7 +5188,7 @@ Function BindAgreement(Parameters) |StepItemListChangePriceTypeByAgreement, |StepChangePriceIncludeTaxByAgreement, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("SalesReturn", "StepChangeCompanyByAgreement, @@ -5076,7 +5197,7 @@ Function BindAgreement(Parameters) |StepItemListChangePriceTypeByAgreement, |StepChangePriceIncludeTaxByAgreement, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("PurchaseOrder", "StepChangeCompanyByAgreement, @@ -5087,7 +5208,7 @@ Function BindAgreement(Parameters) |StepChangePriceIncludeTaxByAgreement, |StepChangePaymentTermsByAgreement, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader"); + |StepItemListChangeVatRate_AgreementInHeader"); Binding.Insert("PurchaseInvoice", "StepChangeCompanyByAgreement, @@ -5098,7 +5219,7 @@ Function BindAgreement(Parameters) |StepChangePriceIncludeTaxByAgreement, |StepChangePaymentTermsByAgreement, |StepChangeTaxVisible, - |StepChangeVatRate_AgreementInHeader, + |StepItemListChangeVatRate_AgreementInHeader, |StepChangeRecordPurchasePricesByAgreement"); Binding.Insert("SalesReportFromTradeAgent", @@ -5119,6 +5240,10 @@ Function BindAgreement(Parameters) "StepChangeCompanyByAgreement, |StepChangeCurrencyByAgreement"); + Binding.Insert("TaxesOperation", + "StepChangeCompanyByAgreement, + |StepChangeCurrencyByAgreement"); + Return BindSteps("BindVoid", DataPath, Binding, Parameters, "BindAgreement"); EndFunction @@ -5306,7 +5431,10 @@ EndFunction Function BindSendAgreement(Parameters) DataPath = "SendAgreement"; Binding = New Structure(); - Binding.Insert("DebitCreditNote", "StepChangeSendBasisDocumentBySendAgreement"); + Binding.Insert("DebitCreditNote", + "StepChangeSendBasisDocumentBySendAgreement, + |StepChangeSendCurrencyByAgreement"); + Return BindSteps("BindVoid", DataPath, Binding, Parameters, "BindSendAgreement"); EndFunction @@ -5353,7 +5481,10 @@ EndFunction Function BindReceiveAgreement(Parameters) DataPath = "ReceiveAgreement"; Binding = New Structure(); - Binding.Insert("DebitCreditNote", "StepChangeReceiveBasisDocumentByReceiveAgreement"); + Binding.Insert("DebitCreditNote", + "StepChangeReceiveBasisDocumentByReceiveAgreement, + |StepChangeReceiveCurrencyByAgreement"); + Return BindSteps("BindVoid", DataPath, Binding, Parameters, "BindReceiveAgreement"); EndFunction @@ -6330,10 +6461,13 @@ Function BindTransactionsAgreement(Parameters) DataPath = "Transactions.Agreement"; Binding = New Structure(); Binding.Insert("CreditNote", - "StepTransactionsChangeCurrencyByAgreement"); + "StepTransactionsChangeCurrencyByAgreement, + |StepTransactionsChangeVatRate_AgreementInList"); Binding.Insert("DebitNote", - "StepTransactionsChangeCurrencyByAgreement"); + "StepTransactionsChangeCurrencyByAgreement, + |StepTransactionsChangeVatRate_AgreementInList"); + Return BindSteps(Undefined, DataPath, Binding, Parameters, "BindTransactionsAgreement"); EndFunction @@ -6446,6 +6580,243 @@ EndProcedure #EndRegion +#Region TRANSACTIONS_LIST_VAT_RATE + +// Transactions.VatRate.OnChange +Procedure TransactionsVatRateOnChange(Parameters) Export + Binding = BindTransactionsVatRate(Parameters); + ModelClientServer_V2.EntryPoint(Binding.StepsEnabler, Parameters); +EndProcedure + +// Transactions.VatRate.Set +Procedure SetTransactionsVatRate(Parameters, Results) Export + Binding = BindTransactionsVatRate(Parameters); + SetterObject(Binding.StepsEnabler, Binding.DataPath, Parameters, Results); +EndProcedure + +// Transactions.VatRate.Get +Function GetTransactionsVatRate(Parameters, _Key) + Return GetPropertyObject(Parameters, BindTransactionsVatRate(Parameters).DataPath, _Key); +EndFunction + +// Transactions.VatRate.Bind +Function BindTransactionsVatRate(Parameters) + DataPath = "Transactions.VatRate"; + + Binding = New Structure(); + Return BindSteps("StepTransactionsCalculations_IsVatRateChanged", DataPath, Binding, Parameters, "BindTransactionsVatRate"); +EndFunction + +// Transactions.VatRate.Default.Bind +Function BindDefaultTransactionsVatRate(Parameters) + DataPath = "Transctions.VatRate"; + Binding = New Structure(); + Return BindSteps("StepTransactionsDefaultVatRateInList", DataPath, Binding, Parameters, "BindDefaultTransactionsVatRate"); +EndFunction + +// Transactions.VatRate.DefaultVatRateInList.Step +Procedure StepTransactionsDefaultVatRateInList(Parameters, Chain) Export + Chain.DefaultVatRateInList.Enable = True; + If Chain.Idle Then + Return; + EndIf; + Chain.DefaultVatRateInList.Setter = "SetTransactionsVatRate"; + Options = ModelClientServer_V2.DefaultVatRateInListOptions(); + NewRow = Parameters.RowFilledByUserSettings; + Options.CurrentVatRate = GetTransactionsVatRate(Parameters, NewRow.Key); + Options.Date = GetDate(Parameters); + Options.Company = GetCompany(Parameters); + If CommonFunctionsClientServer.ObjectHasProperty(NewRow, "Agreement") Then + Options.Agreement = GetTransactionsAgreement(Parameters, NewRow.Key); + EndIf; + Options.DocumentName = Parameters.ObjectMetadataInfo.MetadataName; + Options.Key = NewRow.Key; + Chain.DefaultVatRateInList.Options.Add(Options); +EndProcedure + +// Transactions.VatRate.ChangeVatRate_AgreementInList.Step +Procedure StepTransactionsChangeVatRate_AgreementInList(Parameters, Chain) Export + Chain.ChangeVatRate.Enable = True; + + If Chain.Idle Then + Return; + EndIf; + + Chain.ChangeVatRate.Setter = "SetTransactionsVatRate"; + + Options_Date = GetDate(Parameters); + Options_Company = GetCompany(Parameters); + + TableRows = GetRows(Parameters, Parameters.TableName); + + For Each Row In TableRows Do + Options = ModelClientServer_V2.ChangeVatRateOptions(); + + Options.Date = Options_Date; + Options.Company = Options_Company; + Options.Agreement = GetTransactionsAgreement(Parameters, Row.Key); + + Options.DocumentName = Parameters.ObjectMetadataInfo.MetadataName; + + Options.Key = Row.Key; + Options.StepName = "StepTransactionsChangeVatRate_AgreementInList"; + Chain.ChangeVatRate.Options.Add(Options); + EndDo; +EndProcedure + +#EndRegion + +#Region TRANSACTIONS_LIST_TAX_AMOUNT + +// Transactions.TaxAmount.OnChange +Procedure TransactionsTaxAmountOnChange(Parameters) Export + Binding = BindTransactionsTaxAmount(Parameters); + ModelClientServer_V2.EntryPoint(Binding.StepsEnabler, Parameters); +EndProcedure + +// Transactions.TaxAmount.Get +Function GetTransactionsTaxAmount(Parameters, _Key) + Return GetPropertyObject(Parameters, BindTransactionsTaxAmount(Parameters).DataPath, _Key); +EndFunction + +// Transactions.TaxAmount.Bind +Function BindTransactionsTaxAmount(Parameters) + DataPath = "Transactions.TaxAmount"; + + Binding = New Structure(); + Return BindSteps("StepTransactionsCalculations_IsTaxAmountChanged", DataPath, Binding, Parameters, "BindTransactionsTaxAmount"); +EndFunction + +#EndRegion + +#Region TRANSACTIONS_LIST_NET_AMOUNT + +// Transactions.NetAmount.OnChange +Procedure TransactionsNetAmountOnChange(Parameters) Export + Binding = BindTransactionsNetAmount(Parameters); + ModelClientServer_V2.EntryPoint(Binding.StepsEnabler, Parameters); +EndProcedure + +// Transactions.NetAmount.Get +Function GetTransactionsNetAmount(Parameters, _Key) + Return GetPropertyObject(Parameters, BindTransactionsNetAmount(Parameters).DataPath, _Key); +EndFunction + +// Transactions.NetAmount.Bind +Function BindTransactionsNetAmount(Parameters) + DataPath = "Transactions.NetAmount"; + + Binding = New Structure(); + Return BindSteps("StepTransactionsCalculations_IsNetAmountChanged", DataPath, Binding, Parameters, "BindTransactionsNetAmount"); +EndFunction + +#EndRegion + +#Region TRANSACTIONS_LIST_AMOUNT + +// Transactions.Amount.OnChange +Procedure TransactionsAmountOnChange(Parameters) Export + Binding = BindTransactionsAmount(Parameters); + ModelClientServer_V2.EntryPoint(Binding.StepsEnabler, Parameters); +EndProcedure + +// Transactions.Amount.Get +Function GetTransactionsAmount(Parameters, _Key) + Return GetPropertyObject(Parameters, BindTransactionsAmount(Parameters).DataPath, _Key); +EndFunction + +// Transactions.Amount.Bind +Function BindTransactionsAmount(Parameters) + DataPath = "Transactions.Amount"; + + Binding = New Structure(); + Return BindSteps("StepTransactionsCalculations_IsAmountChanged", DataPath, Binding, Parameters, "BindTransactionsAmount"); +EndFunction + +#EndRegion + +#Region TRANSACTIONS_LIST_CALCULATIONS_NET_TAX_TOTAL + +// Transactions.Calculations.Set +Procedure SetTransactionsCalculations(Parameters, Results) Export + SetterObject(Undefined, BindTransactionsNetAmount(Parameters).DataPath , Parameters, Results, , "NetAmount"); + SetterObject(Undefined, BindTransactionsTaxAmount(Parameters).DataPath , Parameters, Results, , "TaxAmount"); + SetterObject(Undefined, BindTransactionsAmount(Parameters).DataPath , Parameters, Results, , "TotalAmount"); +EndProcedure + +// Transactions.Calculations.[IsVatRateChanged].Step +Procedure StepTransactionsCalculations_IsVatRateChanged(Parameters, Chain) Export + StepTransactionsCalculations(Parameters, Chain, "IsVatRateChanged"); +EndProcedure + +// Transactions.Calculations.[IsTaxAmountChanged].Step +Procedure StepTransactionsCalculations_IsTaxAmountChanged(Parameters, Chain) Export + StepTransactionsCalculations(Parameters, Chain, "IsTaxAmountChanged"); +EndProcedure + +// Transactions.Calculations.[IsNetAmountChanged].Step +Procedure StepTransactionsCalculations_IsNetAmountChanged(Parameters, Chain) Export + StepTransactionsCalculations(Parameters, Chain, "IsNetAmountChanged"); +EndProcedure + +// Transactions.Calculations.[IsTotalAmountChanged].Step +Procedure StepTransactionsCalculations_IsAmountChanged(Parameters, Chain) Export + StepTransactionsCalculations(Parameters, Chain, "IsAmountChanged"); +EndProcedure + +Procedure StepTransactionsCalculations(Parameters, Chain, WhoIsChanged); + Chain.Calculations.Enable = True; + If Chain.Idle Then + Return; + EndIf; + Chain.Calculations.Setter = "SetTransactionsCalculations"; + + For Each Row In GetRows(Parameters, Parameters.TableName) Do + + Options = ModelClientServer_V2.CalculationsOptions(); + Options.Ref = Parameters.Object.Ref; + + // need recalculate NetAmount, TotalAmount, TaxAmount + If WhoIsChanged = "IsVatRateChanged" Then + Options.CalculateNetAmount.Enable = True; + Options.CalculateTotalAmount.Enable = True; + Options.CalculateTaxAmount.Enable = True; + + ElsIf WhoIsChanged = "IsAmountChanged" Then + // when TotalAmount is changed taxes need recalculate reverse, will be changed NetAmount + Options.CalculateTaxAmountReverse.Enable = True; + Options.CalculateNetAmountAsTotalAmountMinusTaxAmount.Enable = True; + + ElsIf WhoIsChanged = "IsTaxAmountChanged" Then + // enable use ManualAmount when calculating TaxAmount + Options.TaxOptions.UseManualAmount = True; + Options.CalculateNetAmount.Enable = True; + Options.CalculateTotalAmount.Enable = True; + Options.CalculateTaxAmount.Enable = True; + + ElsIf WhoIsChanged = "IsNetAmountChanged" Then + Options.CalculateTaxAmountByNetAmount.Enable = True; + Options.CalculateTotalAmountByNetAmount.Enable = True; + Else + Raise StrTemplate("Unsupported [WhoIsChanged] = %1", WhoIsChanged); + EndIf; + + Options.AmountOptions.DontCalculateRow = False; + + Options.AmountOptions.NetAmount = GetTransactionsNetAmount(Parameters, Row.Key); + Options.AmountOptions.TaxAmount = GetTransactionsTaxAmount(Parameters, Row.Key); + Options.AmountOptions.TotalAmount = GetTransactionsAmount(Parameters, Row.Key); + + Options.TaxOptions.VatRate = GetTransactionsVatRate(Parameters, Row.Key); + + Options.Key = Row.Key; + Options.StepName = "StepTransactionsCalculations" + WhoIsChanged; + Chain.Calculations.Options.Add(Options); + EndDo; +EndProcedure + +#EndRegion + #EndRegion #Region PAYMENT_LIST @@ -6806,25 +7177,25 @@ Function BindPaymentListAgreement(Parameters) "StepPaymentListChangeBasisDocumentByAgreement, |StepPaymentListChangeOrderByAgreement, |StepExtractDataAgreementApArPostingDetail, - |StepChangeVatRate_AgreementInList"); + |StepPaymentListChangeVatRate_AgreementInList"); Binding.Insert("BankReceipt", "StepPaymentListChangeBasisDocumentByAgreement, |StepPaymentListChangeOrderByAgreement, |StepExtractDataAgreementApArPostingDetail, - |StepChangeVatRate_AgreementInList"); + |StepPaymentListChangeVatRate_AgreementInList"); Binding.Insert("CashPayment", "StepPaymentListChangeBasisDocumentByAgreement, |StepPaymentListChangeOrderByAgreement, |StepExtractDataAgreementApArPostingDetail, - |StepChangeVatRate_AgreementInList"); + |StepPaymentListChangeVatRate_AgreementInList"); Binding.Insert("CashReceipt", "StepPaymentListChangeBasisDocumentByAgreement, |StepPaymentListChangeOrderByAgreement, |StepExtractDataAgreementApArPostingDetail, - |StepChangeVatRate_AgreementInList"); + |StepPaymentListChangeVatRate_AgreementInList"); Return BindSteps(Undefined, DataPath, Binding, Parameters, "BindPaymentListAgreement"); EndFunction @@ -7614,7 +7985,7 @@ Procedure StepPaymentListDefaultVatRateInList(Parameters, Chain) Export EndProcedure // PaymentList.VatRate.ChangeVatRate_AgreementInList.Step -Procedure StepChangeVatRate_AgreementInList(Parameters, Chain) Export +Procedure StepPaymentListChangeVatRate_AgreementInList(Parameters, Chain) Export Chain.ChangeVatRate.Enable = True; If Chain.Idle Then @@ -7640,13 +8011,13 @@ Procedure StepChangeVatRate_AgreementInList(Parameters, Chain) Export Options.DocumentName = Parameters.ObjectMetadataInfo.MetadataName; Options.Key = Row.Key; - Options.StepName = "StepChangeVatRate_AgreementInList"; + Options.StepName = "StepPaymentListChangeVatRate_AgreementInList"; Chain.ChangeVatRate.Options.Add(Options); EndDo; EndProcedure // PaymentList.VatRate.ChangeVatRate_WithoutAgreement.Step -Procedure StepChangeVatRate_WithoutAgreement(Parameters, Chain) Export +Procedure StepPaymentListChangeVatRate_WithoutAgreement(Parameters, Chain) Export Chain.ChangeVatRate.Enable = True; If Chain.Idle Then @@ -7675,7 +8046,7 @@ Procedure StepChangeVatRate_WithoutAgreement(Parameters, Chain) Export Options.DocumentName = Parameters.ObjectMetadataInfo.MetadataName; Options.Key = Row.Key; - Options.StepName = "StepChangeVatRate_WithoutAgreement"; + Options.StepName = "StepPaymentListChangeVatRate_WithoutAgreement"; Chain.ChangeVatRate.Options.Add(Options); EndDo; EndProcedure @@ -10313,6 +10684,7 @@ Function BindItemListItemKey(Parameters) Binding.Insert("StockAdjustmentAsSurplus", "StepChangeUseSerialLotNumberByItemKey, + |StepItemListChangeVatRate_StockDocuments, |StepItemListChangeUnitByItemKey"); Binding.Insert("StockAdjustmentAsWriteOff", @@ -10342,7 +10714,7 @@ Function BindItemListItemKey(Parameters) Binding.Insert("SalesOrder", "StepItemListChangePriceTypeByAgreement, |StepItemListChangePriceByPriceType, - |StepChangeVatRate_AgreementInHeader, + |StepItemListChangeVatRate_AgreementInHeader, |StepItemListChangeUnitByItemKey, |StepItemListChangeRevenueTypeByItemKey, |StepItemListChangeProcurementMethodByItemKey, @@ -10351,7 +10723,7 @@ Function BindItemListItemKey(Parameters) Binding.Insert("WorkOrder", "StepItemListChangePriceTypeByAgreement, |StepItemListChangePriceByPriceType, - |StepChangeVatRate_AgreementInHeader, + |StepItemListChangeVatRate_AgreementInHeader, |StepItemListChangeUnitByItemKey, |StepChangeIsServiceByItemKey, |StepItemListChangeBillOfMaterialsByItemKey"); @@ -10367,7 +10739,7 @@ Function BindItemListItemKey(Parameters) |StepItemListChangeConsignorByItemKey, |StepItemListChangePriceTypeByAgreement, |StepItemListChangePriceByPriceType, - |StepChangeVatRate_AgreementInHeader, + |StepItemListChangeVatRate_AgreementInHeader, |StepChangeUseSerialLotNumberByItemKey, |StepItemListChangeUnitByItemKey, |StepItemListChangeRevenueTypeByItemKey, @@ -10376,7 +10748,7 @@ Function BindItemListItemKey(Parameters) Binding.Insert("PurchaseReturnOrder", "StepItemListChangePriceTypeByAgreement, |StepItemListChangePriceByPriceType, - |StepChangeVatRate_AgreementInHeader, + |StepItemListChangeVatRate_AgreementInHeader, |StepItemListChangeUnitByItemKey, |StepItemListChangeExpenseTypeByItemKey, |StepChangeIsServiceByItemKey"); @@ -10385,7 +10757,7 @@ Function BindItemListItemKey(Parameters) "StepItemListChangeUseShipmentConfirmationByStore, |StepItemListChangePriceTypeByAgreement, |StepItemListChangePriceByPriceType, - |StepChangeVatRate_AgreementInHeader, + |StepItemListChangeVatRate_AgreementInHeader, |StepChangeUseSerialLotNumberByItemKey, |StepItemListChangeUnitByItemKey, |StepItemListChangeExpenseTypeByItemKey, @@ -10396,7 +10768,7 @@ Function BindItemListItemKey(Parameters) |StepItemListChangeInventoryOriginByItemKey, |StepItemListChangeConsignorByItemKey, |StepItemListChangePriceByPriceType, - |StepChangeVatRate_AgreementInHeader, + |StepItemListChangeVatRate_AgreementInHeader, |StepChangeUseSerialLotNumberByItemKey, |StepItemListChangeUnitByItemKey, |StepItemListChangeRevenueTypeByItemKey, @@ -10407,7 +10779,7 @@ Function BindItemListItemKey(Parameters) |StepItemListChangeInventoryOriginByItemKey, |StepItemListChangeConsignorByItemKey, |StepItemListChangePriceByPriceType, - |StepChangeVatRate_AgreementInHeader, + |StepItemListChangeVatRate_AgreementInHeader, |StepChangeUseSerialLotNumberByItemKey, |StepItemListChangeUnitByItemKey, |StepItemListChangeRevenueTypeByItemKey, @@ -10416,7 +10788,7 @@ Function BindItemListItemKey(Parameters) Binding.Insert("RetailReturnReceipt", "StepItemListChangePriceTypeByAgreement, |StepItemListChangePriceByPriceType, - |StepChangeVatRate_AgreementInHeader, + |StepItemListChangeVatRate_AgreementInHeader, |StepItemListChangeInventoryOriginByItemKey, |StepItemListChangeConsignorByItemKey, |StepChangeUseSerialLotNumberByItemKey, @@ -10427,7 +10799,7 @@ Function BindItemListItemKey(Parameters) Binding.Insert("PurchaseOrder", "StepItemListChangePriceTypeByAgreement, |StepItemListChangePriceByPriceType, - |StepChangeVatRate_AgreementInHeader, + |StepItemListChangeVatRate_AgreementInHeader, |StepItemListChangeUnitByItemKey, |StepItemListChangeExpenseTypeByItemKey, |StepChangeIsServiceByItemKey"); @@ -10436,7 +10808,7 @@ Function BindItemListItemKey(Parameters) "StepItemListChangeUseGoodsReceiptByStore, |StepItemListChangePriceTypeByAgreement, |StepItemListChangePriceByPriceType, - |StepChangeVatRate_AgreementInHeader, + |StepItemListChangeVatRate_AgreementInHeader, |StepChangeUseSerialLotNumberByItemKey, |StepItemListChangeUnitByItemKey, |StepItemListChangeExpenseTypeByItemKey, @@ -10445,7 +10817,7 @@ Function BindItemListItemKey(Parameters) Binding.Insert("SalesReportFromTradeAgent", "StepItemListChangePriceTypeByAgreement, |StepItemListChangePriceByPriceType, - |StepChangeVatRate_AgreementInHeader, + |StepItemListChangeVatRate_AgreementInHeader, |StepChangeUseSerialLotNumberByItemKey, |StepItemListChangeUnitByItemKey, |StepChangeIsServiceByItemKey"); @@ -10453,7 +10825,7 @@ Function BindItemListItemKey(Parameters) Binding.Insert("SalesReportToConsignor", "StepItemListChangePriceTypeByAgreement, |StepItemListChangePriceByPriceType, - |StepChangeVatRate_AgreementInHeader, + |StepItemListChangeVatRate_AgreementInHeader, |StepChangeUseSerialLotNumberByItemKey, |StepItemListChangeUnitByItemKey, |StepChangeIsServiceByItemKey"); @@ -10461,7 +10833,7 @@ Function BindItemListItemKey(Parameters) Binding.Insert("SalesReturnOrder", "StepItemListChangePriceTypeByAgreement, |StepItemListChangePriceByPriceType, - |StepChangeVatRate_AgreementInHeader, + |StepItemListChangeVatRate_AgreementInHeader, |StepItemListChangeUnitByItemKey, |StepItemListChangeRevenueTypeByItemKey, |StepChangeIsServiceByItemKey"); @@ -10470,7 +10842,7 @@ Function BindItemListItemKey(Parameters) "StepItemListChangeUseGoodsReceiptByStore, |StepItemListChangePriceTypeByAgreement, |StepItemListChangePriceByPriceType, - |StepChangeVatRate_AgreementInHeader, + |StepItemListChangeVatRate_AgreementInHeader, |StepItemListChangeInventoryOriginByItemKey, |StepItemListChangeConsignorByItemKey, @@ -11503,7 +11875,8 @@ Function BindItemListPrice(Parameters) "StepItemListChangePriceTypeAsManual_IsUserChange, |StepItemListCalculations_IsPriceChanged"); - Binding.Insert("StockAdjustmentAsSurplus", "StepItemListSimpleCalculations_IsPriceChanged"); + Binding.Insert("StockAdjustmentAsSurplus", + "StepItemListCalculations_IsPriceChanged_StockDocuments"); EndIf; Return BindSteps("BindVoid", DataPath, Binding, Parameters, "BindItemListPrice"); @@ -11591,6 +11964,9 @@ EndFunction Function BindDefaultItemListVatRate(Parameters) DataPath = "ItemList.VatRate"; Binding = New Structure(); + + Binding.Insert("StockAdjustmentAsSurplus", "StepItemListDefaultVatRateInList_StockDocuments"); + Return BindSteps("StepItemListDefaultVatRateInList", DataPath, Binding, Parameters, "BindDefaultItemListVatRate"); EndFunction @@ -11602,6 +11978,8 @@ Function BindItemListVatRate(Parameters) Binding.Insert("SalesReportFromTradeAgent", "StepItemListCalculations_IsVatRateChanged_Without_SpecialOffers"); Binding.Insert("SalesReportToConsignor" , "StepItemListCalculations_IsVatRateChanged_Without_SpecialOffers"); + Binding.Insert("StockAdjustmentAsSurplus", "StepItemListCalculations_IsVatRateChanged_StockDocuments"); + Return BindSteps("StepItemListCalculations_IsVatRateChanged", DataPath, Binding, Parameters, "BindItemListVatRate"); EndFunction @@ -11625,8 +12003,26 @@ Procedure StepItemListDefaultVatRateInList(Parameters, Chain) Export Chain.DefaultVatRateInList.Options.Add(Options); EndProcedure +// ItemList.VatRate.DefaultVatRateInList_StockDocuments.Step +Procedure StepItemListDefaultVatRateInList_StockDocuments(Parameters, Chain) Export + Chain.DefaultVatRateInList.Enable = True; + If Chain.Idle Then + Return; + EndIf; + Chain.DefaultVatRateInList.Setter = "SetItemListVatRate"; + Options = ModelClientServer_V2.DefaultVatRateInListOptions(); + NewRow = Parameters.RowFilledByUserSettings; + Options.CurrentVatRate = GetItemListVatRate(Parameters, NewRow.Key); + Options.Date = GetDate(Parameters); + Options.Company = GetCompany(Parameters); + Options.ItemKey = GetItemListItemKey(Parameters, NewRow.Key); + Options.DocumentName = Parameters.ObjectMetadataInfo.MetadataName; + Options.Key = NewRow.Key; + Chain.DefaultVatRateInList.Options.Add(Options); +EndProcedure + // ItemList.VatRate.ChangeVatRate_AgreementInHeader.Step -Procedure StepChangeVatRate_AgreementInHeader(Parameters, Chain) Export +Procedure StepItemListChangeVatRate_AgreementInHeader(Parameters, Chain) Export Chain.ChangeVatRate.Enable = True; If Chain.Idle Then @@ -11660,32 +12056,61 @@ Procedure StepChangeVatRate_AgreementInHeader(Parameters, Chain) Export Options.DocumentName = Parameters.ObjectMetadataInfo.MetadataName; Options.Key = Row.Key; - Options.StepName = "StepChangeVatRate_AgreementInHeader"; + Options.StepName = "StepItemListChangeVatRate_AgreementInHeader"; Chain.ChangeVatRate.Options.Add(Options); EndDo; EndProcedure -#EndRegion - -#Region ITEM_LIST_QUANTITY - -// ItemList.Quantity.OnChange -Procedure ItemListQuantityOnChange(Parameters) Export - AddViewNotify("OnSetItemListQuantityNotify", Parameters); - Binding = BindItemListQuantity(Parameters); - ModelClientServer_V2.EntryPoint(Binding.StepsEnabler, Parameters); -EndProcedure - -// ItemList.Quantity.Set -Procedure SetItemListQuantity(Parameters, Results) Export - Binding = BindItemListQuantity(Parameters); - SetterObject(Binding.StepsEnabler, Binding.DataPath, Parameters, Results, "OnSetItemListQuantityNotify"); -EndProcedure - -// ItemList.Quantity.Get -Function GetItemListQuantity(Parameters, _Key) - Return GetPropertyObject(Parameters, BindItemListQuantity(Parameters).DataPath, _Key); -EndFunction +// ItemList.VatRate.ChangeVatRate_StockDocuments.Step +Procedure StepItemListChangeVatRate_StockDocuments(Parameters, Chain) Export + Chain.ChangeVatRate.Enable = True; + + If Chain.Idle Then + Return; + EndIf; + + Chain.ChangeVatRate.Setter = "SetItemListVatRate"; + + Options_Date = GetDate(Parameters); + Options_Company = GetCompany(Parameters); + + TableRows = GetRows(Parameters, Parameters.TableName); + + For Each Row In TableRows Do + Options = ModelClientServer_V2.ChangeVatRateOptions(); + + Options.ItemKey = GetItemListItemKey(Parameters, Row.Key); + Options.Date = Options_Date; + Options.Company = Options_Company; + Options.DocumentName = Parameters.ObjectMetadataInfo.MetadataName; + + Options.Key = Row.Key; + Options.StepName = "StepItemListChangeVatRate_StockDocuments"; + Chain.ChangeVatRate.Options.Add(Options); + EndDo; +EndProcedure + +#EndRegion + +#Region ITEM_LIST_QUANTITY + +// ItemList.Quantity.OnChange +Procedure ItemListQuantityOnChange(Parameters) Export + AddViewNotify("OnSetItemListQuantityNotify", Parameters); + Binding = BindItemListQuantity(Parameters); + ModelClientServer_V2.EntryPoint(Binding.StepsEnabler, Parameters); +EndProcedure + +// ItemList.Quantity.Set +Procedure SetItemListQuantity(Parameters, Results) Export + Binding = BindItemListQuantity(Parameters); + SetterObject(Binding.StepsEnabler, Binding.DataPath, Parameters, Results, "OnSetItemListQuantityNotify"); +EndProcedure + +// ItemList.Quantity.Get +Function GetItemListQuantity(Parameters, _Key) + Return GetPropertyObject(Parameters, BindItemListQuantity(Parameters).DataPath, _Key); +EndFunction // ItemList.Quantity.Default.Bind Function BindDefaultItemListQuantity(Parameters) @@ -11697,11 +12122,7 @@ EndFunction // ItemList.Quantity.Bind Function BindItemListQuantity(Parameters) DataPath = "ItemList.Quantity"; - Binding = New Structure(); - Binding.Insert("StockAdjustmentAsSurplus", - "StepItemListSimpleCalculations_IsQuantityChanged, - |StepItemListCalculateQuantityInBaseUnit"); - + Binding = New Structure(); Return BindSteps("StepItemListCalculateQuantityInBaseUnit", DataPath, Binding, Parameters, "BindItemListQuantity"); EndFunction @@ -11739,10 +12160,10 @@ Function BindItemListConsignor(Parameters) DataPath = "ItemList.Consignor"; Binding = New Structure(); - Binding.Insert("SalesInvoice", "StepChangeVatRate_AgreementInHeader"); - Binding.Insert("RetailSalesReceipt", "StepChangeVatRate_AgreementInHeader"); - Binding.Insert("RetailReceiptCorrection", "StepChangeVatRate_AgreementInHeader"); - Binding.Insert("SalesReturn", "StepChangeVatRate_AgreementInHeader"); + Binding.Insert("SalesInvoice" , "StepItemListChangeVatRate_AgreementInHeader"); + Binding.Insert("RetailSalesReceipt" , "StepItemListChangeVatRate_AgreementInHeader"); + Binding.Insert("RetailReceiptCorrection" , "StepItemListChangeVatRate_AgreementInHeader"); + Binding.Insert("SalesReturn" , "StepItemListChangeVatRate_AgreementInHeader"); Return BindSteps("BindVoid", DataPath, Binding, Parameters, "BindItemListConsignor"); EndFunction @@ -11793,11 +12214,11 @@ Function BindItemListInventoryOrigin(Parameters) DataPath = "ItemList.InventoryOrigin"; Binding = New Structure(); - Binding.Insert("SalesInvoice", "StepChangeVatRate_AgreementInHeader"); - Binding.Insert("RetailSalesReceipt", "StepChangeVatRate_AgreementInHeader"); - Binding.Insert("RetailReceiptCorrection", "StepChangeVatRate_AgreementInHeader"); - Binding.Insert("SalesReturn", "StepChangeVatRate_AgreementInHeader"); - Binding.Insert("RetailReturnReceipt", "StepChangeVatRate_AgreementInHeader"); + Binding.Insert("SalesInvoice" , "StepItemListChangeVatRate_AgreementInHeader"); + Binding.Insert("RetailSalesReceipt" , "StepItemListChangeVatRate_AgreementInHeader"); + Binding.Insert("RetailReceiptCorrection" , "StepItemListChangeVatRate_AgreementInHeader"); + Binding.Insert("SalesReturn" , "StepItemListChangeVatRate_AgreementInHeader"); + Binding.Insert("RetailReturnReceipt" , "StepItemListChangeVatRate_AgreementInHeader"); Return BindSteps("BindVoid", DataPath, Binding, Parameters, "BindItemListInventoryOrigin"); EndFunction @@ -11943,6 +12364,9 @@ Function BindItemListQuantityInBaseUnit(Parameters) Binding.Insert("SalesReturn", "StepItemListCalculations_IsQuantityInBaseUnitChanged"); + Binding.Insert("StockAdjustmentAsSurplus", + "StepItemListCalculations_IsQuantityInBaseUnitChanged_StockDocuments"); + Return BindSteps("BindVoid", DataPath, Binding, Parameters, "BindItemListQuantityInBaseUnit"); EndFunction @@ -12386,6 +12810,9 @@ Function BindItemListTaxAmount(Parameters) Binding.Insert("SalesReturn", "StepItemListCalculations_IsTaxAmountChanged"); + Binding.Insert("StockAdjustmentAsSurplus", + "StepItemListCalculations_IsTaxAmountChanged_StockDocuments"); + Return BindSteps("BindVoid", DataPath, Binding, Parameters, "BindItemListTaxAmount"); EndFunction @@ -12544,31 +12971,10 @@ Function BindItemListTotalAmount(Parameters) "StepItemListChangePriceTypeAsManual_IsTotalAmountChange, |StepItemListCalculations_IsTotalAmountChanged"); - Return BindSteps("BindVoid", DataPath, Binding, Parameters, "BindItemListTotalAmount"); -EndFunction - -#EndRegion - -#Region ITEM_LIST_AMOUNT - -// ItemList.Amount.OnChange -Procedure ItemListAmountOnChange(Parameters) Export - Binding = BindItemListAmount(Parameters); - ModelClientServer_V2.EntryPoint(Binding.StepsEnabler, Parameters); -EndProcedure - -// ItemList.Amount.Get -Function GetItemListAmount(Parameters, _Key) - Return GetPropertyObject(Parameters, BindItemListAmount(Parameters).DataPath , _Key); -EndFunction - -// ItemList.Amount.Bind -Function BindItemListAmount(Parameters) - DataPath = "ItemList.Amount"; - Binding = New Structure(); Binding.Insert("StockAdjustmentAsSurplus", - "StepItemListSimpleCalculations_IsAmountChanged"); - Return BindSteps("BindVoid", DataPath, Binding, Parameters, "BindItemListAmount"); + "StepItemListCalculations_IsTotalAmountChanged_StockDocuments"); + + Return BindSteps("BindVoid", DataPath, Binding, Parameters, "BindItemListTotalAmount"); EndFunction #EndRegion @@ -12600,6 +13006,17 @@ Procedure SetItemListCalculations_Without_SpecialOffers(Parameters, Results) Exp SetSpecialOffers(Parameters, Results); EndProcedure +// ItemList.Calculations_StockDocuments.Set +Procedure SetItemListCalculations_StockDocuments(Parameters, Results) Export + ViewNotify = "OnSetCalculationsNotify"; + NotifyAnyway = True; + Binding = BindItemListCalculations(Parameters); + SetterObject(Undefined, "ItemList.NetAmount" , Parameters, Results, ViewNotify, "NetAmount" , NotifyAnyway); + SetterObject(Undefined, "ItemList.TaxAmount" , Parameters, Results, ViewNotify, "TaxAmount" , NotifyAnyway); + SetterObject(Undefined, "ItemList.Price" , Parameters, Results, ViewNotify, "Price" , NotifyAnyway); + SetterObject(Binding.StepsEnabler, "ItemList.TotalAmount" , Parameters, Results, ViewNotify, "TotalAmount" , NotifyAnyway); +EndProcedure + // ItemList.Calculations.Bind Function BindItemListCalculations(Parameters) DataPath = ""; @@ -12625,6 +13042,52 @@ Function BindItemListCalculations(Parameters) Return BindSteps("BindVoid", DataPath, Binding, Parameters, "BindItemListCalculations"); EndFunction +#Region ITEM_LIST_CALCULATIONS_WITHOUT_SPECIAL_OFFERS + +// ItemList.Calculations.[IsPriceIncludeTaxChanged_Without_SpecialOffers].Step +Procedure StepItemListCalculations_IsPriceIncludeTaxChanged_Without_SpecialOffers(Parameters, Chain) Export + StepItemListCalculations_Without_SpecialOffers(Parameters, Chain, "IsPriceIncludeTaxChanged"); +EndProcedure + +// ItemList.Calculations.[IsPriceChanged_Without_SpecialsOffers].Step +Procedure StepItemListCalculations_IsPriceChanged_Without_SpecialOffers(Parameters, Chain) Export + StepItemListCalculations_Without_SpecialOffers(Parameters, Chain, "IsPriceChanged"); +EndProcedure + +// ItemList.Calculations.[IsTotalAmountChanged_Without_SpecialOffers].Step +Procedure StepItemListCalculations_IsTotalAmountChanged_Without_SpecialOffers(Parameters, Chain) Export + StepItemListCalculations_Without_SpecialOffers(Parameters, Chain, "IsTotalAmountChanged"); +EndProcedure + +// ItemList.Calculations.[IsDontCalculateRowChanged_Without_SpecialOffers].Step +Procedure StepItemListCalculations_IsDontCalculateRowChanged_Without_SpecialOffers(Parameters, Chain) Export + StepItemListCalculations_Without_SpecialOffers(Parameters, Chain, "IsDontCalculateRowChanged"); +EndProcedure + +// ItemList.Calculations.[IsQuantityInBaseUnitChanged_Without_SpecialOffers].Step +Procedure StepItemListCalculations_IsQuantityInBaseUnitChanged_Without_SpecialOffers(Parameters, Chain) Export + StepItemListCalculations_Without_SpecialOffers(Parameters, Chain, "IsQuantityInBaseUnitChanged"); +EndProcedure + +// ItemList.Calculations.[IsRecalculationWhenBasedOn_Without_SpecialOffers].Step +Procedure StepItemListCalculations_IsRecalculationWhenBasedOn_Without_SpecialOffers(Parameters, Chain) Export + StepItemListCalculations_Without_SpecialOffers(Parameters, Chain, "IsRecalculationWhenBasedOn"); +EndProcedure + +// ItemList.Calculations.[IsVatRateChanged_Without_SpecialOffers].Step +Procedure StepItemListCalculations_IsVatRateChanged_Without_SpecialOffers(Parameters, Chain) Export + StepItemListCalculations_Without_SpecialOffers(Parameters, Chain, "IsVatRateChanged"); +EndProcedure + +// ItemList.Calculations.[IsTaxAmountChanged_Without_SpecialOffers].Step +Procedure StepItemListCalculations_IsTaxAmountChanged_Without_SpecialOffers(Parameters, Chain) Export + StepItemListCalculations_Without_SpecialOffers(Parameters, Chain, "IsTaxAmountChanged"); +EndProcedure + +#EndRegion + +#Region ITEM_LIST_CALCULATIONS + // ItemList.Calculations.[RecalculationsOnCopy].Step Procedure StepItemListCalculations_RecalculationsOnCopy(Parameters, Chain) Export If Parameters.FormIsExists And Parameters.FormParameters.IsCopy Then @@ -12642,11 +13105,6 @@ Procedure StepItemListCalculations_IsPriceIncludeTaxChanged(Parameters, Chain) E StepItemListCalculations(Parameters, Chain, "IsPriceIncludeTaxChanged"); EndProcedure -// ItemList.Calculations.[IsPriceIncludeTaxChanged_Without_SpecialOffers].Step -Procedure StepItemListCalculations_IsPriceIncludeTaxChanged_Without_SpecialOffers(Parameters, Chain) Export - StepItemListCalculations_Without_SpecialOffers(Parameters, Chain, "IsPriceIncludeTaxChanged"); -EndProcedure - // ItemList.Calculations.[IsOffersChanged].Step Procedure StepItemListCalculations_IsOffersChanged(Parameters, Chain) Export StepItemListCalculations(Parameters, Chain, "IsOffersChanged"); @@ -12657,66 +13115,31 @@ Procedure StepItemListCalculations_IsPriceChanged(Parameters, Chain) Export StepItemListCalculations(Parameters, Chain, "IsPriceChanged"); EndProcedure -// ItemList.Calculations.[IsPriceChanged_Without_SpecialsOffers].Step -Procedure StepItemListCalculations_IsPriceChanged_Without_SpecialOffers(Parameters, Chain) Export - StepItemListCalculations_Without_SpecialOffers(Parameters, Chain, "IsPriceChanged"); -EndProcedure - // ItemList.Calculations.[IsTotalAmountChanged].Step Procedure StepItemListCalculations_IsTotalAmountChanged(Parameters, Chain) Export StepItemListCalculations(Parameters, Chain, "IsTotalAmountChanged"); EndProcedure -// ItemList.Calculations.[IsTotalAmountChanged_Without_SpecialOffers].Step -Procedure StepItemListCalculations_IsTotalAmountChanged_Without_SpecialOffers(Parameters, Chain) Export - StepItemListCalculations_Without_SpecialOffers(Parameters, Chain, "IsTotalAmountChanged"); -EndProcedure - // ItemList.Calculations.[IsDontCalculateRowChanged].Step Procedure StepItemListCalculations_IsDontCalculateRowChanged(Parameters, Chain) Export StepItemListCalculations(Parameters, Chain, "IsDontCalculateRowChanged"); EndProcedure -// ItemList.Calculations.[IsDontCalculateRowChanged_Without_SpecialOffers].Step -Procedure StepItemListCalculations_IsDontCalculateRowChanged_Without_SpecialOffers(Parameters, Chain) Export - StepItemListCalculations_Without_SpecialOffers(Parameters, Chain, "IsDontCalculateRowChanged"); -EndProcedure - // ItemList.Calculations.[IsQuantityInBaseUnitChanged].Step Procedure StepItemListCalculations_IsQuantityInBaseUnitChanged(Parameters, Chain) Export StepItemListCalculations(Parameters, Chain, "IsQuantityInBaseUnitChanged"); EndProcedure -// ItemList.Calculations.[IsQuantityInBaseUnitChanged_Without_SpecialOffers].Step -Procedure StepItemListCalculations_IsQuantityInBaseUnitChanged_Without_SpecialOffers(Parameters, Chain) Export - StepItemListCalculations_Without_SpecialOffers(Parameters, Chain, "IsQuantityInBaseUnitChanged"); -EndProcedure - -// ItemList.Calculations.[IsRecalculationWhenBasedOn_Without_SpecialOffers].Step -Procedure StepItemListCalculations_IsRecalculationWhenBasedOn_Without_SpecialOffers(Parameters, Chain) Export - StepItemListCalculations_Without_SpecialOffers(Parameters, Chain, "IsRecalculationWhenBasedOn"); -EndProcedure - // ItemList.Calculations.[IsVatRateChanged].Step Procedure StepItemListCalculations_IsVatRateChanged(Parameters, Chain) Export StepItemListCalculations(Parameters, Chain, "IsVatRateChanged"); EndProcedure -// ItemList.Calculations.[IsVatRateChanged_Without_SpecialOffers].Step -Procedure StepItemListCalculations_IsVatRateChanged_Without_SpecialOffers(Parameters, Chain) Export - StepItemListCalculations_Without_SpecialOffers(Parameters, Chain, "IsVatRateChanged"); -EndProcedure - // ItemList.Calculations.[IsTaxAmountChanged].Step Procedure StepItemListCalculations_IsTaxAmountChanged(Parameters, Chain) Export StepItemListCalculations(Parameters, Chain, "IsTaxAmountChanged"); EndProcedure -// ItemList.Calculations.[IsTaxAmountChanged_Without_SpecialOffers].Step -Procedure StepItemListCalculations_IsTaxAmountChanged_Without_SpecialOffers(Parameters, Chain) Export - StepItemListCalculations_Without_SpecialOffers(Parameters, Chain, "IsTaxAmountChanged"); -EndProcedure - // ItemList.Calculations.[IsTaxAmountUserFormChanged].Step Procedure StepItemListCalculations_IsTaxAmountUserFormChanged(Parameters, Chain) Export StepItemListCalculations(Parameters, Chain, "IsTaxAmountUserFormChanged"); @@ -12727,6 +13150,42 @@ Procedure StepItemListCalculations_IsRecalculationWhenBasedOn(Parameters, Chain) StepItemListCalculations(Parameters, Chain, "IsRecalculationWhenBasedOn"); EndProcedure +#EndRegion + +#Region ITEM_LIST_CALCULATIONS_STOCK_DOCUMENTS + +// ItemList.Calculations.[IsPriceChanged_StockDocuments].Step +Procedure StepItemListCalculations_IsPriceChanged_StockDocuments(Parameters, Chain) Export + StepItemListCalculations_StockDocuments(Parameters, Chain, "IsPriceChanged"); +EndProcedure + +// ItemList.Calculations.[IsTotalAmountChanged_StockDocuments].Step +Procedure StepItemListCalculations_IsTotalAmountChanged_StockDocuments(Parameters, Chain) Export + StepItemListCalculations_StockDocuments(Parameters, Chain, "IsTotalAmountChanged"); +EndProcedure + +// ItemList.Calculations.[IsQuantityInBaseUnitChanged_StockDocuments].Step +Procedure StepItemListCalculations_IsQuantityInBaseUnitChanged_StockDocuments(Parameters, Chain) Export + StepItemListCalculations_StockDocuments(Parameters, Chain, "IsQuantityInBaseUnitChanged"); +EndProcedure + +// ItemList.Calculations.[IsRecalculationWhenBasedOn_StockDocuments].Step +Procedure StepItemListCalculations_IsRecalculationWhenBasedOn_StockDocuments(Parameters, Chain) Export + StepItemListCalculations_StockDocuments(Parameters, Chain, "IsRecalculationWhenBasedOn"); +EndProcedure + +// ItemList.Calculations.[IsVatRateChanged_StockDocuments].Step +Procedure StepItemListCalculations_IsVatRateChanged_StockDocuments(Parameters, Chain) Export + StepItemListCalculations_StockDocuments(Parameters, Chain, "IsVatRateChanged"); +EndProcedure + +// ItemList.Calculations.[IsTaxAmountChanged_StockDocuments].Step +Procedure StepItemListCalculations_IsTaxAmountChanged_StockDocuments(Parameters, Chain) Export + StepItemListCalculations_StockDocuments(Parameters, Chain, "IsTaxAmountChanged"); +EndProcedure + +#EndRegion + Procedure StepItemListCalculations(Parameters, Chain, WhoIsChanged) Chain.Calculations.Enable = True; If Chain.Idle Then @@ -12823,12 +13282,14 @@ Procedure StepItemListCalculations_Without_SpecialOffers(Parameters, Chain, WhoI Options = ModelClientServer_V2.CalculationsOptions(); Options.Ref = Parameters.Object.Ref; - // need recalculate NetAmount, TotalAmount, TaxAmount, OffersAmount - If WhoIsChanged = "IsPriceChanged" Or WhoIsChanged = "IsPriceIncludeTaxChanged" - Or WhoIsChanged = "IsDontCalculateRowChanged" Or WhoIsChanged = "IsQuantityInBaseUnitChanged" + // need recalculate NetAmount, TotalAmount, TaxAmount + If WhoIsChanged = "IsPriceChanged" + Or WhoIsChanged = "IsPriceIncludeTaxChanged" + Or WhoIsChanged = "IsDontCalculateRowChanged" + Or WhoIsChanged = "IsQuantityInBaseUnitChanged" Or WhoIsChanged = "IsVatRateChanged" - Or WhoIsChanged = "IsCopyRow" Or WhoIsChanged = "IsTaxAmountUserFormChanged" - Or WhoIsChanged = "RecalculationsOnCopy" Or WhoIsChanged = "IsRecalculationWhenBasedOn" Then + Or WhoIsChanged = "IsTaxAmountUserFormChanged" + Or WhoIsChanged = "IsRecalculationWhenBasedOn" Then Options.CalculateNetAmount.Enable = True; Options.CalculateTotalAmount.Enable = True; Options.CalculateTaxAmount.Enable = True; @@ -12875,64 +13336,60 @@ Procedure StepItemListCalculations_Without_SpecialOffers(Parameters, Chain, WhoI Options.TaxOptions.VatRate = GetItemListVatRate(Parameters, Row.Key); Options.Key = Row.Key; - Options.StepName = "StepItemListCalculations"; + Options.StepName = "StepItemListCalculations_Without_SpecialOffers"; Chain.Calculations.Options.Add(Options); EndDo; EndProcedure -#EndRegion - -#Region ITEM_LIST_SIMPLE_CALCULATIONS - -// ItemList.SimpleCalculations.Set -Procedure SetItemListSimpleCalculations(Parameters, Results) Export - ResourceToBinding = New Map(); - ResourceToBinding.Insert("Price" , BindItemListPrice(Parameters)); - ResourceToBinding.Insert("Amount", BindItemListAmount(Parameters)); - MultiSetterObject(Parameters, Results, ResourceToBinding); -EndProcedure - -// ItemList.SimpleCalculations.[IsPriceChanged].Step -Procedure StepItemListSimpleCalculations_IsPriceChanged(Parameters, Chain) Export - StepItemListSimpleCalculations(Parameters, Chain, "IsPriceChanged"); -EndProcedure - -// ItemList.SimpleCalculations.[IsAmountChanged].Step -Procedure StepItemListSimpleCalculations_IsAmountChanged(Parameters, Chain) Export - StepItemListSimpleCalculations(Parameters, Chain, "IsAmountChanged"); -EndProcedure - -// ItemList.SimpleCalculations.[IsQuantityChanged].Step -Procedure StepItemListSimpleCalculations_IsQuantityChanged(Parameters, Chain) Export - StepItemListSimpleCalculations(Parameters, Chain, "IsQuantityChanged"); -EndProcedure - -Procedure StepItemListSimpleCalculations(Parameters, Chain, WhoIsChanged) - Chain.SimpleCalculations.Enable = True; +Procedure StepItemListCalculations_StockDocuments(Parameters, Chain, WhoIsChanged) + Chain.Calculations.Enable = True; If Chain.Idle Then Return; EndIf; - Chain.SimpleCalculations.Setter = "SetItemListSimpleCalculations"; - + Chain.Calculations.Setter = "SetItemListCalculations_StockDocuments"; + For Each Row In GetRows(Parameters, Parameters.TableName) Do - Options = ModelClientServer_V2.SimpleCalculationsOptions(); + + Options = ModelClientServer_V2.CalculationsOptions(); Options.Ref = Parameters.Object.Ref; - Options.Key = Row.Key; - Options.DontExecuteIfExecutedBefore = True; - If WhoIsChanged = "IsPriceChanged" Or WhoIsChanged = "IsQuantityChanged" Then - Options.CalculateAmount.Enable = True; - ElsIf WhoIsChanged = "IsAmountChanged" Then - Options.CalculatePrice.Enable = True; + // need recalculate NetAmount, TotalAmount, TaxAmount + If WhoIsChanged = "IsPriceChanged" + Or WhoIsChanged = "IsQuantityInBaseUnitChanged" + Or WhoIsChanged = "IsVatRateChanged" + Or WhoIsChanged = "IsRecalculationWhenBasedOn" Then + Options.CalculateNetAmount.Enable = True; + Options.CalculateTotalAmount.Enable = True; + Options.CalculateTaxAmount.Enable = True; + ElsIf WhoIsChanged = "IsTotalAmountChanged" Then + // when TotalAmount is changed taxes need recalculate reverse, will be changed NetAmount and Price + Options.CalculateTaxAmountReverse.Enable = True; + Options.CalculateNetAmountAsTotalAmountMinusTaxAmount.Enable = True; + Options.CalculatePriceByTotalAmount.Enable = True; + ElsIf WhoIsChanged = "IsTaxAmountChanged" Then + // enable use ManualAmount when calculating TaxAmount + Options.TaxOptions.UseManualAmount = True; + Options.CalculateNetAmount.Enable = True; + Options.CalculateTotalAmount.Enable = True; + Options.CalculateTaxAmount.Enable = True; Else Raise StrTemplate("Unsupported [WhoIsChanged] = %1", WhoIsChanged); EndIf; - Options.Amount = GetItemListAmount(Parameters, Row.Key); - Options.Price = GetItemListPrice(Parameters, Row.Key); - Options.Quantity = GetItemListQuantity(Parameters, Row.Key); - Options.StepName = "StepItemListSimpleCalculations"; - Chain.SimpleCalculations.Options.Add(Options); + Options.AmountOptions.NetAmount = GetItemListNetAmount(Parameters, Row.Key); + Options.AmountOptions.TaxAmount = GetItemListTaxAmount(Parameters, Row.Key); + Options.AmountOptions.TotalAmount = GetItemListTotalAmount(Parameters, Row.Key); + + Options.PriceOptions.Price = GetItemListPrice(Parameters, Row.Key); + Options.PriceOptions.Quantity = GetItemListQuantity(Parameters, Row.Key); + Options.PriceOptions.QuantityInBaseUnit = GetItemListQuantityInBaseUnit(Parameters, Row.Key); + + Options.TaxOptions.PriceIncludeTax = False; + Options.TaxOptions.VatRate = GetItemListVatRate(Parameters, Row.Key); + + Options.Key = Row.Key; + Options.StepName = "StepItemListCalculations_StockDocuments"; + Chain.Calculations.Options.Add(Options); EndDo; EndProcedure @@ -15371,6 +15828,237 @@ EndProcedure #EndRegion +#Region TAXES_INCOMING_OUTGOING + +#Region TAXES_INCOMING_OUTGOING_LOAD_DATA + +// TaxesIncomingOutgoing.Load +Procedure TaxesIncomingOutgoingLoad(Parameters) Export + Binding = BindTaxesIncomingOutgoingLoad(Parameters); + ModelClientServer_V2.EntryPoint(Binding.StepsEnabler, Parameters); +EndProcedure + +// TaxesIncomingOutgoing.Load.Set +#If Server Then + +Procedure ServerTableLoaderTaxesIncomingOutgoing(Parameters, Results) Export + Binding = BindPaymentListLoad(Parameters); + LoaderTable(Binding.DataPath, Parameters, Results); +EndProcedure + +#EndIf + +// TaxesIncomingOutgoing.Load.Bind +Function BindTaxesIncomingOutgoingLoad(Parameters) + DataPath = "PaymentList"; + Binding = New Structure(); + Return BindSteps("StepTaxesIncomingOutgoingLoadTable", DataPath, Binding, Parameters, "BindPaymentListLoad"); +EndFunction + +// TaxesIncomingOutgoing.LoadAtServer.Step +Procedure StepTaxesIncomingOutgoingLoadTable(Parameters, Chain) Export + Chain.LoadTable.Enable = True; + If Chain.Idle Then + Return; + EndIf; + Chain.LoadTable.Setter = "ServerTableLoaderTaxesIncomingOutgoing"; + Options = ModelClientServer_V2.LoadTableOptions(); + Options.TableAddress = Parameters.LoadData.Address; + Chain.LoadTable.Options.Add(Options); +EndProcedure + +#EndRegion + +#Region TAXES_INCOMING_OUTGOING_VAT_RATE + +// TaxesIncomingOutgoing.VatRate.OnChange +Procedure TaxesIncomingOutgoingVatRateOnChange(Parameters) Export + Binding = BindTaxesIncomingOutgoingVatRate(Parameters); + ModelClientServer_V2.EntryPoint(Binding.StepsEnabler, Parameters); +EndProcedure + +// TaxesIncomingOutgoing.VatRate.Get +Function GetTaxesIncomingOutgoingVatRate(Parameters, _Key) + Return GetPropertyObject(Parameters, BindTaxesIncomingOutgoingVatRate(Parameters).DataPath, _Key); +EndFunction + +// TaxesIncomingOutgoing.VatRate.Bind +Function BindTaxesIncomingOutgoingVatRate(Parameters) + DataPathMap = New Map(); + DataPathMap.Insert("TaxesIncoming", "TaxesIncoming.VatRate"); + DataPathMap.Insert("TaxesOutgoing", "TaxesOutgoing.VatRate"); + DataPath = DataPathMap.Get(Parameters.TableName); + + Binding = New Structure(); + Return BindSteps("StepTaxesIncomingOutgoingCalculations_IsVatRateChanged", DataPath, Binding, Parameters, "BindTaxesIncomingOutgoingVatRate"); +EndFunction + +#EndRegion + +#Region TAXES_INCOMING_OUTGOING_TAX_AMOUNT + +// TaxesIncomingOutgoing.TaxAmount.OnChange +Procedure TaxesIncomingOutgoingTaxAmountOnChange(Parameters) Export + Binding = BindTaxesIncomingOutgoingTaxAmount(Parameters); + ModelClientServer_V2.EntryPoint(Binding.StepsEnabler, Parameters); +EndProcedure + +// TaxesIncomingOutgoing.TaxAmount.Get +Function GetTaxesIncomingOutgoingTaxAmount(Parameters, _Key) + Return GetPropertyObject(Parameters, BindTaxesIncomingOutgoingTaxAmount(Parameters).DataPath, _Key); +EndFunction + +// TaxesIncomingOutgoing.TaxAmount.Bind +Function BindTaxesIncomingOutgoingTaxAmount(Parameters) + DataPathMap = New Map(); + DataPathMap.Insert("TaxesIncoming", "TaxesIncoming.TaxAmount"); + DataPathMap.Insert("TaxesOutgoing", "TaxesOutgoing.TaxAmount"); + DataPath = DataPathMap.Get(Parameters.TableName); + + Binding = New Structure(); + Return BindSteps("StepTaxesIncomingOutgoingCalculations_IsTaxAmountChanged", DataPath, Binding, Parameters, "BindTaxesIncomingOutgoingTaxAmount"); +EndFunction + +#EndRegion + +#Region TAXES_INCOMING_OUTGOING_NET_AMOUNT + +// TaxesIncomingOutgoing.NetAmount.OnChange +Procedure TaxesIncomingOutgoingNetAmountOnChange(Parameters) Export + Binding = BindTaxesIncomingOutgoingNetAmount(Parameters); + ModelClientServer_V2.EntryPoint(Binding.StepsEnabler, Parameters); +EndProcedure + +// TaxesIncomingOutgoing.NetAmount.Get +Function GetTaxesIncomingOutgoingNetAmount(Parameters, _Key) + Return GetPropertyObject(Parameters, BindTaxesIncomingOutgoingNetAmount(Parameters).DataPath, _Key); +EndFunction + +// TaxesIncomingOutgoing.NetAmount.Bind +Function BindTaxesIncomingOutgoingNetAmount(Parameters) + DataPathMap = New Map(); + DataPathMap.Insert("TaxesIncoming", "TaxesIncoming.NetAmount"); + DataPathMap.Insert("TaxesOutgoing", "TaxesOutgoing.NetAmount"); + DataPath = DataPathMap.Get(Parameters.TableName); + + Binding = New Structure(); + Return BindSteps("StepTaxesIncomingOutgoingCalculations_IsNetAmountChanged", DataPath, Binding, Parameters, "BindTaxesIncomingOutgoingNetAmount"); +EndFunction + +#EndRegion + +#Region TAXES_INCOMING_OUTGOING_TOTAL_AMOUNT + +// TaxesIncomingOutgoing.TotalAmount.OnChange +Procedure TaxesIncomingOutgoingTotalAmountOnChange(Parameters) Export + AddViewNotify("OnChangeTaxesIncomingOutgoingTotalAmountNotify", Parameters); + Binding = BindTaxesIncomingOutgoingTotalAmount(Parameters); + ModelClientServer_V2.EntryPoint(Binding.StepsEnabler, Parameters); +EndProcedure + +// TaxesIncomingOutgoing.TotalAmount.Get +Function GetTaxesIncomingOutgoingTotalAmount(Parameters, _Key) + Return GetPropertyObject(Parameters, BindTaxesIncomingOutgoingTotalAmount(Parameters).DataPath, _Key); +EndFunction + +// TaxesIncomingOutgoing.TotalAmount.Bind +Function BindTaxesIncomingOutgoingTotalAmount(Parameters) + DataPathMap = New Map(); + DataPathMap.Insert("TaxesIncoming", "TaxesIncoming.TotalAmount"); + DataPathMap.Insert("TaxesOutgoing", "TaxesOutgoing.TotalAmount"); + DataPath = DataPathMap.Get(Parameters.TableName); + + Binding = New Structure(); + Return BindSteps("StepTaxesIncomingOutgoingCalculations_IsTotalAmountChanged", DataPath, Binding, Parameters, "BindTaxesIncomingOutgoingTotalAmount"); +EndFunction + +#EndRegion + +#Region TAXES_INCOMING_OUTGOING_CALCULATIONS_NET_TAX_TOTAL + +// TaxesIncomingOutgoing.Calculations.Set +Procedure SetTaxesIncomingOutgoingCalculations(Parameters, Results) Export + SetterObject(Undefined, BindTaxesIncomingOutgoingNetAmount(Parameters).DataPath , Parameters, Results, , "NetAmount"); + SetterObject(Undefined, BindTaxesIncomingOutgoingTaxAmount(Parameters).DataPath , Parameters, Results, , "TaxAmount"); + SetterObject(Undefined, BindTaxesIncomingOutgoingTotalAmount(Parameters).DataPath , Parameters, Results, + "OnChangeTaxesIncomingOutgoingTotalAmountNotify" , "TotalAmount"); +EndProcedure + +// TaxesIncomingOutgoing.Calculations.[IsVatRateChanged].Step +Procedure StepTaxesIncomingOutgoingCalculations_IsVatRateChanged(Parameters, Chain) Export + StepTaxesIncomingOutgoingCalculations(Parameters, Chain, "IsVatRateChanged"); +EndProcedure + +// TaxesIncomingOutgoing.Calculations.[IsTaxAmountChanged].Step +Procedure StepTaxesIncomingOutgoingCalculations_IsTaxAmountChanged(Parameters, Chain) Export + StepTaxesIncomingOutgoingCalculations(Parameters, Chain, "IsTaxAmountChanged"); +EndProcedure + +// TaxesIncomingOutgoing.Calculations.[IsNetAmountChanged].Step +Procedure StepTaxesIncomingOutgoingCalculations_IsNetAmountChanged(Parameters, Chain) Export + StepTaxesIncomingOutgoingCalculations(Parameters, Chain, "IsNetAmountChanged"); +EndProcedure + +// TaxesIncomingOutgoing.Calculations.[IsTotalAmountChanged].Step +Procedure StepTaxesIncomingOutgoingCalculations_IsTotalAmountChanged(Parameters, Chain) Export + StepTaxesIncomingOutgoingCalculations(Parameters, Chain, "IsTotalAmountChanged"); +EndProcedure + +Procedure StepTaxesIncomingOutgoingCalculations(Parameters, Chain, WhoIsChanged); + Chain.Calculations.Enable = True; + If Chain.Idle Then + Return; + EndIf; + Chain.Calculations.Setter = "SetTaxesIncomingOutgoingCalculations"; + + For Each Row In GetRows(Parameters, Parameters.TableName) Do + + Options = ModelClientServer_V2.CalculationsOptions(); + Options.Ref = Parameters.Object.Ref; + + // need recalculate NetAmount, TotalAmount, TaxAmount + If WhoIsChanged = "IsVatRateChanged" Then + Options.CalculateNetAmount.Enable = True; + Options.CalculateTotalAmount.Enable = True; + Options.CalculateTaxAmount.Enable = True; + + ElsIf WhoIsChanged = "IsTotalAmountChanged" Then + // when TotalAmount is changed taxes need recalculate reverse, will be changed NetAmount + Options.CalculateTaxAmountReverse.Enable = True; + Options.CalculateNetAmountAsTotalAmountMinusTaxAmount.Enable = True; + + ElsIf WhoIsChanged = "IsTaxAmountChanged" Then + // enable use ManualAmount when calculating TaxAmount + Options.TaxOptions.UseManualAmount = True; + Options.CalculateNetAmount.Enable = True; + Options.CalculateTotalAmount.Enable = True; + Options.CalculateTaxAmount.Enable = True; + + ElsIf WhoIsChanged = "IsNetAmountChanged" Then + Options.CalculateTaxAmountByNetAmount.Enable = True; + Options.CalculateTotalAmountByNetAmount.Enable = True; + Else + Raise StrTemplate("Unsupported [WhoIsChanged] = %1", WhoIsChanged); + EndIf; + + Options.AmountOptions.DontCalculateRow = False; + + Options.AmountOptions.NetAmount = GetTaxesIncomingOutgoingNetAmount(Parameters, Row.Key); + Options.AmountOptions.TaxAmount = GetTaxesIncomingOutgoingTaxAmount(Parameters, Row.Key); + Options.AmountOptions.TotalAmount = GetTaxesIncomingOutgoingTotalAmount(Parameters, Row.Key); + + Options.TaxOptions.VatRate = GetTaxesIncomingOutgoingVatRate(Parameters, Row.Key); + + Options.Key = Row.Key; + Options.StepName = "StepPaymentListCalculations" + WhoIsChanged; + Chain.Calculations.Options.Add(Options); + EndDo; +EndProcedure + +#EndRegion + +#EndRegion + // called when all chain steps is complete Procedure OnChainComplete(Parameters) Export #IF Client THEN @@ -15426,7 +16114,6 @@ Procedure ExecuteViewNotify(Parameters, ViewNotify) ElsIf ViewNotify = "CostListOnAddRowFormNotify" Then ViewClient_V2.CostListOnAddRowFormNotify(Parameters); ElsIf ViewNotify = "CostListOnCopyRowFormNotify" Then ViewClient_V2.CostListOnCopyRowFormNotify(Parameters); - ElsIf ViewNotify = "CostListAfterDeleteRowFormNotify" Then ViewClient_V2.CostListAfterDeleteRowFormNotify(Parameters); ElsIf ViewNotify = "FixedAssetsOnAddRowFormNotify" Then ViewClient_V2.FixedAssetsOnAddRowFormNotify(Parameters); ElsIf ViewNotify = "FixedAssetsOnCopyRowFormNotify" Then ViewClient_V2.FixedAssetsOnCopyRowFormNotify(Parameters); @@ -15546,6 +16233,11 @@ Procedure ExecuteViewNotify(Parameters, ViewNotify) ElsIf ViewNotify = "OnSetReceiveAgreementNotify" Then ViewClient_V2.OnSetReceiveAgreementNotify(Parameters); ElsIf ViewNotify = "OnSetSendDebtTypeNotify" Then ViewClient_V2.OnSetSendDebtTypeNotify(Parameters); ElsIf ViewNotify = "OnSetReceiveDebtTypeNotify" Then ViewClient_V2.OnSetReceiveDebtTypeNotify(Parameters); + ElsIf ViewNotify = "TaxesIncomingOutgoingOnAddRowFormNotify" Then ViewClient_V2.TaxesIncomingOutgoingOnAddRowFormNotify(Parameters); + ElsIf ViewNotify = "TaxesIncomingOutgoingOnCopyRowFormNotify" Then ViewClient_V2.TaxesIncomingOutgoingOnCopyRowFormNotify(Parameters); + + ElsIf ViewNotify = "TaxesIncomingOutgoingAfterDeleteRowFormNotify" Then ViewClient_V2.TaxesIncomingOutgoingAfterDeleteRowFormNotify(Parameters); + ElsIf ViewNotify = "OnChangeTaxesIncomingOutgoingTotalAmountNotify" Then ViewClient_V2.OnChangeTaxesIncomingOutgoingTotalAmountNotify(Parameters); Else Raise StrTemplate("Not handled view notify [%1]", ViewNotify); diff --git a/IRP/src/CommonModules/CurrenciesClientServer/Module.bsl b/IRP/src/CommonModules/CurrenciesClientServer/Module.bsl index 4e6c9ddc0d..dd4a565a71 100644 --- a/IRP/src/CommonModules/CurrenciesClientServer/Module.bsl +++ b/IRP/src/CommonModules/CurrenciesClientServer/Module.bsl @@ -64,13 +64,13 @@ Function GetParameters_V6(Object, Row) Export Return Parameters; EndFunction -Function GetParameters_V7(Object, RowKey, Currency, Amount) Export +Function GetParameters_V7(Object, RowKey, Currency, Amount, Agreement = Undefined) Export Parameters = New Structure(); Parameters.Insert("Ref" , Object.Ref); Parameters.Insert("Date" , Object.Date); Parameters.Insert("Company" , Object.Company); Parameters.Insert("Currency" , Currency); - Parameters.Insert("Agreement" , Undefined); + Parameters.Insert("Agreement" , Agreement); Parameters.Insert("RowKey" , RowKey); Parameters.Insert("DocumentAmount" , Amount); Parameters.Insert("Currencies" , GetCurrenciesTable(Object.Currencies, RowKey)); @@ -146,6 +146,32 @@ Function GetParameters_V12(Object) Export Return Parameters; EndFunction +Function GetParameters_V13(Object) Export + Parameters = New Structure(); + Parameters.Insert("Ref" , Object.Ref); + Parameters.Insert("Date" , Object.Date); + Parameters.Insert("Company" , Object.Company); + Parameters.Insert("Currency" , Object.Currency); + Parameters.Insert("Agreement" , Object.Agreement); + Parameters.Insert("RowKey" , Undefined); + Parameters.Insert("DocumentAmount" , Object.TaxesDifference.Total("Amount")); + Parameters.Insert("Currencies" , GetCurrenciesTable(Object.Currencies)); + Return Parameters; +EndFunction + +Function GetParameters_V14(Object, Row) Export + Parameters = New Structure(); + Parameters.Insert("Ref" , Object.Ref); + Parameters.Insert("Date" , Object.Date); + Parameters.Insert("Company" , Object.Company); + Parameters.Insert("Currency" , Object.Currency); + Parameters.Insert("Agreement" , Undefined); + Parameters.Insert("RowKey" , Row.Key); + Parameters.Insert("DocumentAmount" , Row.TotalAmount); + Parameters.Insert("Currencies" , GetCurrenciesTable(Object.Currencies, Row.Key)); + Return Parameters; +EndFunction + Function GetCurrenciesTable(Currencies, RowKey = Undefined) Export ArrayOfCurrenciesRows = New Array(); RowColumns = "Key, IsFixed, CurrencyFrom, Rate, ReverseRate, diff --git a/IRP/src/CommonModules/CurrenciesServer/Module.bsl b/IRP/src/CommonModules/CurrenciesServer/Module.bsl index a36ca8b116..126353e894 100644 --- a/IRP/src/CommonModules/CurrenciesServer/Module.bsl +++ b/IRP/src/CommonModules/CurrenciesServer/Module.bsl @@ -203,7 +203,12 @@ Procedure PreparePostingDataTables(Parameters, CurrencyTable, AddInfo = Undefine EndDo; EndIf; - ExchangeDifference(Parameters); + ExchangeDifference(Parameters); + + If Not CommonFunctionsClientServer.GetFromAddInfo(Parameters, "IsDebitCreditNoteDifference", False) + And Not CommonFunctionsClientServer.GetFromAddInfo(Parameters, "IsOffsetOfAdvances", False) Then + DebitCreditNoteDifference(Parameters); + EndIf; EndProcedure Function GetAdvancesCurrencyRevaluation(DocRef) @@ -299,20 +304,20 @@ EndFunction Function IsUseAgreementMovementType(RecMetadata) - TypeOfRecordSetsArray = New Array(); - TypeOfRecordSetsArray.Add(Metadata.AccumulationRegisters.R3010B_CashOnHand); - - //TypeOfRecordSetsArray.Add(Metadata.AccumulationRegisters.R2020B_AdvancesFromCustomers); - //TypeOfRecordSetsArray.Add(Metadata.AccumulationRegisters.R1020B_AdvancesToVendors); + ExcludeRegisters = New Array(); + ExcludeRegisters.Add(Metadata.AccumulationRegisters.R3010B_CashOnHand); + + ExcludeRegisters.Add(Metadata.AccumulationRegisters.R6070T_OtherPeriodsExpenses); + ExcludeRegisters.Add(Metadata.AccumulationRegisters.R6080T_OtherPeriodsRevenues); + ExcludeRegisters.Add(Metadata.AccumulationRegisters.R5022T_Expenses); + ExcludeRegisters.Add(Metadata.AccumulationRegisters.R5021T_Revenues); - TypeOfRecordSetsArray.Add(Metadata.AccumulationRegisters.R6070T_OtherPeriodsExpenses); - TypeOfRecordSetsArray.Add(Metadata.AccumulationRegisters.R6080T_OtherPeriodsRevenues); - TypeOfRecordSetsArray.Add(Metadata.AccumulationRegisters.R5022T_Expenses); - TypeOfRecordSetsArray.Add(Metadata.AccumulationRegisters.R5021T_Revenues); + ExcludeRegisters.Add(Metadata.AccumulationRegisters.T1040T_AccountingAmounts); - TypeOfRecordSetsArray.Add(Metadata.AccumulationRegisters.T1040T_AccountingAmounts); + ExcludeRegisters.Add(Metadata.AccumulationRegisters.R2040B_TaxesIncoming); + ExcludeRegisters.Add(Metadata.AccumulationRegisters.R1040B_TaxesOutgoing); - If TypeOfRecordSetsArray.Find(RecMetadata) = Undefined Then + If ExcludeRegisters.Find(RecMetadata) = Undefined Then Return True; Else Return False; @@ -376,6 +381,8 @@ Function ExpandTable(TempTableManager, RecordSet, UseAgreementMovementType, UseC AddAmountsColumns(RecordSet, "VendorTransaction"); AddAmountsColumns(RecordSet, "VendorAdvance"); AddAmountsColumns(RecordSet, "OtherTransaction"); + AddAmountsColumns(RecordSet, "TaxableAmount"); + AddAmountsColumns(RecordSet, "TaxAmount"); Query = New Query(); Query.TempTablesManager = TempTableManager; @@ -487,6 +494,18 @@ Function ExpandTable(TempTableManager, RecordSet, UseAgreementMovementType, UseC | THEN 0 | ELSE (RecordSet.OtherTransaction * CurrencyTable.Rate )/ CurrencyTable.Multiplicity | END AS Number(15,2)) AS OtherTransaction, + | CAST(CASE + | WHEN CurrencyTable.Rate = 0 + | OR CurrencyTable.Multiplicity = 0 + | THEN 0 + | ELSE (RecordSet.TaxableAmount * CurrencyTable.Rate )/ CurrencyTable.Multiplicity + | END AS Number(15,2)) AS TaxableAmount, + | CAST(CASE + | WHEN CurrencyTable.Rate = 0 + | OR CurrencyTable.Multiplicity = 0 + | THEN 0 + | ELSE (RecordSet.TaxAmount * CurrencyTable.Rate )/ CurrencyTable.Multiplicity + | END AS Number(15,2)) AS TaxAmount, | CurrencyTable.MovementType.DeferredCalculation AS DeferredCalculation, | CurrencyTable.MovementType.Currency AS Currency |FROM @@ -528,6 +547,8 @@ Function ExpandTable(TempTableManager, RecordSet, UseAgreementMovementType, UseC | CAST(RecordSet.VendorTransaction AS Number(15,2)) AS VendorTransaction, | CAST(RecordSet.VendorAdvance AS Number(15,2)) AS VendorAdvance, | CAST(RecordSet.OtherTransaction AS Number(15,2)) AS OtherTransaction, + | CAST(RecordSet.TaxableAmount AS Number(15,2)) AS TaxableAmount, + | CAST(RecordSet.TaxAmount AS Number(15,2)) AS TaxAmount, | FALSE, | RecordSet.Currency |FROM @@ -798,7 +819,7 @@ Procedure ExchangeDifference(Parameters) IsMoneyExchange = False; TransitIncoming = New ValueTable(); - TransitIncoming_PrepareTable = NEw ValueTable(); + TransitIncoming_PrepareTable = New ValueTable(); AccountingOperation_Revenues = Undefined; AccountingOperation_Expenses = Undefined; @@ -888,7 +909,7 @@ Procedure ExchangeDifference(Parameters) Return; // is not exchange EndIf; - Expenes = Parameters.PostingDataTables[Metadata.AccumulationRegisters.R5022T_Expenses].PrepareTable; + Expenses = Parameters.PostingDataTables[Metadata.AccumulationRegisters.R5022T_Expenses].PrepareTable; Revenues = Parameters.PostingDataTables[Metadata.AccumulationRegisters.R5021T_Revenues].PrepareTable; Accounting = Parameters.PostingDataTables[Metadata.AccumulationRegisters.T1040T_AccountingAmounts].PrepareTable; @@ -985,7 +1006,7 @@ Procedure ExchangeDifference(Parameters) Accounting_NewRow.Operation = AccountingOperation_Expenses; EndIf; - Expenses_NewRow = Expenes.Add(); + Expenses_NewRow = Expenses.Add(); FillPropertyValues(Expenses_NewRow, Row); Expenses_NewRow.ExpenseType = ExpenseType; Expenses_NewRow.ProfitLossCenter = LossCenter; @@ -1030,6 +1051,273 @@ EndProcedure #EndRegion +#Region DEBIT_CREDIT_NOTE_DIFFERENCE + +Procedure DebitCreditNoteDifference(Parameters) + + If Not (Parameters.Metadata = Metadata.Documents.DebitCreditNote + And Parameters.Object.SendCurrency <> Parameters.Object.ReceiveCurrency) Then + Return; + EndIf; + + TotalReceipt = 0; + TotalExpense = 0; + LegalCurrency = Undefined; + BalanceType = Undefined; + + // Send (expenses) + If Parameters.Object.SendDebtType = Enums.DebtTypes.TransactionCustomer Then + + Table = Parameters.PostingDataTables[Metadata.AccumulationRegisters.R2021B_CustomersTransactions].PrepareTable; + Result = GetAmountByRecordType(Table, "CustomersAdvancesClosing", AccumulationRecordType.Expense); + TotalExpense = Result.TotalAmount; + + ElsIf Parameters.Object.SendDebtType = Enums.DebtTypes.AdvanceCustomer Then + + Table = Parameters.PostingDataTables[Metadata.AccumulationRegisters.R2020B_AdvancesFromCustomers].PrepareTable; + Result = GetAmountByRecordType(Table, "CustomersAdvancesClosing", AccumulationRecordType.Expense); + TotalExpense = Result.TotalAmount; + + ElsIf Parameters.Object.SendDebtType = Enums.DebtTypes.TransactionVendor Then + + Table = Parameters.PostingDataTables[Metadata.AccumulationRegisters.R1021B_VendorsTransactions].PrepareTable; + Result = GetAmountByRecordType(Table, "VendorsAdvancesClosing", AccumulationRecordType.Expense); + TotalExpense = Result.TotalAmount; + + ElsIf Parameters.Object.SendDebtType = Enums.DebtTypes.AdvanceVendor Then + + Table = Parameters.PostingDataTables[Metadata.AccumulationRegisters.R1020B_AdvancesToVendors].PrepareTable; + Result = GetAmountByRecordType(Table, "VendorsAdvancesClosing", AccumulationRecordType.Expense); + TotalExpense = Result.TotalAmount; + + EndIf; + + // Receive (receipt) + If Parameters.Object.ReceiveDebtType = Enums.DebtTypes.TransactionCustomer Then + + Table = Parameters.PostingDataTables[Metadata.AccumulationRegisters.R2021B_CustomersTransactions].PrepareTable; + Result = GetAmountByRecordType(Table, "CustomersAdvancesClosing", AccumulationRecordType.Receipt); + BalanceType = "active"; + TotalReceipt = Result.TotalAmount; + LegalCurrency = Result.LegalCurrency; + + ElsIf Parameters.Object.ReceiveDebtType = Enums.DebtTypes.AdvanceCustomer Then + + Table = Parameters.PostingDataTables[Metadata.AccumulationRegisters.R2020B_AdvancesFromCustomers].PrepareTable; + Result = GetAmountByRecordType(Table, "CustomersAdvancesClosing", AccumulationRecordType.Receipt); + BalanceType = "passive"; + TotalReceipt = Result.TotalAmount; + LegalCurrency = Result.LegalCurrency; + + ElsIf Parameters.Object.ReceiveDebtType = Enums.DebtTypes.TransactionVendor Then + + Table = Parameters.PostingDataTables[Metadata.AccumulationRegisters.R1021B_VendorsTransactions].PrepareTable; + Result = GetAmountByRecordType(Table, "VendorsAdvancesClosing", AccumulationRecordType.Receipt); + BalanceType = "active"; + TotalReceipt = Result.TotalAmount; + LegalCurrency = Result.LegalCurrency; + + ElsIf Parameters.Object.ReceiveDebtType = Enums.DebtTypes.AdvanceVendor Then + + Table = Parameters.PostingDataTables[Metadata.AccumulationRegisters.R1020B_AdvancesToVendors].PrepareTable; + Result = GetAmountByRecordType(Table, "VendorsAdvancesClosing", AccumulationRecordType.Receipt); + BalanceType = "passive"; + TotalReceipt = Result.TotalAmount; + LegalCurrency = Result.LegalCurrency; + + EndIf; + + If TotalExpense = TotalReceipt Then + Return; + EndIf; + + DataInfo = New Structure(); + DataInfo.Insert("RecordPeriod" , Parameters.Object.Date); + DataInfo.Insert("ReceiveCurrency" , Parameters.Object.ReceiveCurrency); + DataInfo.Insert("DocRef" , Parameters.Object.Ref); + DataInfo.Insert("ExpenseType" , Parameters.Object.ExpenseType); + DataInfo.Insert("LossCenter" , Parameters.Object.LossCenter); + DataInfo.Insert("RevenueType" , Parameters.Object.RevenueType); + DataInfo.Insert("ProfitCenter" , Parameters.Object.ProfitCenter); + DataInfo.Insert("TransitUUID" , Parameters.Object.TransitUUID); + DataInfo.Insert("Company" , Parameters.Object.Company); + DataInfo.Insert("Branch" , Parameters.Object.Branch); + DataInfo.Insert("Project" , Parameters.Object.ReceiveProject); + DataInfo.Insert("LegalCurrency" , LegalCurrency); + DataInfo.Insert("CurrenciesTable" , Parameters.Object.Currencies.Unload().Copy(New Structure("Key", DataInfo.TransitUUID))); + + Expenses = Parameters.PostingDataTables[Metadata.AccumulationRegisters.R5022T_Expenses].PrepareTable; + Revenues = Parameters.PostingDataTables[Metadata.AccumulationRegisters.R5021T_Revenues].PrepareTable; + Accounting = Parameters.PostingDataTables[Metadata.AccumulationRegisters.T1040T_AccountingAmounts].PrepareTable; + + Accounting_ClearCopy = Accounting.CopyColumns("Period, Operation, Currency, DrCurrency, CrCurrency, Amount, Key"); + + Revenues_ClearCopy = Revenues.CopyColumns("Period, Company, Branch, ProfitLossCenter, RevenueType, Currency, Project, Amount"); + Revenues_ClearCopy.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); + + Expenses_ClearCopy = Expenses.CopyColumns("Period, Company, Branch, ProfitLossCenter, ExpenseType, Currency, Project, Amount"); + Expenses_ClearCopy.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); + + If BalanceType = "active" Then + // is revenue + If TotalExpense < TotalReceipt Then + + Revenue_Amount = TotalReceipt - TotalExpense; + + AddRecord_Revenue_Accounting(DataInfo, Accounting_ClearCopy, Revenue_Amount); + AddRecord_Revenue(DataInfo, Revenues_ClearCopy, Revenue_Amount); + + // is Expense + ElsIf TotalExpense > TotalReceipt Then + + Expense_Amount = TotalExpense - TotalReceipt; + + AddRecord_Expense_Accounting(DataInfo, Accounting_ClearCopy, Expense_Amount); + AddRecord_Expense(DataInfo, Expenses_ClearCopy, Expense_Amount); + + EndIf; + EndIf; + + If BalanceType = "passive" Then + // is Expense + If TotalExpense < TotalReceipt Then + + Expense_Amount = TotalReceipt - TotalExpense; + + AddRecord_Expense_Accounting(DataInfo, Accounting_ClearCopy, Expense_Amount); + AddRecord_Expense(DataInfo, Expenses_ClearCopy, Expense_Amount); + + // is Revenue + ElsIf TotalExpense > TotalReceipt Then + + Revenue_Amount = TotalExpense - TotalReceipt; + + AddRecord_Revenue_Accounting(DataInfo, Accounting_ClearCopy, Revenue_Amount); + AddRecord_Revenue(DataInfo, Revenues_ClearCopy, Revenue_Amount); + + EndIf; + EndIf; + + PostingDataTables = New Map(); + + RecordSet_AccountingAmounts = AccumulationRegisters.T1040T_AccountingAmounts.CreateRecordSet(); + Settings_AccountingAmounts = PostingServer.PostingTableSettings(Accounting_ClearCopy, RecordSet_AccountingAmounts); + PostingDataTables.Insert(RecordSet_AccountingAmounts.Metadata(), Settings_AccountingAmounts); + + RecordSet_Expenses = AccumulationRegisters.R5022T_Expenses.CreateRecordSet(); + Settings_Expenses = PostingServer.PostingTableSettings(Expenses_ClearCopy, RecordSet_Expenses); + PostingDataTables.Insert(RecordSet_Expenses.Metadata(), Settings_Expenses); + + RecordSet_Revenues = AccumulationRegisters.R5021T_Revenues.CreateRecordSet(); + Settings_Revenues = PostingServer.PostingTableSettings(Revenues_ClearCopy, RecordSet_Revenues); + PostingDataTables.Insert(RecordSet_Revenues.Metadata(), Settings_Revenues); + + CurrenciesParameters = New Structure("IsDebitCreditNoteDifference", True); + + ArrayOfPostingInfo = New Array(); + For Each DataTable In PostingDataTables Do + ArrayOfPostingInfo.Add(DataTable); + EndDo; + CurrenciesParameters.Insert("Object" , DataInfo.DocRef); + CurrenciesParameters.Insert("Metadata" , DataInfo.DocRef.Metadata()); + CurrenciesParameters.Insert("ArrayOfPostingInfo", ArrayOfPostingInfo); + + PreparePostingDataTables(CurrenciesParameters, DataInfo.CurrenciesTable); + + For Each ItemOfPostingInfo In ArrayOfPostingInfo Do + If ItemOfPostingInfo.Key = Metadata.AccumulationRegisters.T1040T_AccountingAmounts Then + For Each RowPostingInfo In ItemOfPostingInfo.Value.PrepareTable Do + FillPropertyValues(Accounting.Add(), RowPostingInfo); + EndDo; + EndIf; + + If ItemOfPostingInfo.Key = Metadata.AccumulationRegisters.R5022T_Expenses Then + For Each RowPostingInfo In ItemOfPostingInfo.Value.PrepareTable Do + FillPropertyValues(Expenses.Add(), RowPostingInfo); + EndDo; + EndIf; + + If ItemOfPostingInfo.Key = Metadata.AccumulationRegisters.R5021T_Revenues Then + For Each RowPostingInfo In ItemOfPostingInfo.Value.PrepareTable Do + FillPropertyValues(Revenues.Add(), RowPostingInfo); + EndDo; + EndIf; + + EndDo; +EndProcedure + +Function GetAmountByRecordType(Table, IgnoreColumnName, RecordType) + Result = New Structure("LegalCurrency, TotalAmount", Undefined, 0); + + For Each Row In Table Do + If ValueIsFilled(Row[IgnoreColumnName]) Then + Continue; + EndIf; + + If Row.CurrencyMovementType.Type <> Enums.CurrencyType.Legal Then + Continue; + EndIf; + + Result.LegalCurrency = Row.Currency; + + If Row.RecordType = RecordType Then + Result.TotalAmount = Result.TotalAmount + Row.Amount; + EndIf; + EndDo; + + Return Result; +EndFunction + +Procedure AddRecord_Revenue(DataInfo, Revenues_ClearCopy, Amount) + NewRow = Revenues_ClearCopy.Add(); + NewRow.Period = DataInfo.RecordPeriod; + NewRow.Company = DataInfo.Company; + NewRow.Branch = DataInfo.Branch; + NewRow.ProfitLossCenter = DataInfo.ProfitCenter; + NewRow.RevenueType = DataInfo.RevenueType; + NewRow.Currency = DataInfo.LegalCurrency; + NewRow.Project = DataInfo.Project; + NewRow.Amount = Amount; + NewRow.Key = DataInfo.TransitUUID; +EndProcedure + +Procedure AddRecord_Expense(DataInfo, Expenses_ClearCopy, Amount) + NewRow = Expenses_ClearCopy.Add(); + NewRow.Period = DataInfo.RecordPeriod; + NewRow.Company = DataInfo.Company; + NewRow.Branch = DataInfo.Branch; + NewRow.ProfitLossCenter = DataInfo.LossCenter; + NewRow.ExpenseType = DataInfo.ExpenseType; + NewRow.Currency = DataInfo.LegalCurrency; + NewRow.Project = DataInfo.Project; + NewRow.Amount = Amount; + NewRow.Key = DataInfo.TransitUUID; +EndProcedure + +Procedure AddRecord_Revenue_Accounting(DataInfo, Accounting_ClearCopy, Amount) + NewRow = Accounting_ClearCopy.Add(); + NewRow.Period = DataInfo.RecordPeriod; + NewRow.Currency = DataInfo.LegalCurrency; + NewRow.Key = DataInfo.TransitUUID; + NewRow.Operation = Catalogs.AccountingOperations.DebitCreditNote_DR_R5020B_PartnersBalance_CR_R5021_Revenues; + NewRow.DrCurrency = DataInfo.ReceiveCurrency; + NewRow.CrCurrency = DataInfo.LegalCurrency; + NewRow.Amount = Amount; +EndProcedure + +Procedure AddRecord_Expense_Accounting(DataInfo, Accounting_ClearCopy, Amount) + NewRow = Accounting_ClearCopy.Add(); + NewRow.Period = DataInfo.RecordPeriod; + NewRow.Currency = DataInfo.LegalCurrency; + NewRow.Key = DataInfo.TransitUUID; + NewRow.Operation = Catalogs.AccountingOperations.DebitCreditNote_DR_R5022T_Expenses_CR_R5020B_PartnersBalance; + NewRow.DrCurrency = DataInfo.LegalCurrency; + NewRow.CrCurrency = DataInfo.ReceiveCurrency; + NewRow.Amount = Amount; +EndProcedure + +#EndRegion + #Region CURRENCY_REVALUATION Function CreateExpenseRevenueInfo(Params) Export @@ -1136,6 +1424,7 @@ Procedure RevaluateCurrency(_TempTablesManager, ArrayOfRegisterNames, CurrencyRa CurrentAmountValue = OtherCurrencyRow.Amount; RevaluatedAmountValue = (ItemOfDataForRevaluate.CurrentBalanceByTransactionCurrency * CurrencyInfo[0].Rate) / CurrencyInfo[0].Multiplicity; + RevaluatedAmountValue = Round(RevaluatedAmountValue, 2); _IsExpense = False; _IsRevenue = False; @@ -1273,7 +1562,7 @@ EndFunction Function GetMetadataReisterName(RegisterName) If StrStartsWith(RegisterName, "R5020B_PartnersBalance") Then - Return "R5020B_PartnersBalance"; + Return "R5020B_PartnersBalance"; Else Return RegisterName; EndIf; diff --git a/IRP/src/CommonModules/DocCashExpenseRevenueServer/Module.bsl b/IRP/src/CommonModules/DocCashExpenseRevenueServer/Module.bsl index 2bba363ec9..916c8d0b26 100644 --- a/IRP/src/CommonModules/DocCashExpenseRevenueServer/Module.bsl +++ b/IRP/src/CommonModules/DocCashExpenseRevenueServer/Module.bsl @@ -7,10 +7,12 @@ EndProcedure Procedure OnReadAtServer(Object, Form, CurrentObject) Export MoneyDocumentsServer.OnReadAtServer(Object, Form, CurrentObject); LockDataModificationPrivileged.LockFormIfObjectIsLocked(Form, CurrentObject); + AccountingServer.OnReadAtServer(Object, Form, CurrentObject); EndProcedure Procedure AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters) Export MoneyDocumentsServer.AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters); + AccountingServer.AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters); EndProcedure #EndRegion diff --git a/IRP/src/CommonModules/DocCashPaymentServer/Module.bsl b/IRP/src/CommonModules/DocCashPaymentServer/Module.bsl index b5443246c3..96dbc9c033 100644 --- a/IRP/src/CommonModules/DocCashPaymentServer/Module.bsl +++ b/IRP/src/CommonModules/DocCashPaymentServer/Module.bsl @@ -7,10 +7,12 @@ EndProcedure Procedure OnReadAtServer(Object, Form, CurrentObject) Export MoneyDocumentsServer.OnReadAtServer(Object, Form, CurrentObject); LockDataModificationPrivileged.LockFormIfObjectIsLocked(Form, CurrentObject); + AccountingServer.OnReadAtServer(Object, Form, CurrentObject); EndProcedure Procedure AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters) Export MoneyDocumentsServer.AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters); + AccountingServer.AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters); EndProcedure #EndRegion diff --git a/IRP/src/CommonModules/DocCashReceiptServer/Module.bsl b/IRP/src/CommonModules/DocCashReceiptServer/Module.bsl index b634dd4c68..66968e7440 100644 --- a/IRP/src/CommonModules/DocCashReceiptServer/Module.bsl +++ b/IRP/src/CommonModules/DocCashReceiptServer/Module.bsl @@ -7,10 +7,12 @@ EndProcedure Procedure OnReadAtServer(Object, Form, CurrentObject) Export MoneyDocumentsServer.OnReadAtServer(Object, Form, CurrentObject); LockDataModificationPrivileged.LockFormIfObjectIsLocked(Form, CurrentObject); + AccountingServer.OnReadAtServer(Object, Form, CurrentObject); EndProcedure Procedure AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters) Export MoneyDocumentsServer.AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters); + AccountingServer.AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters); EndProcedure #EndRegion diff --git a/IRP/src/CommonModules/DocCommissioningOfFixedAssetServer/Module.bsl b/IRP/src/CommonModules/DocCommissioningOfFixedAssetServer/Module.bsl index e9d937b65e..f5899ef969 100644 --- a/IRP/src/CommonModules/DocCommissioningOfFixedAssetServer/Module.bsl +++ b/IRP/src/CommonModules/DocCommissioningOfFixedAssetServer/Module.bsl @@ -12,6 +12,7 @@ EndProcedure Procedure AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters) Export DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form); + AccountingServer.AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters); EndProcedure Procedure OnReadAtServer(Object, Form, CurrentObject) Export @@ -21,6 +22,7 @@ Procedure OnReadAtServer(Object, Form, CurrentObject) Export DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form); LockDataModificationPrivileged.LockFormIfObjectIsLocked(Form, CurrentObject); SerialLotNumbersServer.UpdateSerialLotNumbersPresentation(Object); + AccountingServer.OnReadAtServer(Object, Form, CurrentObject); EndProcedure #EndRegion diff --git a/IRP/src/CommonModules/DocCreditDebitNoteClient/Module.bsl b/IRP/src/CommonModules/DocCreditDebitNoteClient/Module.bsl index c4886bbbff..b4514c4199 100644 --- a/IRP/src/CommonModules/DocCreditDebitNoteClient/Module.bsl +++ b/IRP/src/CommonModules/DocCreditDebitNoteClient/Module.bsl @@ -192,6 +192,22 @@ EndProcedure #EndRegion +Procedure TransactionsVatRateOnChange(Object, Form, Item, CurrentData = Undefined) Export + ViewClient_V2.TransactionsVatRateOnChange(Object, Form, CurrentData); +EndProcedure + +Procedure TransactionsNetAmountOnChange(Object, Form, Item, CurrentData = Undefined) Export + ViewClient_V2.TransactionsNetAmountOnChange(Object, Form, CurrentData); +EndProcedure + +Procedure TransactionsTaxAmountOnChange(Object, Form, Item, CurrentData = Undefined) Export + ViewClient_V2.TransactionsTaxAmountOnChange(Object, Form, CurrentData); +EndProcedure + +Procedure TransactionsAmountOnChange(Object, Form, Item, CurrentData = Undefined) Export + ViewClient_V2.TransactionsAmountOnChange(Object, Form, CurrentData); +EndProcedure + #EndRegion #EndRegion diff --git a/IRP/src/CommonModules/DocCreditDebitNoteServer/Module.bsl b/IRP/src/CommonModules/DocCreditDebitNoteServer/Module.bsl index 4a8aab25ca..7729fb5ff8 100644 --- a/IRP/src/CommonModules/DocCreditDebitNoteServer/Module.bsl +++ b/IRP/src/CommonModules/DocCreditDebitNoteServer/Module.bsl @@ -12,6 +12,7 @@ EndProcedure Procedure AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters) Export DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form); + AccountingServer.AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters); EndProcedure Procedure OnReadAtServer(Object, Form, CurrentObject) Export @@ -20,6 +21,7 @@ Procedure OnReadAtServer(Object, Form, CurrentObject) Export EndIf; DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form); LockDataModificationPrivileged.LockFormIfObjectIsLocked(Form, CurrentObject); + AccountingServer.OnReadAtServer(Object, Form, CurrentObject); EndProcedure #EndRegion diff --git a/IRP/src/CommonModules/DocDebitCreditNoteClient/Module.bsl b/IRP/src/CommonModules/DocDebitCreditNoteClient/Module.bsl index 5a73808333..27453fec70 100644 --- a/IRP/src/CommonModules/DocDebitCreditNoteClient/Module.bsl +++ b/IRP/src/CommonModules/DocDebitCreditNoteClient/Module.bsl @@ -262,3 +262,21 @@ Procedure ReceiveAgreementEditTextChange(Object, Form, Item, Text, StandardProce EndProcedure #EndRegion + +Procedure SendCurrencyOnChange(Object, Form, Item) Export + ViewClient_V2.SendCurrencyOnChange(Object, Form); +EndProcedure + +Procedure ReceiveCurrencyOnChange(Object, Form, Item) Export + ViewClient_V2.ReceiveCurrencyOnChange(Object, Form); +EndProcedure + +Procedure SendAmountOnChange(Object, Form, Item) Export + ViewClient_V2.SendAmountOnChange(Object, Form); +EndProcedure + +Procedure ReceiveAmountOnChange(Object, Form, Item) Export + ViewClient_V2.ReceiveAmountOnChange(Object, Form); +EndProcedure + + diff --git a/IRP/src/CommonModules/DocDebitCreditNoteServer/Module.bsl b/IRP/src/CommonModules/DocDebitCreditNoteServer/Module.bsl index dc4e97fba5..c64ef16611 100644 --- a/IRP/src/CommonModules/DocDebitCreditNoteServer/Module.bsl +++ b/IRP/src/CommonModules/DocDebitCreditNoteServer/Module.bsl @@ -1,5 +1,5 @@ #Region FORM -//++ + Procedure OnCreateAtServer(Object, Form, Cancel, StandardProcessing) Export DocumentsServer.OnCreateAtServer(Object, Form, Cancel, StandardProcessing); If Form.Parameters.Key.IsEmpty() Then @@ -8,17 +8,19 @@ Procedure OnCreateAtServer(Object, Form, Cancel, StandardProcessing) Export EndIf; ViewServer_V2.OnCreateAtServer(Object, Form, ""); EndProcedure -//++ + Procedure AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters) Export DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form); + AccountingServer.AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters); EndProcedure -//++ + Procedure OnReadAtServer(Object, Form, CurrentObject) Export If Not Form.GroupItems.Count() Then SetGroupItemsList(Object, Form); EndIf; DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form); LockDataModificationPrivileged.LockFormIfObjectIsLocked(Form, CurrentObject); + AccountingServer.OnReadAtServer(Object, Form, CurrentObject); EndProcedure #EndRegion diff --git a/IRP/src/CommonModules/DocDecommissioningOfFixedAssetServer/Module.bsl b/IRP/src/CommonModules/DocDecommissioningOfFixedAssetServer/Module.bsl index e9d937b65e..f5899ef969 100644 --- a/IRP/src/CommonModules/DocDecommissioningOfFixedAssetServer/Module.bsl +++ b/IRP/src/CommonModules/DocDecommissioningOfFixedAssetServer/Module.bsl @@ -12,6 +12,7 @@ EndProcedure Procedure AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters) Export DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form); + AccountingServer.AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters); EndProcedure Procedure OnReadAtServer(Object, Form, CurrentObject) Export @@ -21,6 +22,7 @@ Procedure OnReadAtServer(Object, Form, CurrentObject) Export DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form); LockDataModificationPrivileged.LockFormIfObjectIsLocked(Form, CurrentObject); SerialLotNumbersServer.UpdateSerialLotNumbersPresentation(Object); + AccountingServer.OnReadAtServer(Object, Form, CurrentObject); EndProcedure #EndRegion diff --git a/IRP/src/CommonModules/DocDepreciationCalculationServer/Module.bsl b/IRP/src/CommonModules/DocDepreciationCalculationServer/Module.bsl index e77fd4ba30..c46431bb91 100644 --- a/IRP/src/CommonModules/DocDepreciationCalculationServer/Module.bsl +++ b/IRP/src/CommonModules/DocDepreciationCalculationServer/Module.bsl @@ -11,6 +11,7 @@ EndProcedure Procedure AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters) Export DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form); + AccountingServer.AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters); EndProcedure Procedure OnReadAtServer(Object, Form, CurrentObject) Export @@ -19,6 +20,7 @@ Procedure OnReadAtServer(Object, Form, CurrentObject) Export EndIf; DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form); LockDataModificationPrivileged.LockFormIfObjectIsLocked(Form, CurrentObject); + AccountingServer.OnReadAtServer(Object, Form, CurrentObject); EndProcedure #EndRegion diff --git a/IRP/src/CommonModules/DocEmployeeCashAdvanceServer/Module.bsl b/IRP/src/CommonModules/DocEmployeeCashAdvanceServer/Module.bsl index fbc08b57b0..336978952f 100644 --- a/IRP/src/CommonModules/DocEmployeeCashAdvanceServer/Module.bsl +++ b/IRP/src/CommonModules/DocEmployeeCashAdvanceServer/Module.bsl @@ -11,6 +11,7 @@ EndProcedure Procedure AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters) Export DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form); + AccountingServer.AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters); EndProcedure Procedure OnReadAtServer(Object, Form, CurrentObject) Export @@ -19,6 +20,7 @@ Procedure OnReadAtServer(Object, Form, CurrentObject) Export EndIf; DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form); LockDataModificationPrivileged.LockFormIfObjectIsLocked(Form, CurrentObject); + AccountingServer.OnReadAtServer(Object, Form, CurrentObject); EndProcedure #EndRegion diff --git a/IRP/src/CommonModules/DocExpenseRevenueAccrualsServer/Module.bsl b/IRP/src/CommonModules/DocExpenseRevenueAccrualsServer/Module.bsl index 7fff64f8a0..067d42009e 100644 --- a/IRP/src/CommonModules/DocExpenseRevenueAccrualsServer/Module.bsl +++ b/IRP/src/CommonModules/DocExpenseRevenueAccrualsServer/Module.bsl @@ -11,6 +11,7 @@ EndProcedure Procedure AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters) Export DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form); + AccountingServer.AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters); EndProcedure Procedure OnReadAtServer(Object, Form, CurrentObject) Export @@ -19,6 +20,7 @@ Procedure OnReadAtServer(Object, Form, CurrentObject) Export EndIf; DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form); LockDataModificationPrivileged.LockFormIfObjectIsLocked(Form, CurrentObject); + AccountingServer.OnReadAtServer(Object, Form, CurrentObject); EndProcedure #EndRegion diff --git a/IRP/src/CommonModules/DocFixedAssetTransferServer/Module.bsl b/IRP/src/CommonModules/DocFixedAssetTransferServer/Module.bsl index ec69c76cee..2c8e574fda 100644 --- a/IRP/src/CommonModules/DocFixedAssetTransferServer/Module.bsl +++ b/IRP/src/CommonModules/DocFixedAssetTransferServer/Module.bsl @@ -12,6 +12,7 @@ EndProcedure Procedure AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters) Export DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form); + AccountingServer.AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters); EndProcedure Procedure OnReadAtServer(Object, Form, CurrentObject) Export @@ -20,6 +21,7 @@ Procedure OnReadAtServer(Object, Form, CurrentObject) Export EndIf; DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form); LockDataModificationPrivileged.LockFormIfObjectIsLocked(Form, CurrentObject); + AccountingServer.OnReadAtServer(Object, Form, CurrentObject); EndProcedure #EndRegion diff --git a/IRP/src/CommonModules/DocModernizationOfFixedAssetServer/Module.bsl b/IRP/src/CommonModules/DocModernizationOfFixedAssetServer/Module.bsl index e9d937b65e..f5899ef969 100644 --- a/IRP/src/CommonModules/DocModernizationOfFixedAssetServer/Module.bsl +++ b/IRP/src/CommonModules/DocModernizationOfFixedAssetServer/Module.bsl @@ -12,6 +12,7 @@ EndProcedure Procedure AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters) Export DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form); + AccountingServer.AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters); EndProcedure Procedure OnReadAtServer(Object, Form, CurrentObject) Export @@ -21,6 +22,7 @@ Procedure OnReadAtServer(Object, Form, CurrentObject) Export DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form); LockDataModificationPrivileged.LockFormIfObjectIsLocked(Form, CurrentObject); SerialLotNumbersServer.UpdateSerialLotNumbersPresentation(Object); + AccountingServer.OnReadAtServer(Object, Form, CurrentObject); EndProcedure #EndRegion diff --git a/IRP/src/CommonModules/DocOpeningEntryClient/Module.bsl b/IRP/src/CommonModules/DocOpeningEntryClient/Module.bsl index 82f5ee60cb..d4dc82a48f 100644 --- a/IRP/src/CommonModules/DocOpeningEntryClient/Module.bsl +++ b/IRP/src/CommonModules/DocOpeningEntryClient/Module.bsl @@ -229,3 +229,60 @@ Procedure EmployeeListSalaryTypeOnChange(Object, Form, Item, CurrentData = Undef EndProcedure #EndRegion + + +#Region TAXES_INCOMING + +Procedure TaxesIncomingBeforeAddRow(Object, Form, Item, Cancel, Clone, Parent, IsFolder, Parameter) Export + ViewClient_V2.TaxesIncomingOutgoingBeforeAddRow(Object, Form, "TaxesIncoming", Cancel, Clone); +EndProcedure + +Procedure TaxesIncomingAfterDeleteRow(Object, Form, Item) Export + ViewClient_V2.TaxesIncomingOutgoingAfterDeleteRow(Object, Form, "TaxesIncoming"); +EndProcedure + +Procedure TaxesIncomingVatRateOnChange(Object, Form, Item, CurrentData = Undefined) Export + ViewClient_V2.TaxesIncomingOutgoingVatRateOnChange(Object, Form, "TaxesIncoming", CurrentData); +EndProcedure + +Procedure TaxesIncomingNetAmountOnChange(Object, Form, Item, CurrentData = Undefined) Export + ViewClient_V2.TaxesIncomingOutgoingNetAmountOnChange(Object, Form, "TaxesIncoming", CurrentData); +EndProcedure + +Procedure TaxesIncomingTaxAmountOnChange(Object, Form, Item, CurrentData = Undefined) Export + ViewClient_V2.TaxesIncomingOutgoingTaxAmountOnChange(Object, Form, "TaxesIncoming", CurrentData); +EndProcedure + +Procedure TaxesIncomingTotalAmountOnChange(Object, Form, Item, CurrentData = Undefined) Export + ViewClient_V2.TaxesIncomingOutgoingTotalAmountOnChange(Object, Form, "TaxesIncoming", CurrentData); +EndProcedure + +#EndRegion + +#Region TAXES_OUTGOING + +Procedure TaxesOutgoingBeforeAddRow(Object, Form, Item, Cancel, Clone, Parent, IsFolder, Parameter) Export + ViewClient_V2.TaxesIncomingOutgoingBeforeAddRow(Object, Form, "TaxesOutgoing", Cancel, Clone); +EndProcedure + +Procedure TaxesOutgoingAfterDeleteRow(Object, Form, Item) Export + ViewClient_V2.TaxesIncomingOutgoingAfterDeleteRow(Object, Form, "TaxesOutgoing"); +EndProcedure + +Procedure TaxesOutgoingVatRateOnChange(Object, Form, Item, CurrentData = Undefined) Export + ViewClient_V2.TaxesIncomingOutgoingVatRateOnChange(Object, Form, "TaxesOutgoing", CurrentData); +EndProcedure + +Procedure TaxesOutgoingNetAmountOnChange(Object, Form, Item, CurrentData = Undefined) Export + ViewClient_V2.TaxesIncomingOutgoingNetAmountOnChange(Object, Form, "TaxesOutgoing", CurrentData); +EndProcedure + +Procedure TaxesOutgoingTaxAmountOnChange(Object, Form, Item, CurrentData = Undefined) Export + ViewClient_V2.TaxesIncomingOutgoingTaxAmountOnChange(Object, Form, "TaxesOutgoing", CurrentData); +EndProcedure + +Procedure TaxesOutgoingTotalAmountOnChange(Object, Form, Item, CurrentData = Undefined) Export + ViewClient_V2.TaxesIncomingOutgoingTotalAmountOnChange(Object, Form, "TaxesOutgoing", CurrentData); +EndProcedure + +#EndRegion diff --git a/IRP/src/CommonModules/DocPayrollServer/Module.bsl b/IRP/src/CommonModules/DocPayrollServer/Module.bsl index 453c24ba85..454902094f 100644 --- a/IRP/src/CommonModules/DocPayrollServer/Module.bsl +++ b/IRP/src/CommonModules/DocPayrollServer/Module.bsl @@ -11,6 +11,7 @@ EndProcedure Procedure AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters) Export DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form); + AccountingServer.AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters); EndProcedure Procedure OnReadAtServer(Object, Form, CurrentObject) Export @@ -19,6 +20,7 @@ Procedure OnReadAtServer(Object, Form, CurrentObject) Export EndIf; DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form); LockDataModificationPrivileged.LockFormIfObjectIsLocked(Form, CurrentObject); + AccountingServer.OnReadAtServer(Object, Form, CurrentObject); EndProcedure #EndRegion @@ -346,56 +348,31 @@ Function _CalculateDaysForPaid_Vacation(VacationEmployeeTable, Parameters, Setti | |//////////////////////////////////////////////////////////////////////////////// |SELECT - | R9545T_PaidVacationsTurnovers.Company, - | R9545T_PaidVacationsTurnovers.Employee, - | SUM(R9545T_PaidVacationsTurnovers.PaidTurnover) AS PaidTurnover - |FROM - | AccumulationRegister.R9545T_PaidVacations.Turnovers(BEGINOFPERIOD(&EndDate, YEAR), ENDOFPERIOD(&EndDate, YEAR), - | Recorder, (Company, Employee) IN - | (SELECT - | tmp.Company, - | tmp.Employee - | FROM - | tmp AS tmp)) AS R9545T_PaidVacationsTurnovers - |WHERE - | R9545T_PaidVacationsTurnovers.Recorder <> &Recorder - |GROUP BY - | R9545T_PaidVacationsTurnovers.Company, - | R9545T_PaidVacationsTurnovers.Employee - |; - | - |//////////////////////////////////////////////////////////////////////////////// - |SELECT | tmp.Company, | tmp.Employee, - | COUNT(tmp.Date) AS CountDates + | COUNT(tmp.Date) AS TotalDays, + | SUM(ISNULL(R9541T_VacationUsage.Days, 0)) AS PaidDays |FROM | tmp AS tmp + | LEFT JOIN AccumulationRegister.R9541T_VacationUsage AS R9541T_VacationUsage + | ON tmp.Company = R9541T_VacationUsage.Company + | AND tmp.Employee = R9541T_VacationUsage.Employee + | AND tmp.Date = R9541T_VacationUsage.Period + | AND R9541T_VacationUsage.Active + | AND R9541T_VacationUsage.Recorder REFS Document.EmployeeVacation |GROUP BY | tmp.Company, | tmp.Employee"; Query.SetParameter("tmp", VacationEmployeeTable); - Query.SetParameter("EndDate", Parameters.EndDate); - Query.SetParameter("Recorder", Parameters.Ref); - QueryResults = Query.ExecuteBatch(); - PaidDays = QueryResults[1].Unload(); - TotalDays = QueryResults[2].Unload(); - - For Each TotalRow In TotalDays Do + DaysTable = Query.Execute().Unload(); + For Each TotalRow In DaysTable Do Filter = New Structure(); Filter.Insert("Company" , TotalRow.Company); Filter.Insert("Employee" , TotalRow.Employee); - - PaidRows = PaidDays.FindRows(Filter); - _PaidDays = 0; - For Each PaidRow In PaidRows Do - _PaidDays = _PaidDays + PaidRow.PaidTurnover; - EndDo; - EmployeeRows = VacationEmployeeTable.FindRows(Filter); - CalculatePaidDays(_PaidDays, Settings.VacationDays, EmployeeRows, "IsPaidVacation"); + CalculatePaidDays(0, TotalRow.PaidDays, EmployeeRows, "IsPaidVacation"); EndDo; Return VacationEmployeeTable; diff --git a/IRP/src/CommonModules/DocPurchaseReturnServer/Module.bsl b/IRP/src/CommonModules/DocPurchaseReturnServer/Module.bsl index 25b04a7d97..d52a7aac40 100644 --- a/IRP/src/CommonModules/DocPurchaseReturnServer/Module.bsl +++ b/IRP/src/CommonModules/DocPurchaseReturnServer/Module.bsl @@ -16,6 +16,7 @@ Procedure AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters) Expor DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form); DocumentsServer.FillSpecialOffersCache(Object, Form, "PurchaseInvoice"); RowIDInfoServer.AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters); + AccountingServer.AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters); EndProcedure Procedure OnReadAtServer(Object, Form, CurrentObject) Export @@ -27,6 +28,7 @@ Procedure OnReadAtServer(Object, Form, CurrentObject) Export RowIDInfoServer.OnReadAtServer(Object, Form, CurrentObject); LockDataModificationPrivileged.LockFormIfObjectIsLocked(Form, CurrentObject); SerialLotNumbersServer.UpdateSerialLotNumbersPresentation(Object); + AccountingServer.OnReadAtServer(Object, Form, CurrentObject); EndProcedure #EndRegion diff --git a/IRP/src/CommonModules/DocRetailReturnReceiptServer/Module.bsl b/IRP/src/CommonModules/DocRetailReturnReceiptServer/Module.bsl index c7fb0d2bf5..e148d50b27 100644 --- a/IRP/src/CommonModules/DocRetailReturnReceiptServer/Module.bsl +++ b/IRP/src/CommonModules/DocRetailReturnReceiptServer/Module.bsl @@ -16,6 +16,7 @@ Procedure AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters) Expor DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form); DocumentsServer.FillSpecialOffersCache(Object, Form, "RetailSalesReceipt"); RowIDInfoServer.AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters); + AccountingServer.AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters); EndProcedure Procedure OnReadAtServer(Object, Form, CurrentObject) Export @@ -27,6 +28,7 @@ Procedure OnReadAtServer(Object, Form, CurrentObject) Export RowIDInfoServer.OnReadAtServer(Object, Form, CurrentObject); LockDataModificationPrivileged.LockFormIfObjectIsLocked(Form, CurrentObject); SerialLotNumbersServer.UpdateSerialLotNumbersPresentation(Object); + AccountingServer.OnReadAtServer(Object, Form, CurrentObject); EndProcedure #EndRegion diff --git a/IRP/src/CommonModules/DocSalesReturnServer/Module.bsl b/IRP/src/CommonModules/DocSalesReturnServer/Module.bsl index c69b67c2e7..7a1c454422 100644 --- a/IRP/src/CommonModules/DocSalesReturnServer/Module.bsl +++ b/IRP/src/CommonModules/DocSalesReturnServer/Module.bsl @@ -16,6 +16,7 @@ Procedure AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters) Expor DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form); DocumentsServer.FillSpecialOffersCache(Object, Form, "SalesInvoice"); RowIDInfoServer.AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters); + AccountingServer.AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters); EndProcedure Procedure OnReadAtServer(Object, Form, CurrentObject) Export @@ -27,6 +28,7 @@ Procedure OnReadAtServer(Object, Form, CurrentObject) Export RowIDInfoServer.OnReadAtServer(Object, Form, CurrentObject); LockDataModificationPrivileged.LockFormIfObjectIsLocked(Form, CurrentObject); SerialLotNumbersServer.UpdateSerialLotNumbersPresentation(Object); + AccountingServer.OnReadAtServer(Object, Form, CurrentObject); EndProcedure #EndRegion diff --git a/IRP/src/CommonModules/DocStockAdjustmentAsSurplusClient/Module.bsl b/IRP/src/CommonModules/DocStockAdjustmentAsSurplusClient/Module.bsl index c3233eaa47..bbda1e95d7 100644 --- a/IRP/src/CommonModules/DocStockAdjustmentAsSurplusClient/Module.bsl +++ b/IRP/src/CommonModules/DocStockAdjustmentAsSurplusClient/Module.bsl @@ -41,6 +41,14 @@ EndProcedure #EndRegion +#Region _DATE + +Procedure DateOnChange(Object, Form, Item) Export + ViewClient_V2.DateOnChange(Object, Form, "ItemList"); +EndProcedure + +#EndRegion + #Region STORE Procedure StoreOnChange(Object, Form, Item) Export @@ -147,13 +155,21 @@ EndProcedure #EndRegion -#Region AMOUNT +Procedure ItemListVatRateOnChange(Object, Form, CurrentData = Undefined) Export + ViewClient_V2.ItemListVatRateOnChange(Object, Form, CurrentData); +EndProcedure -Procedure ItemListAmountOnChange(Object, Form, CurrentData = Undefined) Export - ViewClient_V2.ItemListAmountOnChange(Object, Form, CurrentData); +Procedure ItemListTaxAmountOnChange(Object, Form, CurrentData = Undefined) Export + ViewClient_V2.ItemListTaxAmountOnChange(Object, Form, CurrentData); EndProcedure -#EndRegion +Procedure ItemListNetAmountOnChange(Object, Form, CurrentData = Undefined) Export + ViewClient_V2.ItemListNetAmountOnChange(Object, Form, CurrentData); +EndProcedure + +Procedure ItemListTotalAmountOnChange(Object, Form, CurrentData = Undefined) Export + ViewClient_V2.ItemListTotalAmountOnChange(Object, Form, CurrentData); +EndProcedure #EndRegion diff --git a/IRP/src/CommonModules/DocTaxesOperationClient/DocTaxesOperationClient.mdo b/IRP/src/CommonModules/DocTaxesOperationClient/DocTaxesOperationClient.mdo new file mode 100644 index 0000000000..e4060c7b51 --- /dev/null +++ b/IRP/src/CommonModules/DocTaxesOperationClient/DocTaxesOperationClient.mdo @@ -0,0 +1,18 @@ + + + DocTaxesOperationClient + + en + Doc taxes operation client + + + ru + Операции с налогами документов клиент + + + tr + Doc taxes operation client + + true + true + \ No newline at end of file diff --git a/IRP/src/CommonModules/DocTaxesOperationClient/Module.bsl b/IRP/src/CommonModules/DocTaxesOperationClient/Module.bsl new file mode 100644 index 0000000000..496f795e92 --- /dev/null +++ b/IRP/src/CommonModules/DocTaxesOperationClient/Module.bsl @@ -0,0 +1,176 @@ +#Region FORM + +Procedure OnOpen(Object, Form, Cancel) Export + ViewClient_V2.OnOpen(Object, Form, Form.MainTables); +EndProcedure + +#EndRegion + +#Region _DATE + +Procedure DateOnChange(Object, Form, Item) Export + ViewClient_V2.DateOnChange(Object, Form, Form.MainTables); +EndProcedure + +#EndRegion + +#Region COMPANY + +Procedure CompanyOnChange(Object, Form, Item) Export + ViewClient_V2.CompanyOnChange(Object, Form, Form.MainTables); +EndProcedure + +Procedure CompanyStartChoice(Object, Form, Item, ChoiceData, StandardProcessing) Export + OpenSettings = DocumentsClient.GetOpenSettingsStructure(); + + OpenSettings.ArrayOfFilters = New Array(); + OpenSettings.ArrayOfFilters.Add(DocumentsClientServer.CreateFilterItem("DeletionMark", True, + DataCompositionComparisonType.NotEqual)); + OpenSettings.ArrayOfFilters.Add(DocumentsClientServer.CreateFilterItem("OurCompany", True, + DataCompositionComparisonType.Equal)); + OpenSettings.FillingData = New Structure("OurCompany", True); + + DocumentsClient.CompanyStartChoice(Object, Form, Item, ChoiceData, StandardProcessing, OpenSettings); +EndProcedure + +Procedure CompanyEditTextChange(Object, Form, Item, Text, StandardProcessing) Export + ArrayOfFilters = New Array(); + ArrayOfFilters.Add(DocumentsClientServer.CreateFilterItem("DeletionMark", True, ComparisonType.NotEqual)); + ArrayOfFilters.Add(DocumentsClientServer.CreateFilterItem("OurCompany", True, ComparisonType.Equal)); + DocumentsClient.CompanyEditTextChange(Object, Form, Item, Text, StandardProcessing, ArrayOfFilters); +EndProcedure + +#EndRegion + +#Region CURRENCY + +Procedure CurrencyOnChange(Object, Form, Item) Export + ViewClient_V2.CurrencyOnChange(Object, Form, Form.MainTables); +EndProcedure + +#EndRegion + +#Region TRANSACTION_TYPE + +Procedure TransactionTypeOnChange(Object, Form, Item) Export + ViewClient_V2.TransactionTypeOnChange(Object, Form, Form.MainTables); +EndProcedure + +#EndRegion + +#Region PARTNER + +Procedure PartnerOnChange(Object, Form, Item) Export + ViewClient_V2.PartnerOnChange(Object, Form, Form.MainTables); +EndProcedure + +Procedure PartnerStartChoice(Object, Form, Item, ChoiceData, StandardProcessing) Export + DocumentsClient.PartnerStartChoice_TransactionTypeFilter(Object, Form, Item, ChoiceData, StandardProcessing, Object.TransactionType); +EndProcedure + +Procedure PartnerTextChange(Object, Form, Item, Text, StandardProcessing) Export + DocumentsClient.PartnerTextChange_TransactionTypeFilter(Object, Form, Item, Text, StandardProcessing, Object.TransactionType); +EndProcedure + +#EndRegion + +#Region LEGAL_NAME + +Procedure LegalNameOnChange(Object, Form, Item) Export + ViewClient_V2.LegalNameOnChange(Object, Form, Form.MainTables); +EndProcedure + +Procedure LegalNameStartChoice(Object, Form, Item, ChoiceData, StandardProcessing) Export + DocumentsClient.LegalNameStartChoice_PartnerFilter(Object, Form, Item, ChoiceData, StandardProcessing, Object.Partner); +EndProcedure + +Procedure LegalNameTextChange(Object, Form, Item, Text, StandardProcessing) Export + DocumentsClient.LegalNameTextChange_PartnerFilter(Object, Form, Item, Text, StandardProcessing, Object.Partner); +EndProcedure + +#EndRegion + +#Region AGREEMENT + +Procedure AgreementOnChange(Object, Form, Item) Export + ViewClient_V2.AgreementOnChange(Object, Form, Form.MainTables); +EndProcedure + +Procedure AgreementStartChoice(Object, Form, Item, ChoiceData, StandardProcessing) Export + DocumentsClient.AgreementStartChoice_TransactionTypeFilter(Object, Form, Item, ChoiceData, StandardProcessing, Object.TransactionType); +EndProcedure + +Procedure AgreementTextChange(Object, Form, Item, Text, StandardProcessing) Export + DocumentsClient.AgreementTextChange_TransactionTypeFilter(Object, Form, Item, Text, StandardProcessing, Object.TransactionType); +EndProcedure + +#EndRegion + +#Region LEGAL_NAME_CONTRACT + +Procedure LegalNameContractOnChange(Object, Form, Item) Export + DocumentsClientServer.ChangeTitleGroupTitle(Object, Form); +EndProcedure + +#EndRegion + +#Region TAXES_INCOMING + +Procedure TaxesIncomingBeforeAddRow(Object, Form, Item, Cancel, Clone, Parent, IsFolder, Parameter) Export + ViewClient_V2.TaxesIncomingOutgoingBeforeAddRow(Object, Form, "TaxesIncoming", Cancel, Clone); +EndProcedure + +Procedure TaxesIncomingAfterDeleteRow(Object, Form, Item) Export + ViewClient_V2.TaxesIncomingOutgoingAfterDeleteRow(Object, Form, "TaxesIncoming"); +EndProcedure + +Procedure TaxesIncomingVatRateOnChange(Object, Form, Item, CurrentData = Undefined) Export + ViewClient_V2.TaxesIncomingOutgoingVatRateOnChange(Object, Form, "TaxesIncoming", CurrentData); +EndProcedure + +Procedure TaxesIncomingNetAmountOnChange(Object, Form, Item, CurrentData = Undefined) Export + ViewClient_V2.TaxesIncomingOutgoingNetAmountOnChange(Object, Form, "TaxesIncoming", CurrentData); +EndProcedure + +Procedure TaxesIncomingTaxAmountOnChange(Object, Form, Item, CurrentData = Undefined) Export + ViewClient_V2.TaxesIncomingOutgoingTaxAmountOnChange(Object, Form, "TaxesIncoming", CurrentData); +EndProcedure + +Procedure TaxesIncomingTotalAmountOnChange(Object, Form, Item, CurrentData = Undefined) Export + ViewClient_V2.TaxesIncomingOutgoingTotalAmountOnChange(Object, Form, "TaxesIncoming", CurrentData); +EndProcedure + +#EndRegion + +#Region TAXES_OUTGOING + +Procedure TaxesOutgoingBeforeAddRow(Object, Form, Item, Cancel, Clone, Parent, IsFolder, Parameter) Export + ViewClient_V2.TaxesIncomingOutgoingBeforeAddRow(Object, Form, "TaxesOutgoing", Cancel, Clone); +EndProcedure + +Procedure TaxesOutgoingAfterDeleteRow(Object, Form, Item) Export + ViewClient_V2.TaxesIncomingOutgoingAfterDeleteRow(Object, Form, "TaxesOutgoing"); +EndProcedure + +Procedure TaxesOutgoingVatRateOnChange(Object, Form, Item, CurrentData = Undefined) Export + ViewClient_V2.TaxesIncomingOutgoingVatRateOnChange(Object, Form, "TaxesOutgoing", CurrentData); +EndProcedure + +Procedure TaxesOutgoingNetAmountOnChange(Object, Form, Item, CurrentData = Undefined) Export + ViewClient_V2.TaxesIncomingOutgoingNetAmountOnChange(Object, Form, "TaxesOutgoing", CurrentData); +EndProcedure + +Procedure TaxesOutgoingTaxAmountOnChange(Object, Form, Item, CurrentData = Undefined) Export + ViewClient_V2.TaxesIncomingOutgoingTaxAmountOnChange(Object, Form, "TaxesOutgoing", CurrentData); +EndProcedure + +Procedure TaxesOutgoingTotalAmountOnChange(Object, Form, Item, CurrentData = Undefined) Export + ViewClient_V2.TaxesIncomingOutgoingTotalAmountOnChange(Object, Form, "TaxesOutgoing", CurrentData); +EndProcedure + +#EndRegion + +Procedure FillTaxesIncomingOutgoing(Object, Form, DocRef, DocDate, Company, Branch, Currency, RegName, TableName) Export + TableInfo = DocTaxesOperationServer.FillTaxesIncomingOutgoing(Form.UUID, DocRef, DocDate, Company, Branch, Currency, RegName); + ViewClient_V2.TaxesIncomingOutgoingLoad(Object, Form, TableName, TableInfo.Address, TableInfo.GroupColumn, TableInfo.SumColumn); +EndProcedure diff --git a/IRP/src/CommonModules/DocTaxesOperationServer/DocTaxesOperationServer.mdo b/IRP/src/CommonModules/DocTaxesOperationServer/DocTaxesOperationServer.mdo new file mode 100644 index 0000000000..edb50b7c51 --- /dev/null +++ b/IRP/src/CommonModules/DocTaxesOperationServer/DocTaxesOperationServer.mdo @@ -0,0 +1,18 @@ + + + DocTaxesOperationServer + + en + Doc taxes operation server + + + ru + Операции с налогами документов сервер + + + tr + Doc taxes operation server + + true + true + \ No newline at end of file diff --git a/IRP/src/CommonModules/DocTaxesOperationServer/Module.bsl b/IRP/src/CommonModules/DocTaxesOperationServer/Module.bsl new file mode 100644 index 0000000000..71d4a28cb2 --- /dev/null +++ b/IRP/src/CommonModules/DocTaxesOperationServer/Module.bsl @@ -0,0 +1,223 @@ +#Region FORM + +Procedure OnCreateAtServer(Object, Form, Cancel, StandardProcessing) Export + DocumentsServer.OnCreateAtServer(Object, Form, Cancel, StandardProcessing); + If Form.Parameters.Key.IsEmpty() Then + SetGroupItemsList(Object, Form); + DocumentsClientServer.ChangeTitleGroupTitle(Object, Form); + EndIf; + ViewServer_V2.OnCreateAtServer(Object, Form, ); +EndProcedure + +Procedure AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters) Export + DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form); + AccountingServer.AfterWriteAtServer(Object, Form, CurrentObject, WriteParameters); +EndProcedure + +Procedure OnReadAtServer(Object, Form, CurrentObject) Export + If Not Form.GroupItems.Count() Then + SetGroupItemsList(Object, Form); + EndIf; + DocumentsClientServer.ChangeTitleGroupTitle(CurrentObject, Form); + LockDataModificationPrivileged.LockFormIfObjectIsLocked(Form, CurrentObject); + AccountingServer.OnReadAtServer(Object, Form, CurrentObject); +EndProcedure + +#EndRegion + +#Region GroupTitle + +Procedure SetGroupItemsList(Object, Form) + AttributesArray = New Array(); + AttributesArray.Add("Company"); + AttributesArray.Add("Partner"); + AttributesArray.Add("LegalName"); + AttributesArray.Add("Agreement"); + AttributesArray.Add("LegalNameContract"); + AttributesArray.Add("TransactionType"); + DocumentsServer.DeleteUnavailableTitleItemNames(AttributesArray); + For Each Attr In AttributesArray Do + Form.GroupItems.Add(Attr, ?(ValueIsFilled(Form.Items[Attr].Title), Form.Items[Attr].Title, + Object.Ref.Metadata().Attributes[Attr].Synonym + ":" + Chars.NBSp)); + EndDo; +EndProcedure + +#EndRegion + +#Region ListFormEvents + +Procedure OnCreateAtServerListForm(Form, Cancel, StandardProcessing) Export + DocumentsServer.OnCreateAtServerListForm(Form, Cancel, StandardProcessing); +EndProcedure + +#EndRegion + +#Region ChoiceFormEvents + +Procedure OnCreateAtServerChoiceForm(Form, Cancel, StandardProcessing) Export + DocumentsServer.OnCreateAtServerChoiceForm(Form, Cancel, StandardProcessing); +EndProcedure + +#EndRegion + +Function FillTaxesIncomingOutgoing(FormUUID, DocRef, DocDate, Company, Branch, Currency, RegName) Export + Query = New Query(); + Query.Text = + "SELECT + | Taxes.TaxRate AS VatRate, + | Taxes.InvoiceType AS InvoiceType, + | Taxes.AmountBalance AS Amount + |FROM + | AccumulationRegister.R1040B_TaxesOutgoing.Balance(&BalancePeriod, Company = &Company + | AND Branch = &Branch + | AND Currency = &Currency + | AND CurrencyMovementType = VALUE(ChartOfCharacteristicTypes.CurrencyMovementType.SettlementCurrency)) AS Taxes"; + + Query.Text = StrReplace(Query.Text, "R1040B_TaxesOutgoing", RegName); + + If ValueIsFilled(DocRef) Then + Query.SetParameter("BalancePeriod", New Boundary(DocRef.PointInTime(), BoundaryType.Excluding)); + Else + Query.SetParameter("BalancePeriod", CommonFunctionsClientServer.GetSliceLastDateByRefAndDate(DocRef, DocDate)); + EndIf; + + Query.SetParameter("Company" , Company); + Query.SetParameter("Branch" , Branch); + Query.SetParameter("Currency" , Currency); + + QueryResult = Query.Execute(); + QueryTable = QueryResult.Unload(); + + GroupColumn = "VatRate, InvoiceType"; + SumColumn = "Amount"; + QueryTable.GroupBy(GroupColumn, SumColumn); + Address = PutToTempStorage(QueryTable, FormUUID); + Return New Structure("Address, GroupColumn, SumColumn", Address, GroupColumn, SumColumn); +EndFunction + +Function CalculateTaxDifference(val DocObject) Export + Result = New Array(); + + TotalTaxAmount_Incoming = DocObject.TaxesIncoming.Total("Amount"); + TotalTaxAmount_Outgoing = DocObject.TaxesOutgoing.Total("Amount"); + + If TotalTaxAmount_Incoming < TotalTaxAmount_Outgoing Then + MinTableName = "TaxesIncoming"; + MaxTableName = "TaxesOutgoing"; + Else + MinTableName = "TaxesOutgoing"; + MaxTableName = "TaxesIncoming"; + EndIf; + + MinTable = DocObject[MinTableName].Unload(); + MaxTable = DocObject[MaxTableName].Unload(); + + If DocObject.TransactionType = Enums.TaxesOperationTransactionType.TaxOffset + Or DocObject.TransactionType = Enums.TaxesOperationTransactionType.TaxOffsetAndPayment Then + Calculate_TaxOffset(MinTableName, MinTable, MaxTableName, MaxTable, Result); + EndIf; + + If DocObject.TransactionType = Enums.TaxesOperationTransactionType.TaxPayment + Or DocObject.TransactionType = Enums.TaxesOperationTransactionType.TaxOffsetAndPayment Then + Calculate_TaxPayment(MinTableName, MinTable, Result); + Calculate_TaxPayment(MaxTableName, MaxTable, Result); + EndIf; + + TaxesDifferenceTable = DocObject.TaxesDifference.Unload(); + For Each Row In Result Do + Filter = New Structure("IncomingVatRate, IncomingInvoiceType, OutgoingVatRate, OutgoingInvoiceType"); + FillPropertyValues(Filter, Row); + ArrayOfRows = TaxesDifferenceTable.FindRows(Filter); + If ArrayOfRows.Count() = 1 Then + If ValueIsFilled(ArrayOfRows[0].Key) Then + Row.Key = ArrayOfRows[0].Key; + EndIf; + EndIf; + + For Each FilteredRow In ArrayOfRows Do + FilteredRow.Key = ""; + EndDo; + EndDo; + + Return Result; +EndFunction + +Function GetTaxesDifferenceRow() + DiffRow = New Structure(); + DiffRow.Insert("Key", ""); + DiffRow.Insert("IncomingVatRate" , Catalogs.TaxRates.EmptyRef()); + DiffRow.Insert("IncomingInvoiceType" , Enums.InvoiceType.EmptyRef()); + DiffRow.Insert("OutgoingVatRate" , Catalogs.TaxRates.EmptyRef()); + DiffRow.Insert("OutgoingInvoiceType" , Enums.InvoiceType.EmptyRef()); + DiffRow.Insert("Amount", 0); + Return DiffRow; +EndFunction + +Function Calculate_TaxOffset(MinTableName, MinTable, MaxTableName, MaxTable, Result) + For Each MinRow In MinTable Do + + For Each MaxRow In MaxTable Do + + If Not ValueIsFilled(MinRow.Amount) Then + Continue; + EndIf; + + If Not ValueIsFilled(MaxRow.Amount) Then + Continue; + EndIf; + + DiffRow = GetTaxesDifferenceRow(); + Result.Add(DiffRow); + DiffRow.Key = String(New UUID()); + + If MinTableName = "TaxesIncoming" Then + DiffRow.IncomingVatRate = MinRow.VatRate; + DiffRow.IncomingInvoiceType = MinRow.InvoiceType; + ElsIf MinTableName = "TaxesOutgoing" Then + DiffRow.OutgoingVatRate = MinRow.VatRate; + DiffRow.OutgoingInvoiceType = MinRow.InvoiceType; + EndIf; + + If MaxTableName = "TaxesIncoming" Then + DiffRow.IncomingVatRate = MaxRow.VatRate; + DiffRow.IncomingInvoiceType = MaxRow.InvoiceType; + ElsIf MaxTableName = "TaxesOutgoing" Then + DiffRow.OutgoingVatRate = MaxRow.VatRate; + DiffRow.OutgoingInvoiceType = MaxRow.InvoiceType; + EndIf; + + DiffRow.Amount = Min(MaxRow.Amount, MinRow.Amount); + + MinRow.Amount = MinRow.Amount - DiffRow.Amount; + MaxRow.Amount = MaxRow.Amount - DiffRow.Amount; + + EndDo; + EndDo; + Return Result; +EndFunction + +Function Calculate_TaxPayment(TableName, Table, Result) + For Each Row In Table Do + If Not ValueIsFilled(Row.Amount) Then + Continue; + EndIf; + + DiffRow = GetTaxesDifferenceRow(); + Result.Add(DiffRow); + DiffRow.Key = String(New UUID()); + + If TableName = "TaxesIncoming" Then + DiffRow.IncomingVatRate = Row.VatRate; + DiffRow.IncomingInvoiceType = Row.InvoiceType; + ElsIf TableName = "TaxesOutgoing" Then + DiffRow.OutgoingVatRate = Row.VatRate; + DiffRow.OutgoingInvoiceType = Row.InvoiceType; + EndIf; + + DiffRow.Amount = Row.Amount; + Row.Amount = Row.Amount - DiffRow.Amount; + EndDo; +EndFunction + + + diff --git a/IRP/src/CommonModules/DocumentsClient/Module.bsl b/IRP/src/CommonModules/DocumentsClient/Module.bsl index 4f49d98c48..3fe2c4a55d 100644 --- a/IRP/src/CommonModules/DocumentsClient/Module.bsl +++ b/IRP/src/CommonModules/DocumentsClient/Module.bsl @@ -1094,7 +1094,9 @@ Function GetFormItemNames() |AccountPayableOtherKey, AccountReceivableOtherKey, CashInTransitKey, CashInTransitIsFixedCurrency, |FixedAssetsKey, |AccrualListTotalVacationDays, AccrualListPaidVacationDays, AccrualListTotalSickLeaveDays ,AccrualListPaidSickLeaveDays, - |EmployeeListKey, SalaryTaxListKey"; + |EmployeeListKey, SalaryTaxListKey, + |TaxesIncomingKey, TaxesOutgoingKey, TaxesDifferenceKey, + |CalculationsKey"; Return ItemNames; EndFunction diff --git a/IRP/src/CommonModules/ExtensionServer/Module.bsl b/IRP/src/CommonModules/ExtensionServer/Module.bsl index fbe82eab96..4f3f0a7a4d 100644 --- a/IRP/src/CommonModules/ExtensionServer/Module.bsl +++ b/IRP/src/CommonModules/ExtensionServer/Module.bsl @@ -44,8 +44,7 @@ Procedure AddAttributesFromExtensions(Form, MetaTypeOrRef, ItemElement = Undefin EndIf; ObjectMetadata = Metadata.FindByType(TypeOf(MetaTypeOrRef)); - AttributesList = Catalogs.AddAttributeAndPropertySets.GetExtensionAttributesListByObjectMetadata(ObjectMetadata, - MetaTypeOrRef); + AttributesList = Catalogs.AddAttributeAndPropertySets.GetExtensionAttributesListByObjectMetadata(ObjectMetadata, MetaTypeOrRef); FormGroups = AddAttributesAndPropertiesServer.FormGroups(AttributesList); If ElementParent <> Undefined Then For Each FormGroup In FormGroups Do @@ -67,8 +66,14 @@ Procedure AddAttributesFromExtensions(Form, MetaTypeOrRef, ItemElement = Undefin NewAttribute = Form.Items.Add(Attribute.Attribute, Type("FormField"), Parent); NewAttribute.Type = FormFieldType.InputField; NewAttribute.DataPath = "Object." + Attribute.Attribute; - If ObjectMetadata.Attributes[Attribute.Attribute].Type = BooleanTypeDescription Then - NewAttribute.Type = FormFieldType.CheckBoxField; + If ObjectMetadata.Attributes.Find(Attribute.Attribute) = Undefined Then + If Metadata.CommonAttributes[Attribute.Attribute].Type = BooleanTypeDescription Then + NewAttribute.Type = FormFieldType.CheckBoxField; + EndIf; + Else + If ObjectMetadata.Attributes[Attribute.Attribute].Type = BooleanTypeDescription Then + NewAttribute.Type = FormFieldType.CheckBoxField; + EndIf; EndIf; EndDo; diff --git a/IRP/src/CommonModules/Localization/Module.bsl b/IRP/src/CommonModules/Localization/Module.bsl index 96ce6dac46..bb358a496e 100644 --- a/IRP/src/CommonModules/Localization/Module.bsl +++ b/IRP/src/CommonModules/Localization/Module.bsl @@ -6,7 +6,7 @@ // Lang - String - Lang // // Returns: -// Structure - Strings: +// Structure - Strings: // * ACS_UnknownValueType - String - // * CERT_OnlyProdOrCert - String - // * CERT_CertAlreadyUsed - String - @@ -23,11 +23,14 @@ // * DomainPartMin1Dot - String - // * DomainIdentifierExceedsLength - String - // * InvalidCharacterInAddress - String - +// * AddAttributeCannotUseWithProperty - String - +// * AddAttributeTagPathHasNotTwoPart - String - // * SMS_SendIsOk - String - // * SMS_SendIsError - String - // * SMS_WaitUntilNextSend - String - // * SMS_SMSCodeWrong - String - // * ATC_001 - String - +// * ATC_NotSupported - String - // * ATC_ErrorTaxAmountInItemListNotEqualTaxAmountInTaxList - String - // * ATC_ErrorNetAmountGreaterTotalAmount - String - // * ATC_ErrorQuantityIsZero - String - @@ -35,6 +38,7 @@ // * ATC_ErrorOffersAmountInItemListNotEqualOffersAmountInOffersList - String - // * ATC_ErrorItemTypeIsNotService - String - // * ATC_ErrorItemTypeUseSerialNumbers - String - +// * ATC_ErrorItemTypeNotUseSerialNumbers - String - // * ATC_ErrorUseSerialButSerialNotSet - String - // * ATC_ErrorNotTheSameQuantityInSerialListTableAndInItemList - String - // * ATC_ErrorItemNotEqualItemInItemKey - String - @@ -45,6 +49,22 @@ // * ATC_ErrorQuantityInSourceOfOriginsDiffQuantityInSerialLotNumber - String - // * ATC_ErrorQuantityInSourceOfOriginsDiffQuantityInItemList - String - // * ATC_ErrorNotFilledUnit - String - +// * ATC_ErrorNotFilledInventoryOrigin - String - +// * ATC_ErrorPaymentsAmountIsZero - String - +// * ATC_ErrorNotFilledPaymentMethod - String - +// * ATC_ErrorNotFilledPurchaseTransactionType - String - +// * ATC_ErrorNotFilledSalesTransactionType - String - +// * ATC_ErrorNotFilledSalesReturnTransactionType - String - +// * ATC_ErrorNotFilledPurchaseReturnTransactionType - String - +// * ATC_FIX_ErrorItemTypeUseSerialNumbers - String - +// * ATC_FIX_ErrorItemTypeNotUseSerialNumbers - String - +// * ATC_FIX_ErrorNotFilledQuantityInSourceOfOrigins - String - +// * ATC_FIX_ErrorNotFilledInventoryOrigin - String - +// * ATC_FIX_ErrorNotFilledPaymentMethod - String - +// * ATC_FIX_ErrorNotFilledPurchaseTransactionType - String - +// * ATC_FIX_ErrorNotFilledSalesTransactionType - String - +// * ATC_FIX_ErrorNotFilledSalesReturnTransactionType - String - +// * ATC_FIX_ErrorNotFilledPurchaseReturnTransactionType - String - // * Eq_001 - String - // * Eq_002 - String - // * Eq_003 - String - @@ -57,6 +77,7 @@ // * Eq_010 - String - // * Eq_011 - String - // * Eq_012 - String - +// * Eq_013 - String - // * Eq_CanNotFindAPIModule - String - // * EqError_001 - String - // * EqError_002 - String - @@ -69,6 +90,8 @@ // * EqFP_DocumentAlreadyPrinted - String - // * EqFP_DocumentNotPrintedOnFiscal - String - // * EqFP_FiscalDeviceIsEmpty - String - +// * EqFP_CannotPrintNotPosted - String - +// * EqFP_CanPrintOnlyComplete - String - // * EqAc_AlreadyhasTransaction - String - // * EqAc_LastSettlementHasError - String - // * EqAc_LastSettlementNotFound - String - @@ -82,6 +105,7 @@ // * EqFP_ProblemWhileCheckCodeString - String - // * EqFP_ErrorWhileConfirmCode - String - // * EqFP_CashierNameCanNotBeEmpty - String - +// * EqFP_ReceivedWrongAnswerFromDevice - String - // * POS_s1 - String - // * POS_s2 - String - // * POS_s3 - String - @@ -97,6 +121,11 @@ // * POS_Error_ThisBarcodeFromAnotherItem - String - // * POS_Error_ThisIsNotControleStringBarcode - String - // * POS_Error_CheckFillingForAllCodes - String - +// * POS_ClearAllItems - String - +// * POS_CancelPostponed - String - +// * POS_ERROR_NoDeletingPrintedReceipt - String - +// * POS_Warning_Revert - String - +// * POS_Warning_ReturnInDay - String - // * S_002 - String - // * S_003 - String - // * S_004 - String - @@ -148,6 +177,7 @@ // * Form_036 - String - // * Form_037 - String - // * Form_038 - String - +// * Form_039 - String - // * Error_002 - String - // * Error_003 - String - // * Error_004 - String - @@ -259,8 +289,28 @@ // * Error_126 - String - // * Error_127 - String - // * Error_128 - String - +// * Error_129 - String - +// * Error_130 - String - +// * Error_131 - String - +// * Error_132 - String - +// * Error_133 - String - +// * Error_134 - String - +// * Error_135 - String - +// * Error_136 - String - +// * Error_137 - String - +// * Error_138 - String - +// * Error_139 - String - +// * Error_140 - String - +// * Error_141 - String - +// * Error_142 - String - +// * Error_143 - String - +// * Error_EmptyCurrency - String - +// * Error_EmptyTransactionType - String - // * Error_144 - String - +// * Error_PartnerBalanceCheckfailed - String - // * Error_145 - String - +// * Error_146 - String - +// * Error_147 - String - // * Error_FillTotalAmount - String - // * MF_Error_001 - String - // * MF_Error_002 - String - @@ -318,6 +368,13 @@ // * InfoMessage_035 - String - // * InfoMessage_036 - String - // * InfoMessage_037 - String - +// * InfoMessage_AttachFile_NonSelectDocType - String - +// * InfoMessage_AttachFile_SelectDocType - String - +// * InfoMessage_AttachFile_MaxFileSize - String - +// * InfoMessage_038 - String - +// * InfoMessage_039 - String - +// * InfoMessage_040 - String - +// * InfoMessage_WriteObject - String - // * InfoMessage_Payment - String - // * InfoMessage_PaymentReturn - String - // * InfoMessage_SessionIsClosed - String - @@ -325,6 +382,8 @@ // * InfoMessage_Returns - String - // * InfoMessage_ReturnTitle - String - // * InfoMessage_POS_Title - String - +// * InfoMessage_CanOpenOnlyNewStatus - String - +// * InfoMessage_CanCloseOnlyOpenStatus - String - // * InfoMessage_NotProperty - String - // * InfoMessage_DataUpdated - String - // * InfoMessage_DataSaved - String - @@ -355,12 +414,19 @@ // * QuestionToUser_024 - String - // * QuestionToUser_025 - String - // * QuestionToUser_026 - String - +// * QuestionToUser_027 - String - +// * QuestionToUser_028 - String - +// * QuestionToUser_029 - String - +// * QuestionToUser_030 - String - // * SuggestionToUser_1 - String - // * SuggestionToUser_2 - String - // * SuggestionToUser_3 - String - // * SuggestionToUser_4 - String - // * UsersEvent_001 - String - // * UsersEvent_002 - String - +// * UsersEvent_003 - String - +// * UsersEvent_004 - String - +// * UsersEvent_005 - String - // * I_1 - String - // * I_2 - String - // * I_3 - String - @@ -437,6 +503,10 @@ // * Add_Setiings_006 - String - // * Add_Setiings_007 - String - // * Add_Setiings_008 - String - +// * Add_Setiings_009 - String - +// * Add_Setiings_010 - String - +// * Add_Setiings_011 - String - +// * Add_Setiings_012 - String - // * Mob_001 - String - // * CP_001 - String - // * CP_002 - String - @@ -449,18 +519,192 @@ // * LDT_FailReading - String - // * LDT_ValueNotFound - String - // * LDT_TooMuchFound - String - +// * OVP_Button_Title - String - +// * OVP_Button_ToolTip - String - // * OpenSLNTree_Button_Title - String - // * OpenSLNTree_Button_ToolTip - String - // * BgJ_Title_001 - String - // * BgJ_Title_002 - String - -// * InternalCommands_SetNotActive - String - -// * InternalCommands_SetNotActive_Check - String - -// * InternalCommands_ShowNotActive - String - -// * InternalCommands_ShowNotActive_Check - String - -// * GPU_AnalizeFolder - String - -// * GPU_Load_SendToDrive - String - -// * GPU_Load_SaveInBase - String - -// * GPU_CheckingFilesExist - String - +// * Salary_Err_001 - String - +// * Salary_Err_002 - String - +// * Salary_Err_003 - String - +// * Salary_WeekDays_1 - String - +// * Salary_WeekDays_2 - String - +// * Salary_WeekDays_3 - String - +// * Salary_WeekDays_4 - String - +// * Salary_WeekDays_5 - String - +// * Salary_WeekDays_6 - String - +// * Salary_WeekDays_7 - String - +// * AccountingError_01 - String - +// * AccountingError_02 - String - +// * AccountingError_03 - String - +// * AccountingError_04 - String - +// * AccountingError_05 - String - +// * AccountingQuestion_01 - String - +// * AccountingQuestion_02 - String - +// * AccountingInfo_01 - String - +// * AccountingInfo_02 - String - +// * AccountingInfo_03 - String - +// * AccountingInfo_04 - String - +// * AccountingInfo_05 - String - +// * AccountingInfo_06 - String - +// * AccountingJE_prefix_01 - String - +// * BankPayment_DR_R1020B_AdvancesToVendors_R1021B_VendorsTransactions_CR_R3010B_CashOnHand - String - +// * BankPayment_DR_R1021B_VendorsTransactions_CR_R1020B_AdvancesToVendors - String - +// * BankReceipt_DR_R3010B_CashOnHand_CR_R2020B_AdvancesFromCustomers_R2021B_CustomersTransactions - String - +// * PurchaseInvoice_DR_R4050B_StockInventory_R5022T_Expenses_CR_R1021B_VendorsTransactions - String - +// * PurchaseInvoice_DR_R1021B_VendorsTransactions_CR_R1020B_AdvancesToVendors - String - +// * PurchaseInvoice_DR_R1040B_TaxesOutgoing_CR_R1021B_VendorsTransactions - String - +// * RetailSalesReceipt_DR_R5022T_Expenses_CR_R4050B_StockInventory - String - +// * SalesInvoice_DR_R5022T_Expenses_CR_R4050B_StockInventory - String - +// * SalesInvoice_DR_R2021B_CustomersTransactions_CR_R5021T_Revenues - String - +// * SalesInvoice_DR_R5021T_Revenues_CR_R2040B_TaxesIncoming - String - +// * SalesInvoice_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransactions - String - +// * ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R2020B_AdvancesFromCustomers - String - +// * ForeignCurrencyRevaluation_DR_R2020B_AdvancesFromCustomers_CR_R5021T_Revenues - String - +// * ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R3010B_CashOnHand - String - +// * ForeignCurrencyRevaluation_DR_R3010B_CashOnHand_CR_R5021T_Revenues - String - +// * ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R1021B_VendorsTransactions - String - +// * ForeignCurrencyRevaluation_DR_R1021B_VendorsTransactions_CR_R5021T_Revenues - String - +// * ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R9510B_SalaryPayment - String - +// * ForeignCurrencyRevaluation_DR_R9510B_SalaryPayment_CR_R5021T_Revenues - String - +// * ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R1020B_AdvancesToVendors - String - +// * ForeignCurrencyRevaluation_DR_R1020B_AdvancesToVendors_CR_R5021T_Revenues - String - +// * ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R2021B_CustomersTransactions - String - +// * ForeignCurrencyRevaluation_DR_R2021B_CustomersTransactions_CR_R5021T_Revenues - String - +// * ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R3015B_CashAdvance - String - +// * ForeignCurrencyRevaluation_DR_R3015B_CashAdvance_CR_R5021T_Revenues - String - +// * ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R3027B_EmployeeCashAdvance - String - +// * ForeignCurrencyRevaluation_DR_R3027B_EmployeeCashAdvance_CR_R5021T_Revenues - String - +// * ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R5015B_OtherPartnersTransactions - String - +// * ForeignCurrencyRevaluation_DR_R5015B_OtherPartnersTransactions_CR_R5021T_Revenues - String - +// * ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R8510B_BookValueOfFixedAsset - String - +// * ForeignCurrencyRevaluation_DR_R8510B_BookValueOfFixedAsset_CR_R5021T_Revenues - String - +// * BankReceipt_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransactions - String - +// * CashPayment_DR_R1020B_AdvancesToVendors_R1021B_VendorsTransactions_CR_R3010B_CashOnHand - String - +// * CashPayment_DR_R1021B_VendorsTransactions_CR_R1020B_AdvancesToVendors - String - +// * CashReceipt_DR_R3010B_CashOnHand_CR_R2020B_AdvancesFromCustomers_R2021B_CustomersTransactions - String - +// * CashReceipt_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransactions - String - +// * CashExpense_DR_R5022T_Expenses_CR_R3010B_CashOnHand - String - +// * CashRevenue_DR_R3010B_CashOnHand_CR_R5021_Revenues - String - +// * DebitNote_DR_R1021B_VendorsTransactions_CR_R5021_Revenues - String - +// * DebitNote_DR_R1021B_VendorsTransactions_CR_R1020B_AdvancesToVendors - String - +// * DebitNote_DR_R2021B_CustomersTransactions_CR_R5021_Revenues - String - +// * DebitNote_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransactions - String - +// * DebitNote_DR_R5015B_OtherPartnersTransactions_CR_R5021_Revenues - String - +// * CreditNote_DR_R5022T_Expenses_CR_R2021B_CustomersTransactions - String - +// * CreditNote_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransactions - String - +// * CreditNote_DR_R1021B_VendorsTransactions_CR_R1020B_AdvancesToVendors - String - +// * CreditNote_DR_R5022T_Expenses_CR_R1021B_VendorsTransactions - String - +// * CreditNote_DR_R5022T_Expenses_CR_R5015B_OtherPartnersTransactions - String - +// * MoneyTransfer_DR_R3010B_CashOnHand_CR_R3010B_CashOnHand - String - +// * MoneyTransfer_DR_R3010B_CashOnHand_CR_R3021B_CashInTransit - String - +// * MoneyTransfer_DR_R3021B_CashInTransit_CR_R3010B_CashOnHand - String - +// * MoneyTransfer_DR_R3021B_CashInTransit_CR_R5021T_Revenues - String - +// * MoneyTransfer_DR_R5022T_Expenses_CR_R3021B_CashInTransit - String - +// * CommissioningOfFixedAsset_DR_R8510B_BookValueOfFixedAsset_CR_R4050B_StockInventory - String - +// * DecommissioningOfFixedAsset_DR_R4050B_StockInventory_CR_R8510B_BookValueOfFixedAsset - String - +// * ModernizationOfFixedAsset_DR_R8510B_BookValueOfFixedAsset_CR_R4050B_StockInventory - String - +// * ModernizationOfFixedAsset_DR_R4050B_StockInventory_CR_R8510B_BookValueOfFixedAsset - String - +// * FixedAssetTransfer_DR_R8510B_BookValueOfFixedAsset_CR_R8510B_BookValueOfFixedAsset - String - +// * DepreciationCalculation_DR_R5022T_Expenses_CR_DepreciationFixedAsset - String - +// * BankPayment_DR_R2020B_AdvancesFromCustomers_R2021B_CustomersTransactions_CR_R3010B_CashOnHand - String - +// * BankPayment_DR_R2021B_CustomersTransactions_CR_R2020B_AdvancesFromCustomers - String - +// * BankPayment_DR_R5015B_OtherPartnersTransactions_CR_R3010B_CashOnHand - String - +// * CashPayment_DR_R2020B_AdvancesFromCustomers_R2021B_CustomersTransactions_CR_R3010B_CashOnHand - String - +// * CashPayment_DR_R2021B_CustomersTransactions_CR_R2020B_AdvancesFromCustomers - String - +// * CashPayment_DR_R9510B_SalaryPayment_CR_R3010B_CashOnHand - String - +// * CashPayment_DR_R3027B_EmployeeCashAdvance_CR_R3010B_CashOnHand - String - +// * BankReceipt_DR_R3010B_CashOnHand_CR_R1020B_AdvancesToVendors_R1021B_VendorsTransactions - String - +// * BankReceipt_DR_R1020B_AdvancesToVendors_CR_R1021B_VendorsTransactions - String - +// * CashReceipt_DR_R3010B_CashOnHand_CR_R1020B_AdvancesToVendors_R1021B_VendorsTransactions - String - +// * CashReceipt_DR_R1020B_AdvancesToVendors_CR_R1021B_VendorsTransactions - String - +// * BankPayment_DR_R3021B_CashInTransitIncoming_CR_R3010B_CashOnHand_CashTransferOrder - String - +// * BankPayment_DR_R3021B_CashInTransitIncoming_CR_R3010B_CashOnHand_CurrencyExchange - String - +// * BankPayment_DR_R5022T_Expenses_CR_R3010B_CashOnHand - String - +// * BankPayment_DR_R9510B_SalaryPayment_CR_R3010B_CashOnHand - String - +// * BankPayment_DR_R3027B_EmployeeCashAdvance_CR_R3010B_CashOnHand - String - +// * CashPayment_DR_R3021B_CashInTransitIncoming_CR_R3010B_CashOnHand_CashTransferOrder - String - +// * CashPayment_DR_R5015B_OtherPartnersTransactions_CR_R3010B_CashOnHand - String - +// * BankReceipt_DR_R3010B_CashOnHand_CR_R3021B_CashInTransitIncoming_CashTransferOrder - String - +// * BankReceipt_DR_R3010B_CashOnHand_CR_R3021B_CashInTransitIncoming_CurrencyExchange - String - +// * BankReceipt_DR_R3021B_CashInTransit_CR_R5021T_Revenues - String - +// * BankReceipt_DR_R5022T_Expenses_CR_R3021B_CashInTransit - String - +// * BankReceipt_DR_R3010B_CashOnHand_CR_R5015B_OtherPartnersTransactions - String - +// * BankReceipt_DR_R3010B_CashOnHand_CR_R5021_Revenues - String - +// * CashReceipt_DR_R3010B_CashOnHand_CR_R3021B_CashInTransitIncoming_CashTransferOrder - String - +// * CashReceipt_DR_R3010B_CashOnHand_CR_R5015B_OtherPartnersTransactions - String - +// * Payroll_DR_R5022T_Expenses_CR_R9510B_SalaryPayment_Accrual - String - +// * Payroll_DR_R9510B_SalaryPayment_CR_R5015B_OtherPartnersTransactions_Taxes - String - +// * Payroll_DR_R5022T_Expenses_CR_R5015B_OtherPartnersTransactions_Taxes - String - +// * Payroll_DR_R9510B_SalaryPayment_CR_R5021T_Revenues_Deduction_IsRevenue - String - +// * Payroll_DR_R5022T_Expenses_CR_R9510B_SalaryPayment_Deduction_IsNotRevenue - String - +// * Payroll_DR_R9510B_SalaryPayment_CR_R3027B_EmployeeCashAdvance - String - +// * DebitCreditNote_R5020B_PartnersBalance - String - +// * DebitCreditNote_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransactions_Offset - String - +// * DebitCreditNote_DR_R1021B_VendorsTransactions_CR_R1020B_AdvancesToVendors_Offset - String - +// * ExpenseAccruals_DR_R5022T_Expenses_CR_R6070T_OtherPeriodsExpenses - String - +// * RevenueAccruals_DR_R6080T_OtherPeriodsRevenues_CR_R5021T_Revenues - String - +// * ExpenseAccruals_DR_R6070T_OtherPeriodsExpenses_CR_R5022T_Expenses - String - +// * RevenueAccruals_DR_R5021T_Revenues_CR_R6080T_OtherPeriodsRevenues - String - +// * EmployeeCashAdvance_DR_R5022T_Expenses_CR_R3027B_EmployeeCashAdvance - String - +// * EmployeeCashAdvance_DR_R1021B_VendorsTransactions_CR_R3027B_EmployeeCashAdvance - String - +// * SalesReturn_DR_R2021B_CustomersTransactions_CR_R2020B_AdvancesFromCustomers - String - +// * SalesReturn_DR_R5021T_Revenues_CR_R2021B_CustomersTransactions - String - +// * SalesReturn_DR_R5021T_Revenues_CR_R1040B_TaxesOutgoing - String - +// * SalesReturn_DR_R5022T_Expenses_CR_R4050B_StockInventory - String - +// * PurchaseReturn_DR_R1020B_AdvancesToVendors_CR_R1021B_VendorsTransactions - String - +// * PurchaseReturn_DR_R1021B_VendorsTransactions_CR_R4050B_StockInventory - String - +// * PurchaseReturn_DR_R2040B_TaxesIncoming_CR_R1021B_VendorsTransactions - String - +// * InternalCommands_SetNotActive - String - +// * InternalCommands_SetNotActive_Check - String - +// * InternalCommands_ShowNotActive - String - +// * InternalCommands_ShowNotActive_Check - String - +// * FormulaEditor_Delimiters - String - +// * FormulaEditor_Space - String - +// * FormulaEditor_Operators - String - +// * FormulaEditor_LogicalOperatorsAndConstants - String - +// * FormulaEditor_AND - String - +// * FormulaEditor_OR - String - +// * FormulaEditor_NOT - String - +// * FormulaEditor_TRUE - String - +// * FormulaEditor_FALSE - String - +// * FormulaEditor_NumericFunctions - String - +// * FormulaEditor_Max - String - +// * FormulaEditor_Min - String - +// * FormulaEditor_Round - String - +// * FormulaEditor_Int - String - +// * FormulaEditor_StringFunctions - String - +// * FormulaEditor_String - String - +// * FormulaEditor_Upper - String - +// * FormulaEditor_Left - String - +// * FormulaEditor_Lower - String - +// * FormulaEditor_Right - String - +// * FormulaEditor_TrimL - String - +// * FormulaEditor_TrimAll - String - +// * FormulaEditor_TrimR - String - +// * FormulaEditor_Title - String - +// * FormulaEditor_StrReplace - String - +// * FormulaEditor_StrLen - String - +// * FormulaEditor_OtherFunctions - String - +// * FormulaEditor_Condition - String - +// * FormulaEditor_PredefinedValue - String - +// * FormulaEditor_ValueIsFilled - String - +// * FormulaEditor_Format - String - +// * FormulaEditor_Error01 - String - +// * FormulaEditor_Error02 - String - +// * FormulaEditor_Error03 - String - +// * FormulaEditor_Error04 - String - +// * FormulaEditor_Error05 - String - +// * FormulaEditor_Msg01 - String - +// * GPU_AnalizeFolder - String - +// * GPU_Load_SendToDrive - String - +// * GPU_Load_SaveInBase - String - +// * GPU_CheckingFilesExist - String - +// * AuditLock_001 - String - +// * AuditLock_002 - String - +// * AuditLock_003 - String - +// * AuditLock_004 - String - Function Strings(Lang) Export Strings = New Structure(); @@ -1909,9 +2153,9 @@ Function Strings(Lang) Export Strings.Insert("InfoMessage_037", NStr("en='Add link or any add any description'; |ru='Добавьте ссылку или любое наименование'; |tr='Bağlantı veya belge tanımı giriniz'", Lang)); - Strings.Insert("InfoMessage_AttachFile_NonSelectDocType", NStr("en='⬆️ Select document type ⬆️'; - |ru='⬆️ Выберите тип документа ⬆️'; - |tr='⬆️ Evrak tipini seçiniz ⬆️'", Lang)); + Strings.Insert("InfoMessage_AttachFile_NonSelectDocType", NStr("en='Attach document'; + |ru='Прикрепить документ'; + |tr='Attach document'", Lang)); Strings.Insert("InfoMessage_AttachFile_SelectDocType", NStr("en='Click to add document'; |ru='Нажмите для добавления документа'; |tr='Belge eklemek için tıklayınız'", Lang) + Chars.LF + "%1"); @@ -1924,6 +2168,9 @@ Function Strings(Lang) Export Strings.Insert("InfoMessage_039", NStr("en='Movements successfully recorded'; |ru='Движения успешно записаны'; |tr='Hareketler başarıyla kadyedildi'", Lang)); + Strings.Insert("InfoMessage_040", NStr("en='File not found'; + |ru='Файл не найден'; + |tr='File not found'", Lang)); Strings.Insert("InfoMessage_WriteObject", NStr("en='Save object, before continue.'; |ru='Сохраните объект, прежде чем продолжить.'; @@ -2588,10 +2835,10 @@ Strings.Insert("SalesInvoice_DR_R2021B_CustomersTransactions_CR_R5021T_Revenues" |ru='SalesInvoice Дт (R2021B_CustomersTransactions) Кт (R5021T_Revenues)'; |tr='SatışFaturası DR (R2021B_Müşteriİşlemleri) CR (R5021T_Gelirler)'", Lang)); -Strings.Insert("SalesInvoice_DR_R5021T_Revenues_CR_R2040B_TaxesIncoming", - NStr("en='SalesInvoice DR (R5021T_Revenues) CR (R2040B_TaxesIncoming)'; - |ru='SalesInvoice Дебет (R5021T_Revenues) Кредит (R2040B_TaxesIncoming)'; - |tr='SatışFaturası DR (R5021T_Gelirler) CR (R2040B_VergilerGelen)'", Lang)); +Strings.Insert("SalesInvoice_DR_R2021B_CustomersTransactions_CR_R2040B_TaxesIncoming", + NStr("en='SalesInvoice DR (R2021B_CustomersTransactions) CR (R2040B_TaxesIncoming)'; + |ru='Счет-фактура продажи ДР (R2021B_CustomersTransactions) КР (R2040B_TaxesIncoming)'; + |tr='SalesInvoice DR (R2021B_CustomersTransactions) CR (R2040B_TaxesIncoming)'", Lang)); Strings.Insert("SalesInvoice_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransactions", NStr("en='SalesInvoice DR (R2020B_AdvancesFromCustomers) CR (R2021B_CustomersTransactions)'; @@ -2627,6 +2874,16 @@ Strings.Insert("ForeignCurrencyRevaluation_DR_R1021B_VendorsTransactions_CR_R502 NStr("en='ForeignCurrencyRevaluation DR (R1021B_VendorsTransactions) CR (R5021T_Revenues)'; |ru='ForeignCurrencyRevaluation DR (R1021B_VendorsTransactions) CR (R5021T_Revenues)'; |tr='ForeignCurrencyRevaluation DR (R1021B_VendorsTransactions) CR (R5021T_Revenues)'", Lang)); + +Strings.Insert("ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R2040B_TaxesIncoming", + NStr("en='ForeignCurrencyRevaluation DR (R5022T_Expenses) CR (R2040B_TaxesIncoming)'; + |ru='Переоценка иностранной валюты ДР (R5022T_Expenses) КР (R2040B_TaxesIncoming)'; + |tr='ForeignCurrencyRevaluation DR (R5022T_Expenses) CR (R2040B_TaxesIncoming)'", Lang)); + +Strings.Insert("ForeignCurrencyRevaluation_DR_R2040B_TaxesIncoming_CR_R5021T_Revenues", + NStr("en='ForeignCurrencyRevaluation DR (R2040B_TaxesIncoming) CR (R5021T_Revenues)'; + |ru='Переоценка иностранной валюты ДР (R2040B_TaxesIncoming) КР (R5021T_Revenues)'; + |tr='ForeignCurrencyRevaluation DR (R2040B_TaxesIncoming) CR (R5021T_Revenues)'", Lang)); Strings.Insert("ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R9510B_SalaryPayment", NStr("en='ForeignCurrencyRevaluation DR (R5022T_Expenses) CR (R9510B_SalaryPayment)'; @@ -2657,6 +2914,16 @@ Strings.Insert("ForeignCurrencyRevaluation_DR_R2021B_CustomersTransactions_CR_R5 NStr("en='ForeignCurrencyRevaluation DR (R2021B_CustomersTransactions) CR (R5021T_Revenues)'; |ru='ForeignCurrencyRevaluation DR (R2021B_CustomersTransactions) CR (R5021T_Revenues)'; |tr='ForeignCurrencyRevaluation DR (R2021B_CustomersTransactions) CR (R5021T_Revenues)'", Lang)); + +Strings.Insert("ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R1040B_TaxesOutgoing", + NStr("en='ForeignCurrencyRevaluation DR (R5022T_Expenses) CR (R1040B_TaxesOutgoing)'; + |ru='Переоценка иностранной валюты ДР (R5022T_Expenses) КР (R1040B_TaxesOutgoing)'; + |tr='ForeignCurrencyRevaluation DR (R5022T_Expenses) CR (R1040B_TaxesOutgoing)'", Lang)); + +Strings.Insert("ForeignCurrencyRevaluation_DR_R1040B_TaxesOutgoing_CR_R5021T_Revenues", + NStr("en='ForeignCurrencyRevaluation DR (R1040B_TaxesOutgoing) CR (R5021T_Revenues)'; + |ru='Переоценка иностранной валюты ДР (R1040B_TaxesOutgoing) КР (R5021T_Revenues)'; + |tr='ForeignCurrencyRevaluation DR (R1040B_TaxesOutgoing) CR (R5021T_Revenues)'", Lang)); Strings.Insert("ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R3015B_CashAdvance", NStr("en='ForeignCurrencyRevaluation DR (R5022T_Expenses) CR (R3015B_CashAdvance)'; @@ -2757,6 +3024,16 @@ Strings.Insert("DebitNote_DR_R5015B_OtherPartnersTransactions_CR_R5021_Revenues" NStr("en='DebitNote DR (R5015B_OtherPartnersTransactions) CR (R5021_Revenues)'; |ru='DebitNote DR (R5015B_OtherPartnersTransactions) CR (R5021_Revenues)'; |tr='Borç Dekontu DR (R5015B_DiğerOrtaklarİşlemleri) CR (R5021_Gelirler)'", Lang)); + +Strings.Insert("DebitNote_DR_R1021B_VendorsTransactions_CR_R2040B_TaxesIncoming", + NStr("en='DebitNote DR (R1021B_VendorsTransactions) CR (R2040B_TaxesIncoming)'; + |ru='ДебетоваяНота ДР (R1021B_VendorsTransactions) КР (R2040B_TaxesIncoming)'; + |tr='DebitNote DR (R1021B_VendorsTransactions) CR (R2040B_TaxesIncoming)'", Lang)); + +Strings.Insert("DebitNote_DR_R2021B_CustomersTransactions_CR_R2040B_TaxesIncoming", + NStr("en='DebitNote (DR_R2021B_CustomersTransactions) CR (R2040B_TaxesIncoming)'; + |ru='ДебетоваяНота (ДР_R2021B_CustomersTransactions) КР (R2040B_TaxesIncoming)'; + |tr='DebitNote (DR_R2021B_CustomersTransactions) CR (R2040B_TaxesIncoming)'", Lang)); Strings.Insert("CreditNote_DR_R5022T_Expenses_CR_R2021B_CustomersTransactions", NStr("en='CreditNote DR (R5022T_Expenses) CR (R2021B_CustomersTransactions)'; @@ -2783,6 +3060,16 @@ Strings.Insert("CreditNote_DR_R5022T_Expenses_CR_R5015B_OtherPartnersTransaction |ru='CreditNote DR (R5022T_Expenses) CR (R5015B_OtherPartnersTransactions)'; |tr='Alacak Dekontu DR (R5022T_Giderler) CR (R5015B_DiğerOrtaklarİşlemleri)'", Lang)); +Strings.Insert("CreditNote_DR_R1040B_TaxesOutgoing_CR_R1021B_VendorsTransactions", + NStr("en='CreditNote DR (R1040B_TaxesOutgoing) CR (R1021B_VendorsTransactions)'; + |ru='КредитоваяНота ДР (R1040B_TaxesOutgoing) КР (R1021B_VendorsTransactions)'; + |tr='CreditNote DR (R1040B_TaxesOutgoing) CR (R1021B_VendorsTransactions)'", Lang)); + +Strings.Insert("CreditNote_DR_R1040B_TaxesOutgoing_CR_R2021B_CustomersTransactions", + NStr("en='CreditNote DR (R1040B_TaxesOutgoing) CR (R2021B_CustomersTransactions)'; + |ru='КредитоваяНота ДР (R1040B_TaxesOutgoing) КР (R2021B_CustomersTransactions)'; + |tr='CreditNote DR (R1040B_TaxesOutgoing) CR (R2021B_CustomersTransactions)'", Lang)); + Strings.Insert("MoneyTransfer_DR_R3010B_CashOnHand_CR_R3010B_CashOnHand", NStr("en='MoneyTransfer DR (R3010B_CashOnHand) CR (R3010B_CashOnHand)'; |ru='ПереводДС ДР (R3010B_НаличныеВКассе) КР (R3010B_НаличныеВКассе)'; @@ -3013,6 +3300,16 @@ Strings.Insert("DebitCreditNote_DR_R1021B_VendorsTransactions_CR_R1020B_Advances |ru='DebitCreditNote DR (R1021B_VendorsTransactions) CR (R1020B_AdvancesToVendors) (Offset)'; |tr='BorçAlacak Dekontu DR (R1021B_Tedarikçiİşlemleri) CR (R1020B_TedarikçilereAvanslar) (Mahsup)'", Lang)); +Strings.Insert("DebitCreditNote_DR_R5020B_PartnersBalance_CR_R5021_Revenues", + NStr("en='DebitCreditNote DR (R5020B_PartnersBalance) CR (R5021_Revenues)'; + |ru='ДебетКредитоваяНота ДР (R5020B_PartnersBalance) КР (R5021_Revenues)'; + |tr='DebitCreditNote DR (R5020B_PartnersBalance) CR (R5021_Revenues)'", Lang)); + +Strings.Insert("DebitCreditNote_DR_R5022T_Expenses_CR_R5020B_PartnersBalance", + NStr("en='DebitCreditNote DR (R5022T_Expenses) CR (R5020B_PartnersBalance)'; + |ru='ДебетКредитоваяНота ДР (R5022T_Expenses) КР (R5020B_PartnersBalance)'; + |tr='DebitCreditNote DR (R5022T_Expenses) CR (R5020B_PartnersBalance)'", Lang)); + Strings.Insert("ExpenseAccruals_DR_R5022T_Expenses_CR_R6070T_OtherPeriodsExpenses", NStr("en='ExpenseAccruals DR (R5022T_Expenses) CR (R6070T_OtherPeriodsExpenses)'; |ru='ExpenseAccruals DR (R5022T_Expenses) CR (R6070T_OtherPeriodsExpenses)'; @@ -3043,6 +3340,11 @@ Strings.Insert("EmployeeCashAdvance_DR_R1021B_VendorsTransactions_CR_R3027B_Empl |ru='EmployeeCashAdvance DR (R1021B_VendorsTransactions) CR (R3027B_EmployeeCashAdvance)'; |tr='EmployeeCashAdvance DR (R1021B_VendorsTransactions) CR (R3027B_EmployeeCashAdvance)'", Lang)); +Strings.Insert("EmployeeCashAdvance_DR_R1040B_TaxesOutgoing_CR_R3027B_EmployeeCashAdvance", + NStr("en='EmployeeCashAdvance DR (R1040B_TaxesOutgoing) CR (R3027B_EmployeeCashAdvance)'; + |ru='АвансСотрудника ДР (R1040B_TaxesOutgoing) КР (R3027B_EmployeeCashAdvance)'; + |tr='EmployeeCashAdvance DR (R1040B_TaxesOutgoing) CR (R3027B_EmployeeCashAdvance)'", Lang)); + Strings.Insert("SalesReturn_DR_R2021B_CustomersTransactions_CR_R2020B_AdvancesFromCustomers", NStr("en='SalesReturn DR (R2021B_CustomersTransactions) CR (R2020B_AdvancesFromCustomers)'; |ru='SalesReturn DR (R2021B_CustomersTransactions) CR (R2020B_AdvancesFromCustomers)'; @@ -3053,10 +3355,10 @@ Strings.Insert("SalesReturn_DR_R5021T_Revenues_CR_R2021B_CustomersTransactions", |ru='SalesReturn DR (R5021T_Revenues) CR (R2021B_CustomersTransactions)'; |tr='SalesReturn DR (R5021T_Revenues) CR (R2021B_CustomersTransactions)'", Lang)); -Strings.Insert("SalesReturn_DR_R5021T_Revenues_CR_R1040B_TaxesOutgoing", - NStr("en='SalesReturn DR (R5021T_Revenues) CR (R1040B_TaxesOutgoing)'; - |ru='SalesReturn DR (R5021T_Revenues) CR (R1040B_TaxesOutgoing)'; - |tr='SalesReturn DR (R5021T_Revenues) CR (R1040B_TaxesOutgoing)'", Lang)); +Strings.Insert("SalesReturn_DR_R1040B_TaxesOutgoing_CR_R2021B_CustomersTransactions", + NStr("en='SalesReturn DR (R1040B_TaxesOutgoing) CR (R2021B_CustomersTransactions)'; + |ru='Возврат продажи ДР (R1040B_TaxesOutgoing) КР (R2021B_CustomersTransactions)'; + |tr='SalesReturn DR (R1040B_TaxesOutgoing) CR (R2021B_CustomersTransactions)'", Lang)); Strings.Insert("SalesReturn_DR_R5022T_Expenses_CR_R4050B_StockInventory", NStr("en='SalesReturn DR (R5022T_Expenses) CR (R4050B_StockInventory)'; @@ -3073,10 +3375,25 @@ Strings.Insert("PurchaseReturn_DR_R1021B_VendorsTransactions_CR_R4050B_StockInve |ru='PurchaseReturn DR (R1021B_VendorsTransactions) CR (R4050B_StockInventory)'; |tr='PurchaseReturn DR (R1021B_VendorsTransactions) CR (R4050B_StockInventory)'", Lang)); -Strings.Insert("PurchaseReturn_DR_R2040B_TaxesIncoming_CR_R1021B_VendorsTransactions", - NStr("en='PurchaseReturn DR (R2040B_TaxesIncoming) CR (R1021B_VendorsTransactions)'; - |ru='PurchaseReturn DR (R2040B_TaxesIncoming) CR (R1021B_VendorsTransactions)'; - |tr='PurchaseReturn DR (R2040B_TaxesIncoming) CR (R1021B_VendorsTransactions)'", Lang)); +Strings.Insert("PurchaseReturn_DR_R1021B_VendorsTransactions_CR_R2040B_TaxesIncoming", + NStr("en='PurchaseReturn DR (R1021B_VendorsTransactions) CR (R2040B_TaxesIncoming)'; + |ru='Возврат покупки ДР (R1021B_VendorsTransactions) КР (R2040B_TaxesIncoming)'; + |tr='PurchaseReturn DR (R1021B_VendorsTransactions) CR (R2040B_TaxesIncoming)'", Lang)); + +Strings.Insert("TaxesOperation_DR_R2040B_TaxesIncoming_CR_R1040B_TaxesOutgoing", + NStr("en='TaxesOperation DR (R2040B_TaxesIncoming) CR (R1040B_TaxesOutgoing)'; + |ru='Операция с налогами ДР (R2040B_TaxesIncoming) КР (R1040B_TaxesOutgoing)'; + |tr='TaxesOperation DR (R2040B_TaxesIncoming) CR (R1040B_TaxesOutgoing)'", Lang)); + +Strings.Insert("TaxesOperation_DR_R2040B_TaxesIncoming_CR_R5015B_OtherPartnersTransactions", + NStr("en='TaxesOperation DR (R2040B_TaxesIncoming) CR (R5015B_OtherPartnersTransactions)'; + |ru='Операция с налогами ДР (R2040B_TaxesIncoming) КР (R5015B_OtherPartnersTransactions)'; + |tr='TaxesOperation DR (R2040B_TaxesIncoming) CR (R5015B_OtherPartnersTransactions)'", Lang)); + +Strings.Insert("TaxesOperation_DR_R5015B_OtherPartnersTransactions_CR_R1040B_TaxesOutgoing", + NStr("en='TaxesOperation DR (R5015B_OtherPartnersTransactions) CR (R1040B_TaxesOutgoing)'; + |ru='Операция с налогами ДР (R5015B_OtherPartnersTransactions) КР (R1040B_TaxesOutgoing)'; + |tr='TaxesOperation DR (R5015B_OtherPartnersTransactions) CR (R1040B_TaxesOutgoing)'", Lang)); #EndRegion diff --git a/IRP/src/CommonModules/ModelClientServer_V2/Module.bsl b/IRP/src/CommonModules/ModelClientServer_V2/Module.bsl index 59944699cf..f595ac4481 100644 --- a/IRP/src/CommonModules/ModelClientServer_V2/Module.bsl +++ b/IRP/src/CommonModules/ModelClientServer_V2/Module.bsl @@ -239,7 +239,9 @@ Procedure ExecuteInExtension(Result, Options, ExecutorName) EndProcedure Function GetChain() + Chain = New Structure("Idle", False); + // Default.List Chain.Insert("DefaultStoreInList" , GetChainLink("DefaultStoreInListExecute")); Chain.Insert("DefaultDeliveryDateInList" , GetChainLink("DefaultDeliveryDateInListExecute")); @@ -437,6 +439,8 @@ Function GetChain() Chain.Insert("ChangeAccrualTypeByPositionOrEmployee" , GetChainLink("ChangeAccrualTypeByPositionOrEmployeeExecute")); Chain.Insert("ChangeSalaryBySalaryType", GetChainLink("ChangeSalaryBySalaryTypeExecute")); + Chain.Insert("ChangePartnerChoiceList", GetChainLink("ChangePartnerChoiceListExecute")); + // Extractors Chain.Insert("ExtractDataAgreementApArPostingDetail" , GetChainLink("ExtractDataAgreementApArPostingDetailExecute")); Chain.Insert("ExtractDataCurrencyFromAccount" , GetChainLink("ExtractDataCurrencyFromAccountExecute")); @@ -444,7 +448,6 @@ Function GetChain() // Loaders Chain.Insert("LoadTable", GetChainLink("LoadTableExecute")); - Return Chain; EndFunction @@ -2283,6 +2286,18 @@ EndFunction #EndRegion +#Region PARTNERS + +Function ChangePartnerChoiceListOptions() Export + Return GetChainLinkOptions("DocumentName, Company, TransactionType"); +EndFunction + +Function ChangePartnerChoiceListExecute(Options) Export + Return CatPartnersServer.GetChoiceListForDocument(Options.DocumentName, Options.Company, Options.TransactionType); +EndFunction + +#EndRegion + #Region TAXES Function ChangeTaxVisibleOptions() Export diff --git a/IRP/src/CommonModules/ModelServer_V2/Module.bsl b/IRP/src/CommonModules/ModelServer_V2/Module.bsl index 90fb479d01..aaf8fff1e9 100644 --- a/IRP/src/CommonModules/ModelServer_V2/Module.bsl +++ b/IRP/src/CommonModules/ModelServer_V2/Module.bsl @@ -356,6 +356,10 @@ Function GetPartnerTypeByTransactionType(TransactionType) Export Map.Insert(Enums.IncomingPaymentTransactionType.OtherPartner , "Other"); Map.Insert(Enums.IncomingPaymentTransactionType.OtherIncome , "Other"); + Map.Insert(Enums.TaxesOperationTransactionType.TaxOffset , "Other"); + Map.Insert(Enums.TaxesOperationTransactionType.TaxOffsetAndPayment , "Other"); + Map.Insert(Enums.TaxesOperationTransactionType.TaxPayment , "Other"); + Return Map.Get(TransactionType); EndFunction diff --git a/IRP/src/CommonModules/PictureViewerClient/Module.bsl b/IRP/src/CommonModules/PictureViewerClient/Module.bsl index d400ee8048..65930bd66d 100644 --- a/IRP/src/CommonModules/PictureViewerClient/Module.bsl +++ b/IRP/src/CommonModules/PictureViewerClient/Module.bsl @@ -1,4 +1,11 @@ +// Get picture URL. +// +// Parameters: +// FileRef - See PictureViewerServer.CreatePictureParameters +// +// Returns: +// String Function GetPictureURL(FileRef) Export URLStructure = PictureViewerServer.GetPictureURL(FileRef); ProcessingCommonModule = Eval(URLStructure.ProcessingModule); @@ -226,6 +233,20 @@ Function PicturesInfoForSlider(ItemRef, UUID, FileRef = Undefined, UseFullSizePh EndFunction +Procedure SetPDFForView(FileRef, PDFViewer) Export + PictureParameters = PictureViewerServer.CreatePictureParameters(FileRef); + + URI = GetPictureURL(PictureParameters); //String + BD = GetFromTempStorage(URI); // BinaryData + If Not BD = Undefined Then + BDB = GetBinaryDataBufferFromBinaryData(BD); + MemoryStream = New MemoryStream(BDB); + PDFViewer.ReadAsync(MemoryStream); + Else + CommonFunctionsClientServer.ShowUsersMessage(R().InfoMessage_040); + EndIf; +EndProcedure + #Region FormEvents Procedure PictureViewHTMLOnClick(Form, Item, EventData, StandardProcessing) Export diff --git a/IRP/src/CommonModules/PictureViewerServer/Module.bsl b/IRP/src/CommonModules/PictureViewerServer/Module.bsl index 70f38037f7..50e8c4d56b 100644 --- a/IRP/src/CommonModules/PictureViewerServer/Module.bsl +++ b/IRP/src/CommonModules/PictureViewerServer/Module.bsl @@ -297,7 +297,12 @@ Function GetVolumeURLByIntegrationSettings(IntegrationSettings, URI) Export FullURL = ""; If IntegrationSettings.IntegrationType = Enums.IntegrationType.LocalFileStorage Then - FullURL = ConnectionSettings.Value.AddressPath + "/" + URI; + Try + BD = New BinaryData(ConnectionSettings.Value.AddressPath + "/" + URI); + Except + BD = Undefined; + EndTry; + FullURL = PutToTempStorage(BD); ElsIf Not ExtensionCall_GetVolumeURLByIntegrationSettings(FullURL, IntegrationSettings, URI) Then If ConnectionSettings.Value.Property("SecureConnection") And ConnectionSettings.Value.SecureConnection = True Then @@ -522,7 +527,7 @@ EndFunction // Pictures info for slider. // // Parameters: -// ItemRef - CatalogRef.Items, CatalogRef.ItemKeys - Item ref +// ItemRef - CatalogRefCatalogName, DocumentRefDocumentName - // FileRef - Undefined - File ref // UseFullSizePhoto - Boolean - Use full size photo // @@ -619,6 +624,20 @@ EndFunction #EndRegion +// Create picture parameters. +// +// Parameters: +// FileRef - CatalogRef.Files - File ref +// +// Returns: +// Structure - Create picture parameters: +// * Ref - CatalogRef.Files +// * Description - String - +// * FileID - String - +// * isFilledVolume - Boolean - +// * GETIntegrationSettings - CatalogRef.IntegrationSettings +// * isLocalPictureURL - Boolean - +// * URI - String Function CreatePictureParameters(FileRef) Export Ref = FileRef; If TypeOf(FileRef) = Type("FormDataStructure") Then diff --git a/IRP/src/CommonModules/TaxesClientServer/Module.bsl b/IRP/src/CommonModules/TaxesClientServer/Module.bsl index f7c7b35d17..b54f3ecac2 100644 --- a/IRP/src/CommonModules/TaxesClientServer/Module.bsl +++ b/IRP/src/CommonModules/TaxesClientServer/Module.bsl @@ -17,6 +17,10 @@ Procedure ChangeVsible(Form, Visible) Export _arrayOfFormItems.Add("PaymentListTotalNetAmount"); _arrayOfFormItems.Add("PaymentListVATRate"); + _arrayOfFormItems.Add("TransactionsVatRate"); + _arrayOfFormItems.Add("TransactionsNetAmount"); + _arrayOfFormItems.Add("TransactionsTaxAmount"); + For Each _item In _arrayOfFormItems Do If CommonFunctionsClientServer.ObjectHasProperty(Form.Items, _item) Then Form.Items[_item].Visible = Visible; @@ -25,13 +29,15 @@ Procedure ChangeVsible(Form, Visible) Export EndProcedure Procedure LoadChoiceList(Form, ChoiceList) Export - If CommonFunctionsClientServer.ObjectHasProperty(Form.Items, "ItemListVATRate") Then - Form.Items["ItemListVATRate"].ChoiceList.Clear(); - Form.Items["ItemListVATRate"].ChoiceList.LoadValues(ChoiceList); - EndIf; - - If CommonFunctionsClientServer.ObjectHasProperty(Form.Items, "PaymentListVATRate") Then - Form.Items["PaymentListVATRate"].ChoiceList.Clear(); - Form.Items["PaymentListVATRate"].ChoiceList.LoadValues(ChoiceList); - EndIf; + LoadChoiceList_VatRate(Form, ChoiceList, "ItemListVATRate"); + LoadChoiceList_VatRate(Form, ChoiceList, "PaymentListVATRate"); + LoadChoiceList_VatRate(Form, ChoiceList, "TransactionsVATRate"); EndProcedure + +Procedure LoadChoiceList_VatRate(Form, ChoiceList, ItemName) + If CommonFunctionsClientServer.ObjectHasProperty(Form.Items, ItemName) Then + Form.Items[ItemName].ChoiceList.Clear(); + Form.Items[ItemName].ChoiceList.LoadValues(ChoiceList); + EndIf; +EndProcedure + diff --git a/IRP/src/CommonModules/TaxesServer/Module.bsl b/IRP/src/CommonModules/TaxesServer/Module.bsl index fc02bfab0f..de3de149c5 100644 --- a/IRP/src/CommonModules/TaxesServer/Module.bsl +++ b/IRP/src/CommonModules/TaxesServer/Module.bsl @@ -331,24 +331,42 @@ EndFunction Function GetDocumentsWithTax() Export List = New ValueList(); For Each Document In Metadata.Documents Do - If Document.TabularSections.Find("PaymentList") <> Undefined Then - For Each _column In Document.TabularSections.PaymentList.Attributes Do - If Upper(_column.Name) = Upper("VatRate") Then - List.Add(Document.Name, Document.Synonym); - Break; - EndIf; - EndDo; - EndIf; + FindTaxInTabularSection(Document, "PaymentList" , List); + FindTaxInTabularSection(Document, "ItemList" , List); + FindTaxInTabularSection(Document, "Transactions" , List); - If Document.TabularSections.Find("ItemList") <> Undefined Then - For Each _column In Document.TabularSections.ItemList.Attributes Do - If Upper(_column.Name) = Upper("VatRate") Then - List.Add(Document.Name, Document.Synonym); - Break; - EndIf; - EndDo; - EndIf; +// If Document.TabularSections.Find("PaymentList") <> Undefined Then +// For Each _column In Document.TabularSections.PaymentList.Attributes Do +// If Upper(_column.Name) = Upper("VatRate") Then +// List.Add(Document.Name, Document.Synonym); +// Break; +// EndIf; +// EndDo; +// EndIf; +// +// If Document.TabularSections.Find("ItemList") <> Undefined Then +// For Each _column In Document.TabularSections.ItemList.Attributes Do +// If Upper(_column.Name) = Upper("VatRate") Then +// List.Add(Document.Name, Document.Synonym); +// Break; +// EndIf; +// EndDo; +// EndIf; EndDo; Return List; EndFunction + +Procedure FindTaxInTabularSection(Document, TabularSectionName, List) + If Document.TabularSections.Find(TabularSectionName) <> Undefined Then + For Each _column In Document.TabularSections[TabularSectionName].Attributes Do + If Upper(_column.Name) = Upper("VatRate") Then + List.Add(Document.Name, Document.Synonym); + Break; + EndIf; + EndDo; + EndIf; +EndProcedure + + + diff --git a/IRP/src/CommonModules/UniqueID/Module.bsl b/IRP/src/CommonModules/UniqueID/Module.bsl index 42f51d487c..fdcc529622 100644 --- a/IRP/src/CommonModules/UniqueID/Module.bsl +++ b/IRP/src/CommonModules/UniqueID/Module.bsl @@ -15,8 +15,6 @@ Procedure CheckUniqueIDBeforeWrite(Source, Cancel) Export DataLockItem.Mode = DataLockMode.Shared; Try DataLock.Lock(); - //@skip-check module-unused-local-variable - Str = New Structure(Source.UniqueID); Except Cancel = True; CommonFunctionsClientServer.ShowUsersMessage(R().Error_012, "UniqueID", Source); diff --git a/IRP/src/CommonModules/ViewClient_V2/Module.bsl b/IRP/src/CommonModules/ViewClient_V2/Module.bsl index 621448d919..456d14a7b9 100644 --- a/IRP/src/CommonModules/ViewClient_V2/Module.bsl +++ b/IRP/src/CommonModules/ViewClient_V2/Module.bsl @@ -234,6 +234,10 @@ Procedure OnChainComplete(Parameters) Export EndIf; EndIf; + If Parameters.PartnerChoiceList <> Undefined Then + CommonFunctionsClientServer.LoadFormItemChoiceList(Parameters.Form, "Partner", Parameters.PartnerChoiceList); + EndIf; + If Parameters.ObjectMetadataInfo.MetadataName = "SalesInvoice" Or Parameters.ObjectMetadataInfo.MetadataName = "PurchaseInvoice" Or Parameters.ObjectMetadataInfo.MetadataName = "SalesReturn" @@ -1522,6 +1526,106 @@ EndProcedure #EndRegion +#Region TAXES_INCOMING_OUTGOING + +Function TaxesIncomingOutgoingBeforeAddRow(Object, Form, TableName, Cancel = False, Clone = False, CurrentData = Undefined) Export + NewRow = AddOrCopyRow(Object, Form, TableName, Cancel, Clone, CurrentData, + "TaxesIncomingOutgoingOnAddRowFormNotify", "TaxesIncomingOutgoingOnCopyRowFormNotify"); + Form.Items[TableName].CurrentRow = NewRow.GetID(); + If Form.Items[TableName].CurrentRow <> Undefined Then + Form.Items[TableName].ChangeRow(); + EndIf; + Return NewRow; +EndFunction + +Procedure TaxesIncomingOutgoingOnAddRowFormNotify(Parameters) Export + Parameters.Form.Modified = True; + If Parameters.ObjectMetadataInfo.MetadataName = "TaxesOperation" Then + Parameters.Form.CalculateTaxesDifference(); + EndIf; +EndProcedure + +Procedure TaxesIncomingOutgoingOnCopyRowFormNotify(Parameters) Export + Parameters.Form.Modified = True; + If Parameters.ObjectMetadataInfo.MetadataName = "TaxesOperation" Then + Parameters.Form.CalculateTaxesDifference(); + EndIf; +EndProcedure + +Procedure TaxesIncomingOutgoingAfterDeleteRow(Object, Form, TableName) Export + DeleteRows(Object, Form, TableName, "TaxesIncomingOutgoingAfterDeleteRowFormNotify"); +EndProcedure + +Procedure TaxesIncomingOutgoingAfterDeleteRowFormNotify(Parameters) Export + Parameters.Form.Modified = True; + If Parameters.ObjectMetadataInfo.MetadataName = "TaxesOperation" Then + Parameters.Form.CalculateTaxesDifference(); + EndIf; +EndProcedure + +Procedure TaxesIncomingOutgoingLoad(Object, Form, TableName, Address, GroupColumn = "", SumColumn = "") Export + Parameters = GetLoadParameters(Object, Form, TableName, Address, GroupColumn, SumColumn); + Parameters.LoadData.ExecuteAllViewNotify = True; + ControllerClientServer_V2.AddEmptyRowsForLoad(Parameters); + ControllerClientServer_V2.TaxesIncomingOutgoingLoad(Parameters); +EndProcedure + +#EndRegion + +#Region TAXES_INCOMING_OUTGOING_COLUMNS + +#Region TAXES_INCOMING_OUTGOING_VAT_RATE + +// TaxesIncomingOutgoing.VatRate +Procedure TaxesIncomingOutgoingVatRateOnChange(Object, Form, TableName, CurrentData = Undefined) Export + Rows = GetRowsByCurrentData(Form, TableName, CurrentData); + Parameters = GetSimpleParameters(Object, Form, TableName, Rows); + ControllerClientServer_V2.TaxesIncomingOutgoingVatRateOnChange(Parameters); +EndProcedure + +#EndRegion + +#Region TAXES_INCOMING_OUTGOING_NET_AMOUNT + +// TaxesIncomingOutgoing.NetAmount +Procedure TaxesIncomingOutgoingNetAmountOnChange(Object, Form, TableName, CurrentData = Undefined) Export + Rows = GetRowsByCurrentData(Form, TableName, CurrentData); + Parameters = GetSimpleParameters(Object, Form, TableName, Rows); + ControllerClientServer_V2.TaxesIncomingOutgoingNetAmountOnChange(Parameters); +EndProcedure + +#EndRegion + +#Region TAXES_INCOMING_OUTGOING_TAX_AMOUNT + +// TaxesIncomingOutgoing.TaxAmount +Procedure TaxesIncomingOutgoingTaxAmountOnChange(Object, Form, TableName, CurrentData = Undefined) Export + Rows = GetRowsByCurrentData(Form, TableName, CurrentData); + Parameters = GetSimpleParameters(Object, Form, TableName, Rows); + ControllerClientServer_V2.TaxesIncomingOutgoingTaxAmountOnChange(Parameters); +EndProcedure + +#EndRegion + +#Region TAXES_INCOMING_OUTGOING_TOTAL_AMOUNT + +// TaxesIncomingOutgoing.TotalAmount +Procedure TaxesIncomingOutgoingTotalAmountOnChange(Object, Form, TableName, CurrentData = Undefined) Export + Rows = GetRowsByCurrentData(Form, TableName, CurrentData); + Parameters = GetSimpleParameters(Object, Form, TableName, Rows); + ControllerClientServer_V2.TaxesIncomingOutgoingTotalAmountOnChange(Parameters); +EndProcedure + +Procedure OnChangeTaxesIncomingOutgoingTotalAmountNotify(Parameters) Export + If Parameters.ObjectMetadataInfo.MetadataName = "TaxesOperation" Then + Parameters.Form.CalculateTaxesDifference(); + EndIf; +EndProcedure + +#EndRegion + +#EndRegion + #Region CHEQUE_BONDS Function ChequeBondsBeforeAddRow(Object, Form, Cancel = False, Clone = False, CurrentData = Undefined) Export @@ -2387,17 +2491,6 @@ EndProcedure #EndRegion -#Region ITEM_LIST_AMOUNT - -// ItemList.Amount -Procedure ItemListAmountOnChange(Object, Form, CurrentData = Undefined) Export - Rows = GetRowsByCurrentData(Form, "ItemList", CurrentData); - Parameters = GetSimpleParameters(Object, Form, "ItemList", Rows); - ControllerClientServer_V2.ItemListAmountOnChange(Parameters); -EndProcedure - -#EndRegion - #Region ITEM_LIST_STORE // ItemList.Store @@ -2875,6 +2968,34 @@ Procedure TransactionsLegalNameOnChange(Object, Form, CurrentData = Undefined) E ControllerClientServer_V2.TransactionsLegalNameOnChange(Parameters); EndProcedure +// Transactions.VatRate +Procedure TransactionsVatRateOnChange(Object, Form, CurrentData = Undefined) Export + Rows = GetRowsByCurrentData(Form, "Transactions", CurrentData); + Parameters = GetSimpleParameters(Object, Form, "Transactions", Rows); + ControllerClientServer_V2.TransactionsVatRateOnChange(Parameters); +EndProcedure + +// Transactions.NetAmount +Procedure TransactionsNetAmountOnChange(Object, Form, CurrentData = Undefined) Export + Rows = GetRowsByCurrentData(Form, "Transactions", CurrentData); + Parameters = GetSimpleParameters(Object, Form, "Transactions", Rows); + ControllerClientServer_V2.TransactionsNetAmountOnChange(Parameters); +EndProcedure + +// Transactions.TaxAmount +Procedure TransactionsTaxAmountOnChange(Object, Form, CurrentData = Undefined) Export + Rows = GetRowsByCurrentData(Form, "Transactions", CurrentData); + Parameters = GetSimpleParameters(Object, Form, "Transactions", Rows); + ControllerClientServer_V2.TransactionsTaxAmountOnChange(Parameters); +EndProcedure + +// Transactions.Amount +Procedure TransactionsAmountOnChange(Object, Form, CurrentData = Undefined) Export + Rows = GetRowsByCurrentData(Form, "Transactions", CurrentData); + Parameters = GetSimpleParameters(Object, Form, "Transactions", Rows); + ControllerClientServer_V2.TransactionsAmountOnChange(Parameters); +EndProcedure + #EndRegion #Region PAYROLL_LISTS @@ -3163,7 +3284,8 @@ EndProcedure Procedure OnSetReceiveAmountNotify(Parameters) Export If Parameters.ObjectMetadataInfo.MetadataName = "MoneyTransfer" - Or Parameters.ObjectMetadataInfo.MetadataName = "CashTransferOrder" Then + Or Parameters.ObjectMetadataInfo.MetadataName = "CashTransferOrder" + Or Parameters.ObjectMetadataInfo.MetadataName = "DebitCreditNote" Then Parameters.Form.FormSetVisibilityAvailability(); EndIf; EndProcedure diff --git a/IRP/src/Configuration/Configuration.mdo b/IRP/src/Configuration/Configuration.mdo index 740a6fa115..c22b87965a 100644 --- a/IRP/src/Configuration/Configuration.mdo +++ b/IRP/src/Configuration/Configuration.mdo @@ -482,7 +482,6 @@ Role.AccumulationRegisters_R5015B_OtherPartnersTransactions Role.AccumulationRegisters_R5021T_Revenues Role.AccumulationRegisters_R5022T_Expenses - Role.AccumulationRegisters_R5041B_TaxesPayable Role.AccumulationRegisters_R6010B_BatchWiseBalance Role.AccumulationRegisters_R6020B_BatchBalance Role.AccumulationRegisters_R6030T_BatchShortageOutgoing @@ -517,6 +516,8 @@ Role.AuditLockUnset Role.AccumulationRegisters_R5020B_PartnersBalance Role.ManualRegisterEdit + Role.Document_TaxesOperation + Role.AttachedFilesDelete CommonTemplate.HTMLPictureSlider CommonTemplate.HTMLAddAttributes CommonTemplate.HTMLGallery @@ -842,6 +843,8 @@ CommonModule.DocExpenseRevenueAccrualsClient CommonModule.DocExpenseRevenueAccrualsServer CommonModule.FixDocumentProblemsServer + CommonModule.DocTaxesOperationClient + CommonModule.DocTaxesOperationServer CommonAttribute.Author CommonAttribute.Branch CommonAttribute.Description @@ -1202,6 +1205,7 @@ Document.BatchReallocateIncoming Document.BatchReallocateOutgoing Document.Bundling + Document.CalculationDeservedVacations Document.CalculationMovementCosts Document.CashExpense Document.CashPayment @@ -1280,6 +1284,7 @@ Document.DebitCreditNote Document.ExpenseAccruals Document.RevenueAccruals + Document.TaxesOperation DocumentJournal.DocumentsForIncomingPayment DocumentJournal.DocumentsForOutgoingPayment Enum.AccountingAnalyticTypes @@ -1378,6 +1383,8 @@ Enum.AccrualsTransactionType Enum.OtherPeriodExpenseType Enum.OtherPeriodRevenueType + Enum.TaxesOperationTransactionType + Enum.InvoiceType Report.A0010_TrialBalance Report.A0011_TrialBalanceByAccount Report.A0012_AccountCard @@ -1506,6 +1513,7 @@ InformationRegister.T9520S_TimeSheetInfo InformationRegister.T9530S_WorkDays InformationRegister.T9540S_EmployeeVacations + InformationRegister.T9545S_VacationDaysLimits InformationRegister.T9550S_EmployeeSickLeave InformationRegister.Taxes InformationRegister.TaxSettings @@ -1578,7 +1586,6 @@ AccumulationRegister.R5015B_OtherPartnersTransactions AccumulationRegister.R5021T_Revenues AccumulationRegister.R5022T_Expenses - AccumulationRegister.R5041B_TaxesPayable AccumulationRegister.R6010B_BatchWiseBalance AccumulationRegister.R6020B_BatchBalance AccumulationRegister.R6030T_BatchShortageOutgoing @@ -1608,6 +1615,7 @@ AccumulationRegister.TM1030B_TransactionsKey AccumulationRegister.R8510B_BookValueOfFixedAsset AccumulationRegister.R8515T_CostOfFixedAsset + AccumulationRegister.R9541T_VacationUsage AccumulationRegister.R9545T_PaidVacations AccumulationRegister.R9555T_PaidSickLeaves AccumulationRegister.R9560T_AdditionalAccrual diff --git a/IRP/src/DataProcessors/AttachedFilesToDocumentsControl/AttachedFilesToDocumentsControl.mdo b/IRP/src/DataProcessors/AttachedFilesToDocumentsControl/AttachedFilesToDocumentsControl.mdo index 1ee51ec9a4..18b0b94825 100644 --- a/IRP/src/DataProcessors/AttachedFilesToDocumentsControl/AttachedFilesToDocumentsControl.mdo +++ b/IRP/src/DataProcessors/AttachedFilesToDocumentsControl/AttachedFilesToDocumentsControl.mdo @@ -398,15 +398,15 @@ FilePresention en - File presention + File type ru - Представление файла + Тип файла tr - Dosya görünümü + File type ChartOfCharacteristicTypesRef.AddAttributeAndProperty diff --git a/IRP/src/DataProcessors/AttachedFilesToDocumentsControl/Forms/Form/Form.form b/IRP/src/DataProcessors/AttachedFilesToDocumentsControl/Forms/Form/Form.form index f57db0a510..036d607bed 100644 --- a/IRP/src/DataProcessors/AttachedFilesToDocumentsControl/Forms/Form/Form.form +++ b/IRP/src/DataProcessors/AttachedFilesToDocumentsControl/Forms/Form/Form.form @@ -1436,412 +1436,195 @@ true AsFileRef - true - true - - true - - - en - Group tables left - - - ru - Группа таблиц слева - - - tr - Grup tablolar sol - - - GroupTablesLeftExtendedTooltip - 86 + + DocumentsAttachedFiles + 47 true true true - Label - true - true - - Left - - - UsualGroup - - HorizontalIfPossible - Auto - true - true - Auto - Auto - - - - GroupTablesRight - 87 - - GroupDocsToAttach - 138 - - DocumentsAttachedFiles - 47 + + Object.DocumentsAttachedFiles + + None + + DocumentsAttachedFilesRequired + 69 true true true - Object.DocumentsAttachedFiles + Object.DocumentsAttachedFiles.IsRequired - None - - DocumentsAttachedFilesFilePresention - 63 + + DocumentsAttachedFilesRequiredExtendedTooltip + 71 true true true - - Object.DocumentsAttachedFiles.FilePresention - - - DocumentsAttachedFilesFilePresentionExtendedTooltip - 65 - true - true - - true - - Label - true - true - - Left - - - - DocumentsAttachedFilesFilePresentionContextMenu - 64 - true - true - - true - - true - - InputField - true - EnterOnInput - true - Left - true - - true - true - true - true - true - true + Label + true + true + + Left - - - DocumentsAttachedFilesGroupRequiredFormat - 77 - - DocumentsAttachedFilesRequired - 69 - true - true - - true - - - Object.DocumentsAttachedFiles.IsRequired - - - DocumentsAttachedFilesRequiredExtendedTooltip - 71 - true - true - - true - - Label - true - true - - Left - - - - DocumentsAttachedFilesRequiredContextMenu - 70 - true - true - - true - - true - - CheckBoxField - EnterOnInput - true - Left - true - - - - DocumentsAttachedFilesFileExtension - 72 - - <key>en</key> - <value>Extension</value> - - - <key>ru</key> - <value>Расширение</value> - - - <key>tr</key> - <value>Uzantı</value> - - true - true - - true - - - Object.DocumentsAttachedFiles.FileExtension - - - DocumentsAttachedFilesFileExtensionExtendedTooltip - 74 - true - true - - true - - Label - true - true - - Left - - - - DocumentsAttachedFilesFileExtensionContextMenu - 73 - true - true - - true - - true - - InputField - EnterOnInput - true - Left - true - - true - true - true - true - true - true - - + + + DocumentsAttachedFilesRequiredContextMenu + 70 true true true - - <key>en</key> - <value>Documents attached files group required format</value> - - - <key>ru</key> - <value>Требуемый формат группы файлов документов</value> - - - <key>tr</key> - <value>Evraklar eklenen dosyalar grubu istenilen format</value> - - - en - Documents attached files group required format - - - ru - Требуемый формат группы файлов документов - - - tr - Evraklar eklenen dosyalar grubu istenilen format - - true - - DocumentsAttachedFilesGroupRequiredFormatExtendedTooltip - 78 - true - true - - true - - Label - true - true - - Left - - - ColumnGroup - - true - - - - DocumentsAttachedFilesCommandBar - 49 + true + + CheckBoxField + EnterOnInput + true + Left + true + + + + DocumentsAttachedFilesFilePresention + 63 + true + true + + true + + + Object.DocumentsAttachedFiles.FilePresention + + + DocumentsAttachedFilesFilePresentionExtendedTooltip + 65 true true true - Left - - - Selection - DocumentsAttachedFilesSelection - - - OnActivateRow - DocumentsAttachedFilesOnActivateRow - - + Label + true + true + + Left + + + + DocumentsAttachedFilesFilePresentionContextMenu + 64 true true true - DocumentsAttachedFilesSearchString - 51 - - DocumentsAttachedFilesSearchStringExtendedTooltip - 53 - true - true - - true - - Label - true - true - - Left - - - - DocumentsAttachedFilesSearchStringContextMenu - 52 - true - true - - true - - true - - DocumentsAttachedFilesSearchString - - true - - - + true + + InputField + true + EnterOnInput + true + Left + true + + 10 + 10 + true + false + true + true + true + true + + + + DocumentsAttachedFilesFilePresentionComment + 232 + + Style.ButtonTextColor + + true + true + + true + + + Object.DocumentsAttachedFiles.FilePresention.Comment + + + DocumentsAttachedFilesFilePresentionCommentExtendedTooltip + 234 true true true - DocumentsAttachedFilesViewStatus - 54 - - DocumentsAttachedFilesViewStatusExtendedTooltip - 56 - true - true - - true - - Label - true - true - - Left - - - - DocumentsAttachedFilesViewStatusContextMenu - 55 - true - true - - true - - true - - ViewStatusAddition - DocumentsAttachedFilesViewStatus - - true + Label + true + true + + Left - - + + + DocumentsAttachedFilesFilePresentionCommentContextMenu + 233 true true true - DocumentsAttachedFilesSearchControl - 57 - - DocumentsAttachedFilesSearchControlExtendedTooltip - 59 - true - true - - true - - Label - true - true - - Left - - - - DocumentsAttachedFilesSearchControlContextMenu - 58 - true - true - - true - - true - - SearchControlAddition - DocumentsAttachedFilesSearchControl - - true - - + true + + LabelField + Enter + true + Left + true + + true + true + + Style.BorderColor + + + + + DocumentsAttachedFilesCommandBar + 49 + true + true + + true + + Left + + + Selection + DocumentsAttachedFilesSelection + + + OnActivateRow + DocumentsAttachedFilesOnActivateRow + + + true + true + + true + + DocumentsAttachedFilesSearchString + 51 - DocumentsAttachedFilesExtendedTooltip - 50 + DocumentsAttachedFilesSearchStringExtendedTooltip + 53 true true @@ -1855,97 +1638,31 @@ - DocumentsAttachedFilesContextMenu - 48 - - AttachOther - 185 - true - true - - true - - - AttachOtherExtendedTooltip - 186 - true - true - - true - - Label - true - true - - Left - - - Form.Command.AttachOther - PictureAndText - true - 4 - true - true - UserCmds - - Style.NormalTextFont - 14.0 - true - false - false - false - - - StdPicture.Attach - - Auto - + DocumentsAttachedFilesSearchStringContextMenu + 52 true true true + true - HierarchicalList - true - true - true - true - MultiRow -
true
- 1 - 1 - AutoUse - AutoUse - true - true - true - Auto - Auto - true - true - true - true - AsFileRef - - - - DocumentsAttachedFilesFilePresentionComment - 232 - - Style.ButtonTextColor - + DocumentsAttachedFilesSearchString + + true + + + true true true - - Items.DocumentsAttachedFiles.CurrentData.FilePresention.Comment - + DocumentsAttachedFilesViewStatus + 54 - DocumentsAttachedFilesFilePresentionCommentExtendedTooltip - 234 + DocumentsAttachedFilesViewStatusExtendedTooltip + 56 true true @@ -1959,8 +1676,8 @@ - DocumentsAttachedFilesFilePresentionCommentContextMenu - 233 + DocumentsAttachedFilesViewStatusContextMenu + 55 true true @@ -1968,34 +1685,80 @@ true - LabelField - Enter - true - Left - true - + ViewStatusAddition + DocumentsAttachedFilesViewStatus + + true + + + + true + true + + true + + DocumentsAttachedFilesSearchControl + 57 + + DocumentsAttachedFilesSearchControlExtendedTooltip + 59 + true + true + + true + + Label true true - true - - Style.BorderColor - + + Left + + + + DocumentsAttachedFilesSearchControlContextMenu + 58 + true + true + + true + + true + + SearchControlAddition + DocumentsAttachedFilesSearchControl + + true - - - GroupAttachButton - 183 + + + DocumentsAttachedFilesExtendedTooltip + 50 + true + true + + true + + Label + true + true + + Left + + + + DocumentsAttachedFilesContextMenu + 48 - AddNewDocument - 230 + AttachOther + 185 true true true - AddNewDocumentExtendedTooltip - 231 + AttachOtherExtendedTooltip + 186 true true @@ -2008,74 +1771,103 @@ Left - UsualButton - Form.Command.AddNewDocument - Auto - 2 + Form.Command.AttachOther + PictureAndText + true + 4 true - true + true UserCmds - Style.ExtraLargeTextFont + Style.NormalTextFont + 14.0 + true + false + false + false + + StdPicture.Attach + Auto - WhenActive true true true - - <key>en</key> - <value>Group attach button</value> - - - <key>ru</key> - <value>Группа Кнопки прикрепления</value> - - - <key>tr</key> - <value>Grup ekle butonu</value> - - - en - Group attach button - - - ru - Группа Кнопки прикрепления - - - tr - Grup ekle butonu - - true - - GroupAttachButtonExtendedTooltip - 184 - true - true - - true - - Label - true - true - - Left - - - UsualGroup - - AlwaysHorizontal - Auto - true - true - Auto - Auto - - + + HierarchicalList + true + true + true + true + MultiRow +
true
+ 1 + 1 + AutoUse + AutoUse + true + true + true + Auto + Auto + true + true + true + true + AsFileRef + + + true + true + + true + + + en + Group tables left + + + ru + Группа таблиц слева + + + tr + Grup tablolar sol + + + GroupTablesLeftExtendedTooltip + 86 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + Vertical + Auto + true + true + Auto + Auto + + + + GroupTablesRight + 87 + + GroupDocsToAttach + 138 CurrentFilesTable 120 @@ -2253,6 +2045,66 @@ CurrentFilesTableCommandBar 122 + + AddNewDocument + 230 + true + true + + true + + + AddNewDocumentExtendedTooltip + 231 + true + true + + true + + Label + true + true + + Left + + + Form.Command.AddNewDocument + Auto + true + true + UserCmds + Auto + + + CurrentFilesTableDownloadFile + 235 + true + true + + true + + + CurrentFilesTableDownloadFileExtendedTooltip + 236 + true + true + + true + + Label + true + true + + Left + + + Form.Command.DownloadFile + Auto + true + true + UserCmds + Auto + true true @@ -2427,7 +2279,6 @@ Auto Auto true - true true true AsFileRef @@ -2524,9 +2375,6 @@ Left true - 15 - true - true true true Proportionally @@ -2632,10 +2480,8 @@ true - 49 - true + 50 10 - true true true @@ -3310,15 +3156,15 @@ AddNewDocument <key>en</key> - <value>⬆️ Select document type ⬆️</value> + <value>Attach document</value> <key>ru</key> - <value>⬆️ Выберите тип документа ⬆️</value> + <value>Прикрепить документ</value> <key>tr</key> - <value>⬆️ Evrak tipini seçiniz ⬆️</value> + <value>Attach document</value> 7 @@ -3335,6 +3181,35 @@ TextPicture Auto + + DownloadFile + + <key>en</key> + <value>Download file</value> + + + <key>ru</key> + <value>Скачать файл</value> + + + <key>tr</key> + <value>Dosya indir</value> + + 8 + + true + + + StdPicture.AppearanceDownArrowGray + + + + DownloadFile + + + TextPicture + Auto + diff --git a/IRP/src/DataProcessors/AttachedFilesToDocumentsControl/Forms/Form/Module.bsl b/IRP/src/DataProcessors/AttachedFilesToDocumentsControl/Forms/Form/Module.bsl index 747f72d5c1..5b4a855a70 100644 --- a/IRP/src/DataProcessors/AttachedFilesToDocumentsControl/Forms/Form/Module.bsl +++ b/IRP/src/DataProcessors/AttachedFilesToDocumentsControl/Forms/Form/Module.bsl @@ -12,6 +12,11 @@ Procedure OnCreateAtServer(Cancel, StandardProcessing) EndProcedure +&AtClient +Procedure OnOpen(Cancel) + SetVisibleForCheckMode(CheckMode); +EndProcedure + &AtClient Procedure NotificationProcessing(EventName, Parameter, Source) If EventName = "UpdateObjectPictures_AddNewOne" Then @@ -40,15 +45,6 @@ Procedure FillDocuments(Command) EndProcedure -&AtClient -Function CurrentMaxFileSize() - - CurrentData = Items.DocumentsAttachedFiles.CurrentData; - - Return CurrentData.MaximumFileSize; - -EndFunction - &AtClient Function CheckFileMaxSize(FileArray, MaxSizeMb) @@ -68,6 +64,7 @@ Function CheckFileMaxSize(FileArray, MaxSizeMb) CurrentSizeMb = Round(CurrentSize/(byteSize * byteSize), 2); If CurrentSizeMb > MaxSizeMb Then FileName = FileRef.Name; + //@skip-check invocation-parameter-type-intersect, property-return-type ErrorText = StrTemplate(R().InfoMessage_AttachFile_MaxFileSize, FileName, CurrentSizeMb, MaxSizeMb); Structure.Result = False; @@ -93,6 +90,102 @@ Procedure AddNewDocument(Command) Upload(CurrentDocStructure); EndProcedure +&AtClient +Async Procedure DownloadFile(Command) + CurrentData = Items.CurrentFilesTable.CurrentData; + If CurrentData = Undefined Then + Return; + EndIf; + + PictureParameters = PictureViewerServer.CreatePictureParameters(CurrentData.File); + URI = PictureViewerClient.GetPictureURL(PictureParameters); // String + Dialog = New GetFilesDialogParameters(); + Try + //@skip-check invocation-parameter-type-intersect, property-return-type + Await GetFileFromServerAsync(URI, PictureParameters.Description, Dialog); + Except + //@skip-check property-return-type + CommonFunctionsClientServer.ShowUsersMessage(R().InfoMessage_040); + EndTry; +EndProcedure + +&AtClient +Async Procedure Upload(StructureParams) + + Structure = New Structure; + Structure.Insert("Ref", StructureParams.Ref); + Structure.Insert("UUID", StructureParams.UUID); + Structure.Insert("FilePrefix", StructureParams.FilePrefix); + Structure.Insert("PrintFormName", StructureParams.PrintFormName); + + OpenFileDialog = New FileDialog(FileDialogMode.Open); + OpenFileDialog.Multiselect = False; + OpenFileDialog.Filter = PictureViewerClientServer.FilterForPicturesDialog(); + FileRef = Await PutFileToServerAsync(, , , , StructureParams.UUID); // PlacedFileDescription + + If FileRef = Undefined Then + Return; + EndIf; + + FileArray = New Array; // Array of FileRef + //@skip-check invocation-parameter-type-intersect, property-return-type + FileArray.Add(FileRef.FileRef); + CheckSizeResult = CheckFileMaxSize(FileArray, StructureParams.MaxSize); + If CheckSizeResult.Result Then + PictureViewerClient.AddFile(FileRef, StructureParams.Storage, Structure); + + Else + For Each Error In CheckSizeResult.Errors Do + CommonFunctionsClientServer.ShowUsersMessage(Error); + EndDo; + EndIf; +EndProcedure + +&AtClient +Procedure CheckModeOnChange(Item) + + SetVisibleForCheckMode(CheckMode); + +EndProcedure + +&AtClient +Procedure SetVisibleForCheckMode(Val IsCheckMode) + + Items.DocumentsGroupLockUnlock.Visible = IsCheckMode; + Items.DocumentsAttachedFiles.Visible = Not IsCheckMode; + Items.AddNewDocument.Visible = Not IsCheckMode; + Items.ShowSettings.Visible = IsCheckMode; + +EndProcedure + +&AtClient +Procedure CompanyOnChange(Item) + FillDocumentsToControl(); +EndProcedure + +&AtClient +Procedure BranchOnChange(Item) + FillDocumentsToControl(); +EndProcedure + +&AtClient +Procedure PeriodOnChange(Item) + FillDocumentsToControl(); +EndProcedure + +&AtClient +Procedure ShowOnlyUnlocked(Command) + + Items.DocumentsShowOnlyUnlocked.Check = Not Items.DocumentsShowOnlyUnlocked.Check; + + If Items.DocumentsShowOnlyUnlocked.Check Then + Items.DocumentList.RowFilter = New FixedStructure("IsAuditLock", -1); + Else + Items.DocumentList.RowFilter = Undefined; + EndIf; + +EndProcedure + #EndRegion #Region FormTableItemsEventHandlers @@ -128,16 +221,25 @@ Procedure CurrentFilesTableOnActivateRow(Item) ShowPreviewPDF(CurrentData.File); Else ShowPreview(CurrentData.File); + GetFullPicture(CurrentData); EndIf; EndProcedure +&AtClient +Async Procedure GetFullPicture(CurrentData) + PictureParameters = PictureViewerServer.CreatePictureParameters(CurrentData.File); + Preview = PictureViewerClient.GetPictureURL(PictureParameters); // String +EndProcedure + &AtClient Procedure DocumentsAttachedFilesOnActivateRow(Item) CurrentData = Items.DocumentsAttachedFiles.CurrentData; If CurrentData = Undefined Then + //@skip-check invocation-parameter-type-intersect, property-return-type, statement-type-change Items.AddNewDocument.Title = R().InfoMessage_AttachFile_NonSelectDocType; Return; EndIf; + //@skip-check invocation-parameter-type-intersect, property-return-type Items.AddNewDocument.Title = StrTemplate(R().InfoMessage_AttachFile_SelectDocType, String(CurrentData.FilePresention)); EndProcedure @@ -145,37 +247,6 @@ EndProcedure #Region Private -&AtClient -Async Procedure Upload(StructureParams) - - Structure = New Structure; - Structure.Insert("Ref", StructureParams.Ref); - Structure.Insert("UUID", StructureParams.UUID); - Structure.Insert("FilePrefix", StructureParams.FilePrefix); - Structure.Insert("PrintFormName", StructureParams.PrintFormName); - - OpenFileDialog = New FileDialog(FileDialogMode.Open); - OpenFileDialog.Multiselect = False; - OpenFileDialog.Filter = PictureViewerClientServer.FilterForPicturesDialog(); - FileRef = Await PutFileToServerAsync(, , , , StructureParams.UUID); - - If FileRef = Undefined Then - Return; - EndIf; - - FileArray = New Array; // Array of FileRef - FileArray.Add(FileRef.FileRef); - CheckSizeResult = CheckFileMaxSize(FileArray, StructureParams.MaxSize); - If CheckSizeResult.Result Then - PictureViewerClient.AddFile(FileRef, StructureParams.Storage, Structure); - - Else - For Each Error In CheckSizeResult.Errors Do - CommonFunctionsClientServer.ShowUsersMessage(Error); - EndDo; - EndIf; -EndProcedure - &AtServer Procedure UpdateDocsDataInTables(DocsArray) @@ -184,65 +255,6 @@ Procedure UpdateDocsDataInTables(DocsArray) EndProcedure -// File attach empty structure. -// -// Returns: -// Structure - File attach empty structure: -// * FileIDs - Array of String -// * FileOwner - DocumentRef -// * FilesStorageVolume - CatalogRef.FileStorageVolumes - -// * FilePrefix - String - -// * PrintFormName - String - -&AtClient -Function FileAttachEmptyStructure() - - Structure = New Structure; - Structure.Insert("FileIDs", New Array); - Structure.Insert("FileOwner"); - Structure.Insert("FilesStorageVolume"); - Structure.Insert("FilePrefix", ""); - Structure.Insert("PrintFormName", ""); - Return Structure; - -EndFunction - -&AtClient -Async Procedure AttachFileToOwner(StructureParams) - - FilesAtServer = Await PutFilesToServerAsync( , , StructureParams.FileIDs, UUID); - - StructureParam = New Structure; - StructureParam.Insert("Ref", StructureParams.FileOwner); - StructureParam.Insert("UUID", UUID); - StructureParam.Insert("FilePrefix", StructureParams.FilePrefix); - StructureParam.Insert("PrintFormName", StructureParams.PrintFormName); - - For Each File In FilesAtServer Do - PictureViewerClient.AddFile(File, StructureParams.FilesStorageVolume, StructureParam); - EndDo; - NotifyChanged(Type("InformationRegisterRecordKey.AttachedFiles")); -EndProcedure - -&AtClient -Async Procedure UploadFiles(FileArray, DocStructure) - - FilesToTransfer = New Array; //Array of FileRef - For Each FileRef In FileArray Do - If Not Await FileRef.File.IsDirectoryAsync() Then - FilesToTransfer.Add(FileRef); - EndIf; - EndDo; - - Structure = FileAttachEmptyStructure(); - Structure.FileIDs = FilesToTransfer; - Structure.FileOwner = DocStructure.Ref; - Structure.FilesStorageVolume = DocStructure.Storage; - Structure.FilePrefix = DocStructure.FilePrefix; - Structure.PrintFormName = DocStructure.PrintFormName; - - AttachFileToOwner(Structure); -EndProcedure - &AtServer Procedure ShowPreview(FileRef) Items.PDFViewer.Visible = False; @@ -257,10 +269,7 @@ Async Procedure ShowPreviewPDF(FileRef) Items.PDFViewer.Visible = True; Items.Preview.Visible = False; - PictureParameters = PictureViewerServer.CreatePictureParameters(FileRef); - - URI = PictureViewerClient.GetPictureURL(PictureParameters); //String - PDFViewer.ReadAsync(URI); + PictureViewerClient.SetPDFForView(FileRef, PDFViewer); Items.PDFViewer.Scale = 20; EndProcedure @@ -291,6 +300,7 @@ Function GetDocPrefix(DocRef, NamingFormat) NewNamingFormat = StrReplace(NewNamingFormat, SearchSubstring, ReplaceSubsting); + //@skip-check invocation-parameter-type-intersect AttributesArray.Add(KeyValue.Value); EndIf; EndDo; @@ -304,6 +314,7 @@ Function GetDocPrefix(DocRef, NamingFormat) Value = AttributesStructure[Attribute]; // String EndIf; If IsTypeOf(Value, "Date") Then + //@skip-check invocation-parameter-type-intersect ReplaceSubsting = Format(Value, "DF=yyyyMMdd"); Else ReplaceSubsting = Value; @@ -327,11 +338,11 @@ EndFunction // * Object - Structure - // * UUID - UUID - // * Items - FormAllItems - -// * Ref - See DataProcessor.AttachedFilesToDocumentsControl.DocumentList.DocRef -// * DocMetaName - See DataProcessor.AttachedFilesToDocumentsControl.DocumentList.DocMetaName -// * Branch - See DataProcessor.AttachedFilesToDocumentsControl.DocumentList.Branch -// * Company - See DataProcessor.AttachedFilesToDocumentsControl.DocumentList.Company -// * Storage - See DataProcessor.AttachedFilesToDocumentsControl.DocumentList.FileStorageVolume +// * Ref - See DataProcessor.AttachedFilesToDocumentsControl.Documents.DocRef +// * DocMetaName - See DataProcessor.AttachedFilesToDocumentsControl.Documents.DocMetaName +// * Branch - See DataProcessor.AttachedFilesToDocumentsControl.Documents.Branch +// * Company - See DataProcessor.AttachedFilesToDocumentsControl.Documents.Company +// * Storage - See DataProcessor.AttachedFilesToDocumentsControl.Documents.FileStorageVolume // * FilePrefix - String - // * PrintFormName - String - // * MaxSize - Number - @@ -441,8 +452,20 @@ Function GetAllDocumentsTempTable(DocsNamesArray, DocsArray = Undefined) EndFunction +// Get attached documents. +// +// Parameters: +// AllDocumentsTempTable - ValueTable - All documents temp table +// +// Returns: +// QueryResultSelection - Get attached documents: +// * DocMetaName - String - +// * DocRef - DocumentRefDocumentName - +// * PrintFormName - ChartOfCharacteristicTypesRef.AddAttributeAndProperty - +// * IsFile - Boolean - +// * IsRequired - Boolean - &AtServerNoContext -Function GetQueryText() +Function GetAttachedDocuments(AllDocumentsTempTable) QueryTxt = "SELECT | AllDocumentsTempTable.Ref AS DocRef, @@ -484,7 +507,7 @@ Function GetQueryText() |INTO TT_AllDocumentsAndRequiredAttacments |FROM | TT_AllDocuments AS TT_AllDocuments - | LEFT JOIN Catalog.AttachedDocumentSettings.FileSettings AS AttachedDocumentSettingsFileSettings + | INNER JOIN Catalog.AttachedDocumentSettings.FileSettings AS AttachedDocumentSettingsFileSettings | ON TT_AllDocuments.DocMetaName = AttachedDocumentSettingsFileSettings.Ref.Description |; | @@ -563,8 +586,12 @@ Function GetQueryText() | DocRef, | PrintFormName"; - Return QueryTxt; + Query = New Query(); + Query.Text = QueryTxt; + Query.SetParameter("AllDocumentsTempTable", AllDocumentsTempTable); + QueryResult = Query.Execute(); + Return QueryResult.Select(QueryResultIteration.ByGroups, "DocRef"); EndFunction &AtServer @@ -611,17 +638,13 @@ Procedure FillDocumentsTables(QueryStructure, IsUpdate = False) Return; EndIf; - Query = New Query(); - Query.Text = GetQueryText(); - Query.SetParameter("AllDocumentsTempTable", QueryStructure.AllDocumentsTempTable); - - QueryResult = Query.Execute(); - SelectionDoc = QueryResult.Select(QueryResultIteration.ByGroups, "DocRef"); + SelectionDoc = GetAttachedDocuments(QueryStructure.AllDocumentsTempTable); While SelectionDoc.Next() Do If Not IsUpdate Then ParentRow = Object.Documents.Add(); ParentRow.ID = New UUID; + //@skip-check statement-type-change ParentRow.FileStorageVolume = QueryStructure.DocsNamesAndStorageStructure[SelectionDoc.DocMetaName]; Else SearchArray = Object.Documents.FindRows(New Structure("DocRef", SelectionDoc.DocRef)); @@ -697,6 +720,7 @@ Procedure UpdateAttachedFiles(DocRef) While SelectionDetailRecords.Next() Do NewRow = CurrentFilesTable.Add(); + //@skip-check property-return-type, statement-type-change NewRow.Comment = SelectionDetailRecords.Comment; EndDo; EndProcedure @@ -705,7 +729,7 @@ EndProcedure Function GetSelectedDocs() DocsArray = New Array; // Array of DocumentRef - For Each Row In Items.DocumentList.SelectedRows Do + For Each Row In Items.DocumentList.SelectedRows Do // Number DocsArray.Add(Object.Documents.FindByID(Row).DocRef); EndDo; Return DocsArray; @@ -776,6 +800,7 @@ Function GetDocTemplate(FileSettingPresention) SelectionDetailRecords = QueryResult.Select(); If SelectionDetailRecords.Next() Then + //@skip-check property-return-type, statement-type-change TemplateFile = SelectionDetailRecords.FileTemplate; EndIf; @@ -803,17 +828,39 @@ Procedure AttachOther(Command) Return; EndIf; - Structure = New Structure; - Structure.Insert("Company", CurrentDocStructure.Company); - Structure.Insert("Branch", CurrentDocStructure.Branch); - Structure.Insert("DocumentType", CurrentDocStructure.DocMetaName); - Structure.Insert("Document", CurrentDocStructure.Ref); + Structure = GetOtherAttachmentSettings(CurrentDocStructure); NotifyDescription = New NotifyDescription("AfterOtherAttachmentInput", ThisObject, Structure); ShowInputString(NotifyDescription, "", R().InfoMessage_037, , True); EndProcedure +// Get other attachment settings. +// +// Parameters: +// CurrentDocStructure - See GetCurrentDocInTable +// +// Returns: +// Structure - Get other attachment settings: +// * Company - CatalogRef.Companies - +// * Branch - CatalogRef.BusinessUnits - +// * DocumentType - String - +// * Document - DocumentRef - +&AtClient +Function GetOtherAttachmentSettings(CurrentDocStructure) + Structure = New Structure; + Structure.Insert("Company", CurrentDocStructure.Company); + Structure.Insert("Branch", CurrentDocStructure.Branch); + Structure.Insert("DocumentType", CurrentDocStructure.DocMetaName); + Structure.Insert("Document", CurrentDocStructure.Ref); + Return Structure +EndFunction + +// After other attachment input. +// +// Parameters: +// Result - String - Result +// AdditionalParameters - See GetOtherAttachmentSettings &AtClient Procedure AfterOtherAttachmentInput(Result, AdditionalParameters) Export @@ -869,55 +916,5 @@ Procedure CurrentFilesTableSelection(Item, SelectedRow, Field, StandardProcessin EndProcedure -&AtClient -Procedure CheckModeOnChange(Item) - - SetVisibleForCheckMode(CheckMode); - -EndProcedure - -&AtClient -Procedure SetVisibleForCheckMode(Val IsCheckMode) - - Items.DocumentsGroupLockUnlock.Visible = IsCheckMode; - Items.DocumentsAttachedFiles.Visible = Not IsCheckMode; - Items.GroupAttachButton.Visible = Not IsCheckMode; - Items.ShowSettings.Visible = IsCheckMode; - -EndProcedure - -&AtClient -Procedure OnOpen(Cancel) - SetVisibleForCheckMode(CheckMode); -EndProcedure - -&AtClient -Procedure CompanyOnChange(Item) - FillDocumentsToControl(); -EndProcedure - -&AtClient -Procedure BranchOnChange(Item) - FillDocumentsToControl(); -EndProcedure - -&AtClient -Procedure PeriodOnChange(Item) - FillDocumentsToControl(); -EndProcedure - -&AtClient -Procedure ShowOnlyUnlocked(Command) - - Items.DocumentsShowOnlyUnlocked.Check = Not Items.DocumentsShowOnlyUnlocked.Check; - - If Items.DocumentsShowOnlyUnlocked.Check Then - Items.DocumentList.RowFilter = New FixedStructure("IsAuditLock", -1); - Else - Items.DocumentList.RowFilter = Undefined; - EndIf; - -EndProcedure - #EndRegion diff --git a/IRP/src/DataProcessors/AttachedFilesToDocumentsControl/Forms/PictureViewer/Module.bsl b/IRP/src/DataProcessors/AttachedFilesToDocumentsControl/Forms/PictureViewer/Module.bsl index b6d52c131a..4039bd9162 100644 --- a/IRP/src/DataProcessors/AttachedFilesToDocumentsControl/Forms/PictureViewer/Module.bsl +++ b/IRP/src/DataProcessors/AttachedFilesToDocumentsControl/Forms/PictureViewer/Module.bsl @@ -28,19 +28,14 @@ EndFunction &AtClient Procedure ShowPDF() - PictureParameters = PictureViewerServer.CreatePictureParameters(FileRef); - - URI = PictureViewerClient.GetPictureURL(PictureParameters); - PDFViewer.Read(URI); + PictureViewerClient.SetPDFForView(FileRef, PDFViewer); EndProcedure &AtClient Procedure ShowPicture() If Not FileRef.IsEmpty() Then PictureParameters = CreatePictureParameters(FileRef); - - ThisObject.PictureViewHTML = ""; + ThisObject.PictureViewHTML = ""; Else Items.Picture.Visible = False; Items.DecorationNoTemplate.Visible = True; diff --git a/IRP/src/DataProcessors/EditDocumentsMovements/Forms/Form/Module.bsl b/IRP/src/DataProcessors/EditDocumentsMovements/Forms/Form/Module.bsl index af7bbb897e..ced9504eff 100644 --- a/IRP/src/DataProcessors/EditDocumentsMovements/Forms/Form/Module.bsl +++ b/IRP/src/DataProcessors/EditDocumentsMovements/Forms/Form/Module.bsl @@ -186,6 +186,15 @@ Procedure SetEnabledToRegisterPages(Val ManualMovementsEditValue) Items.Registers.ReadOnly = Not ManualMovementsEditValue; Items.GroupWriteMovemementsMenu.Enabled = ManualMovementsEditValue; + For Each MovementsPage In Items.Registers.ChildItems Do + If ManualMovementsEditValue Then + MovementsPage.Visible = True; + Else + //@skip-check dynamic-access-method-not-found + MovementsPage.Visible = ThisObject[MovementsPage.ChildItems[0].Name].Count() > 0; + EndIf; + EndDo; + EndProcedure &AtClient diff --git a/IRP/src/DefinedTypes/typeAccountingDocuments/typeAccountingDocuments.mdo b/IRP/src/DefinedTypes/typeAccountingDocuments/typeAccountingDocuments.mdo index 588902eaff..a02bb32d41 100644 --- a/IRP/src/DefinedTypes/typeAccountingDocuments/typeAccountingDocuments.mdo +++ b/IRP/src/DefinedTypes/typeAccountingDocuments/typeAccountingDocuments.mdo @@ -43,5 +43,6 @@ DocumentRef.PurchaseReturn DocumentRef.RetailReturnReceipt DocumentRef.SalesReturn + DocumentRef.TaxesOperation \ No newline at end of file diff --git a/IRP/src/DefinedTypes/typeAddPropertyOwners/typeAddPropertyOwners.mdo b/IRP/src/DefinedTypes/typeAddPropertyOwners/typeAddPropertyOwners.mdo index a328c0b054..2b523d4d6e 100644 --- a/IRP/src/DefinedTypes/typeAddPropertyOwners/typeAddPropertyOwners.mdo +++ b/IRP/src/DefinedTypes/typeAddPropertyOwners/typeAddPropertyOwners.mdo @@ -167,5 +167,6 @@ CatalogRef.SalaryCalculationType DocumentRef.ExpenseAccruals DocumentRef.RevenueAccruals + DocumentRef.TaxesOperation \ No newline at end of file diff --git a/IRP/src/DefinedTypes/typeReconciliationStatementDocuments/typeReconciliationStatementDocuments.mdo b/IRP/src/DefinedTypes/typeReconciliationStatementDocuments/typeReconciliationStatementDocuments.mdo index ef9215198d..22f1955fba 100644 --- a/IRP/src/DefinedTypes/typeReconciliationStatementDocuments/typeReconciliationStatementDocuments.mdo +++ b/IRP/src/DefinedTypes/typeReconciliationStatementDocuments/typeReconciliationStatementDocuments.mdo @@ -33,5 +33,6 @@ DocumentRef.SalesInvoice DocumentRef.DebitCreditNote DocumentRef.EmployeeCashAdvance + DocumentRef.TaxesOperation \ No newline at end of file diff --git a/IRP/src/Documents/CalculationDeservedVacations/CalculationDeservedVacations.mdo b/IRP/src/Documents/CalculationDeservedVacations/CalculationDeservedVacations.mdo new file mode 100644 index 0000000000..915389b424 --- /dev/null +++ b/IRP/src/Documents/CalculationDeservedVacations/CalculationDeservedVacations.mdo @@ -0,0 +1,199 @@ + + + + + + + + + + CalculationDeservedVacations + + en + Calculation deserved vacations + + + ru + Расчет заслуженных отпусков + + + tr + Calculation deserved vacations + + true + Document.CalculationDeservedVacations.StandardAttribute.Number + DontUse + DontUse + Managed + Use + + en + Calculation deserved vacations + + + ru + Расчет заслуженных отпусков + + + tr + Calculation deserved vacations + + + en + Calculation deserved vacations + + + ru + Расчет заслуженных отпусков + + + tr + Calculation deserved vacations + + 12 + Variable + true + true + Document.CalculationDeservedVacations.Form.DocumentForm + Document.CalculationDeservedVacations.Form.ListForm + Document.CalculationDeservedVacations.Form.ChoiceForm + Deny + AutoDelete + AccumulationRegister.R9541T_VacationUsage + true + true + + Company + + en + Company + + + ru + Организация + + + tr + Şirket + + + CatalogRef.Companies + + + + + Filter.OurCompany + + true + + + + Use + Use + + + BeginDate + + en + Begin date + + + ru + Дата начала больничного + + + tr + Başlangıç tarihi + + + Date + + Date + + + + + ShowError + + Use + Use + + + EndDate + + en + End date + + + ru + Дата окончания больничного + + + tr + Bitiş tarihi + + + Date + + Date + + + + + ShowError + + Use + Use + + + DocumentForm + + en + Document form + + + ru + Форма документа + + + tr + Evrak formu + + PersonalComputer + MobileDevice + + + ListForm + + en + List form + + + ru + Форма списка + + + tr + Liste formu + + PersonalComputer + MobileDevice + + + ChoiceForm + + en + Choice form + + + ru + Форма выбора + + + tr + Seçim formu + + PersonalComputer + MobileDevice + + \ No newline at end of file diff --git a/IRP/src/Documents/CalculationDeservedVacations/Forms/ChoiceForm/Attributes/List/ExtInfo/ListSettings.dcss b/IRP/src/Documents/CalculationDeservedVacations/Forms/ChoiceForm/Attributes/List/ExtInfo/ListSettings.dcss new file mode 100644 index 0000000000..c6dc1315c2 --- /dev/null +++ b/IRP/src/Documents/CalculationDeservedVacations/Forms/ChoiceForm/Attributes/List/ExtInfo/ListSettings.dcss @@ -0,0 +1,17 @@ + + + + Normal + dfcece9d-5077-440b-b6b3-45a5cb4538eb + + + Normal + 88619765-ccb3-46c6-ac52-38e9c992ebd4 + + + Normal + b75fecce-942b-4aed-abc9-e6a02e460fb3 + + Normal + 911b6018-f537-43e8-a417-da56b22f9aec + \ No newline at end of file diff --git a/IRP/src/Documents/CalculationDeservedVacations/Forms/ChoiceForm/Form.form b/IRP/src/Documents/CalculationDeservedVacations/Forms/ChoiceForm/Form.form new file mode 100644 index 0000000000..53bf269a94 --- /dev/null +++ b/IRP/src/Documents/CalculationDeservedVacations/Forms/ChoiceForm/Form.form @@ -0,0 +1,585 @@ + + + + ListSettingsComposerUserSettings + 1 + true + true + + true + + + <key>en</key> + <value>User settings group</value> + + + <key>ru</key> + <value>Группа пользовательских настроек</value> + + + <key>tr</key> + <value>Kullanıcı ayarlar grubu</value> + + false + + ListSettingsComposerUserSettingsExtendedTooltip + 2 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + Vertical + Auto + WeakSeparation + true + true + Auto + Auto + + + + List + 3 + true + true + + true + + + List + + true + None + + Number + 16 + true + true + + true + + + List.Number + + true + + NumberExtendedTooltip + 18 + true + true + + true + + Label + true + true + + Left + + + + NumberContextMenu + 17 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + Date + 19 + true + true + + true + + + List.Date + + + DateExtendedTooltip + 21 + true + true + + true + + Label + true + true + + Left + + + + DateContextMenu + 20 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + Company + 22 + true + true + + true + + + List.Company + + + CompanyExtendedTooltip + 24 + true + true + + true + + Label + true + true + + Left + + + + CompanyContextMenu + 23 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + BeginDate + 25 + true + true + + true + + + List.BeginDate + + + BeginDateExtendedTooltip + 27 + true + true + + true + + Label + true + true + + Left + + + + BeginDateContextMenu + 26 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + EndDate + 28 + true + true + + true + + + List.EndDate + + + EndDateExtendedTooltip + 30 + true + true + + true + + Label + true + true + + Left + + + + EndDateContextMenu + 29 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + Ref + 37 + true + true + + + List.Ref + + + RefExtendedTooltip + 39 + true + true + + true + + Label + true + true + + Left + + + + RefContextMenu + 38 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + None + + ListCommandBar + 5 + true + true + + true + + Left + + + true + true + + true + + ListSearchString + 7 + + ListSearchStringExtendedTooltip + 9 + true + true + + true + + Label + true + true + + Left + + + + ListSearchStringContextMenu + 8 + true + true + + true + + true + + ListSearchString + + true + + + + true + true + + true + + ListViewStatus + 10 + + ListViewStatusExtendedTooltip + 12 + true + true + + true + + Label + true + true + + Left + + + + ListViewStatusContextMenu + 11 + true + true + + true + + true + + ViewStatusAddition + ListViewStatus + + true + + + + true + true + + true + + ListSearchControl + 13 + + ListSearchControlExtendedTooltip + 15 + true + true + + true + + Label + true + true + + Left + + + + ListSearchControlContextMenu + 14 + true + true + + true + + true + + SearchControlAddition + ListSearchControl + + true + + + + ListExtendedTooltip + 6 + true + true + + true + + Label + true + true + + Left + + + + ListContextMenu + 4 + true + true + + true + + true + + true + true + true + true + true + true + MultiRow +
true
+ 1 + 1 + AutoUse + AutoUse + true + true + true + Auto + Auto + ExpandTopLevel + true + true + true + true + AsFileRef + + List.DefaultPicture + + + 60 + + 0001-01-01T00:00:00 + 0001-01-01T00:00:00 + + + true + true + ListSettingsComposerUserSettings + + + + FormCommandBar + -1 + true + true + + true + + Left + true + + + OnCreateAtServer + OnCreateAtServer + + LockOwnerWindow + true + true + Vertical + true + true + true + true + true + + List + 1 + + DynamicList + + + true + + + true + + + List.Ref + +
true
+ + Document.CalculationDeservedVacations + true + true + true + true + + + + + + + + \ No newline at end of file diff --git a/IRP/src/Documents/CalculationDeservedVacations/Forms/ChoiceForm/Module.bsl b/IRP/src/Documents/CalculationDeservedVacations/Forms/ChoiceForm/Module.bsl new file mode 100644 index 0000000000..88762c51fd --- /dev/null +++ b/IRP/src/Documents/CalculationDeservedVacations/Forms/ChoiceForm/Module.bsl @@ -0,0 +1,40 @@ + +#Region FormEvents + +&AtServer +Procedure OnCreateAtServer(Cancel, StandardProcessing) + DocumentsServer.OnCreateAtServerChoiceForm(ThisObject, Cancel, StandardProcessing); +EndProcedure + +#EndRegion + +#Region COMMANDS + +&AtClient +Procedure InternalCommandAction(Command) Export + InternalCommandsClient.RunCommandAction(Command, ThisObject, List, Items.List.SelectedRows); +EndProcedure + +&AtClient +Procedure InternalCommandActionWithServerContext(Command) Export + InternalCommandActionWithServerContextAtServer(Command.Name); +EndProcedure + +&AtServer +Procedure InternalCommandActionWithServerContextAtServer(CommandName) + InternalCommandsServer.RunCommandAction(CommandName, ThisObject, List, Items.List.SelectedRows); +EndProcedure + +&AtClient +Procedure GeneratedFormCommandActionByName(Command) Export + SelectedRows = Items.List.SelectedRows; + ExternalCommandsClient.GeneratedListChoiceFormCommandActionByName(SelectedRows, ThisObject, Command.Name); + GeneratedFormCommandActionByNameServer(Command.Name, SelectedRows); +EndProcedure + +&AtServer +Procedure GeneratedFormCommandActionByNameServer(CommandName, SelectedRows) Export + ExternalCommandsServer.GeneratedListChoiceFormCommandActionByName(SelectedRows, ThisObject, CommandName); +EndProcedure + +#EndRegion \ No newline at end of file diff --git a/IRP/src/Documents/CalculationDeservedVacations/Forms/DocumentForm/Form.form b/IRP/src/Documents/CalculationDeservedVacations/Forms/DocumentForm/Form.form new file mode 100644 index 0000000000..87e14e7bb0 --- /dev/null +++ b/IRP/src/Documents/CalculationDeservedVacations/Forms/DocumentForm/Form.form @@ -0,0 +1,310 @@ + + + + Number + 1 + true + true + + true + + + Object.Number + + + NumberExtendedTooltip + 3 + true + true + + true + + Label + true + true + + Left + + + + NumberContextMenu + 2 + true + true + + true + + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + Date + 4 + true + true + + true + + + Object.Date + + + DateExtendedTooltip + 6 + true + true + + true + + Label + true + true + + Left + + + + DateContextMenu + 5 + true + true + + true + + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + Company + 7 + true + true + + true + + + Object.Company + + + CompanyExtendedTooltip + 9 + true + true + + true + + Label + true + true + + Left + + + + CompanyContextMenu + 8 + true + true + + true + + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + en + For all companies + + + ru + Для всех организаций + + + tr + Tüm şirketler için + + + + + BeginDate + 10 + true + true + + true + + + Object.BeginDate + + + BeginDateExtendedTooltip + 12 + true + true + + true + + Label + true + true + + Left + + + + BeginDateContextMenu + 11 + true + true + + true + + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + EndDate + 13 + true + true + + true + + + Object.EndDate + + + EndDateExtendedTooltip + 15 + true + true + + true + + Label + true + true + + Left + + + + EndDateContextMenu + 14 + true + true + + true + + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + FormCommandBar + -1 + true + true + + true + + Left + true + + + OnCreateAtServer + OnCreateAtServer + + true + true + Vertical + true + true + true + true + true + + Object + 1 + + DocumentObject.CalculationDeservedVacations + + + true + + + true + +
true
+ true + + + + + + + true + + \ No newline at end of file diff --git a/IRP/src/Documents/CalculationDeservedVacations/Forms/DocumentForm/Module.bsl b/IRP/src/Documents/CalculationDeservedVacations/Forms/DocumentForm/Module.bsl new file mode 100644 index 0000000000..90ce865187 --- /dev/null +++ b/IRP/src/Documents/CalculationDeservedVacations/Forms/DocumentForm/Module.bsl @@ -0,0 +1,35 @@ + +&AtServer +Procedure OnCreateAtServer(Cancel, StandardProcessing) + DocumentsServer.OnCreateAtServer(Object, ThisObject, Cancel, StandardProcessing); +EndProcedure + +#Region COMMANDS + +&AtClient +Procedure InternalCommandAction(Command) Export + InternalCommandsClient.RunCommandAction(Command, ThisObject, Object, Object.Ref); +EndProcedure + +&AtClient +Procedure InternalCommandActionWithServerContext(Command) Export + InternalCommandActionWithServerContextAtServer(Command.Name); +EndProcedure + +&AtServer +Procedure InternalCommandActionWithServerContextAtServer(CommandName) + InternalCommandsServer.RunCommandAction(CommandName, ThisObject, Object, Object.Ref); +EndProcedure + +&AtClient +Procedure GeneratedFormCommandActionByName(Command) Export + ExternalCommandsClient.GeneratedFormCommandActionByName(Object, ThisObject, Command.Name); + GeneratedFormCommandActionByNameServer(Command.Name); +EndProcedure + +&AtServer +Procedure GeneratedFormCommandActionByNameServer(CommandName) Export + ExternalCommandsServer.GeneratedFormCommandActionByName(Object, ThisObject, CommandName); +EndProcedure + +#EndRegion \ No newline at end of file diff --git a/IRP/src/Documents/CalculationDeservedVacations/Forms/ListForm/Attributes/List/ExtInfo/ListSettings.dcss b/IRP/src/Documents/CalculationDeservedVacations/Forms/ListForm/Attributes/List/ExtInfo/ListSettings.dcss new file mode 100644 index 0000000000..c6dc1315c2 --- /dev/null +++ b/IRP/src/Documents/CalculationDeservedVacations/Forms/ListForm/Attributes/List/ExtInfo/ListSettings.dcss @@ -0,0 +1,17 @@ + + + + Normal + dfcece9d-5077-440b-b6b3-45a5cb4538eb + + + Normal + 88619765-ccb3-46c6-ac52-38e9c992ebd4 + + + Normal + b75fecce-942b-4aed-abc9-e6a02e460fb3 + + Normal + 911b6018-f537-43e8-a417-da56b22f9aec + \ No newline at end of file diff --git a/IRP/src/Documents/CalculationDeservedVacations/Forms/ListForm/Form.form b/IRP/src/Documents/CalculationDeservedVacations/Forms/ListForm/Form.form new file mode 100644 index 0000000000..a8dec98a11 --- /dev/null +++ b/IRP/src/Documents/CalculationDeservedVacations/Forms/ListForm/Form.form @@ -0,0 +1,582 @@ + + + + ListSettingsComposerUserSettings + 1 + true + true + + true + + + <key>en</key> + <value>User settings group</value> + + + <key>ru</key> + <value>Группа пользовательских настроек</value> + + + <key>tr</key> + <value>Kullanıcı ayarlar grubu</value> + + false + + ListSettingsComposerUserSettingsExtendedTooltip + 2 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + Vertical + WeakSeparation + true + true + Auto + Auto + + + + List + 3 + true + true + + true + + + List + + true + None + + Number + 16 + true + true + + true + + + List.Number + + true + + NumberExtendedTooltip + 18 + true + true + + true + + Label + true + true + + Left + + + + NumberContextMenu + 17 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + Date + 19 + true + true + + true + + + List.Date + + + DateExtendedTooltip + 21 + true + true + + true + + Label + true + true + + Left + + + + DateContextMenu + 20 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + Company + 22 + true + true + + true + + + List.Company + + + CompanyExtendedTooltip + 24 + true + true + + true + + Label + true + true + + Left + + + + CompanyContextMenu + 23 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + BeginDate + 25 + true + true + + true + + + List.BeginDate + + + BeginDateExtendedTooltip + 27 + true + true + + true + + Label + true + true + + Left + + + + BeginDateContextMenu + 26 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + EndDate + 28 + true + true + + true + + + List.EndDate + + + EndDateExtendedTooltip + 30 + true + true + + true + + Label + true + true + + Left + + + + EndDateContextMenu + 29 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + Ref + 37 + true + true + + + List.Ref + + + RefExtendedTooltip + 39 + true + true + + true + + Label + true + true + + Left + + + + RefContextMenu + 38 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + None + + ListCommandBar + 5 + true + true + + true + + Left + + + true + true + + true + + ListSearchString + 7 + + ListSearchStringExtendedTooltip + 9 + true + true + + true + + Label + true + true + + Left + + + + ListSearchStringContextMenu + 8 + true + true + + true + + true + + ListSearchString + + true + + + + true + true + + true + + ListViewStatus + 10 + + ListViewStatusExtendedTooltip + 12 + true + true + + true + + Label + true + true + + Left + + + + ListViewStatusContextMenu + 11 + true + true + + true + + true + + ViewStatusAddition + ListViewStatus + + true + + + + true + true + + true + + ListSearchControl + 13 + + ListSearchControlExtendedTooltip + 15 + true + true + + true + + Label + true + true + + Left + + + + ListSearchControlContextMenu + 14 + true + true + + true + + true + + SearchControlAddition + ListSearchControl + + true + + + + ListExtendedTooltip + 6 + true + true + + true + + Label + true + true + + Left + + + + ListContextMenu + 4 + true + true + + true + + true + + true + true + true + true + true + MultiRow +
true
+ 1 + 1 + AutoUse + AutoUse + true + true + true + Auto + Auto + ExpandTopLevel + true + true + true + true + AsFileRef + + List.DefaultPicture + + + 60 + + 0001-01-01T00:00:00 + 0001-01-01T00:00:00 + + + true + true + ListSettingsComposerUserSettings + + + + FormCommandBar + -1 + true + true + + true + + Left + true + + + OnCreateAtServer + OnCreateAtServer + + true + true + Vertical + true + true + true + true + true + + List + 1 + + DynamicList + + + true + + + true + + + List.Ref + +
true
+ + Document.CalculationDeservedVacations + true + true + true + true + + + + + + + + \ No newline at end of file diff --git a/IRP/src/Documents/CalculationDeservedVacations/Forms/ListForm/Module.bsl b/IRP/src/Documents/CalculationDeservedVacations/Forms/ListForm/Module.bsl new file mode 100644 index 0000000000..b4c9d7629b --- /dev/null +++ b/IRP/src/Documents/CalculationDeservedVacations/Forms/ListForm/Module.bsl @@ -0,0 +1,40 @@ + +#Region FormEvents + +&AtServer +Procedure OnCreateAtServer(Cancel, StandardProcessing) + DocumentsServer.OnCreateAtServerListForm(ThisObject, Cancel, StandardProcessing); +EndProcedure + +#EndRegion + +#Region COMMANDS + +&AtClient +Procedure InternalCommandAction(Command) Export + InternalCommandsClient.RunCommandAction(Command, ThisObject, List, Items.List.SelectedRows); +EndProcedure + +&AtClient +Procedure InternalCommandActionWithServerContext(Command) Export + InternalCommandActionWithServerContextAtServer(Command.Name); +EndProcedure + +&AtServer +Procedure InternalCommandActionWithServerContextAtServer(CommandName) + InternalCommandsServer.RunCommandAction(CommandName, ThisObject, List, Items.List.SelectedRows); +EndProcedure + +&AtClient +Procedure GeneratedFormCommandActionByName(Command) Export + SelectedRows = Items.List.SelectedRows; + ExternalCommandsClient.GeneratedListChoiceFormCommandActionByName(SelectedRows, ThisObject, Command.Name); + GeneratedFormCommandActionByNameServer(Command.Name, SelectedRows); +EndProcedure + +&AtServer +Procedure GeneratedFormCommandActionByNameServer(CommandName, SelectedRows) Export + ExternalCommandsServer.GeneratedListChoiceFormCommandActionByName(SelectedRows, ThisObject, CommandName); +EndProcedure + +#EndRegion \ No newline at end of file diff --git a/IRP/src/Documents/CalculationDeservedVacations/ManagerModule.bsl b/IRP/src/Documents/CalculationDeservedVacations/ManagerModule.bsl new file mode 100644 index 0000000000..cc4b00b880 --- /dev/null +++ b/IRP/src/Documents/CalculationDeservedVacations/ManagerModule.bsl @@ -0,0 +1,233 @@ +#Region PrintForm + +Function GetPrintForm(Ref, PrintFormName, AddInfo = Undefined) Export + Return Undefined; +EndFunction + +#EndRegion + +#Region Posting + +Function PostingGetDocumentDataTables(Ref, Cancel, PostingMode, Parameters, AddInfo = Undefined) Export + Tables = New Structure; + QueryArray = GetQueryTextsSecondaryTables(); + Parameters.Insert("QueryParameters", GetAdditionalQueryParameters(Ref)); + PostingServer.ExecuteQuery(Ref, QueryArray, Parameters); + Return Tables; +EndFunction + +Function PostingGetLockDataSource(Ref, Cancel, PostingMode, Parameters, AddInfo = Undefined) Export + DataMapWithLockFields = New Map; + Return DataMapWithLockFields; +EndFunction + +Procedure PostingCheckBeforeWrite(Ref, Cancel, PostingMode, Parameters, AddInfo = Undefined) Export + Tables = Parameters.DocumentDataTables; + QueryArray = GetQueryTextsMasterTables(); + PostingServer.SetRegisters(Tables, Ref); + + PostingServer.FillPostingTables(Tables, Ref, QueryArray, Parameters); +EndProcedure + +Function PostingGetPostingDataTables(Ref, Cancel, PostingMode, Parameters, AddInfo = Undefined) Export + PostingDataTables = New Map; + PostingServer.SetPostingDataTables(PostingDataTables, Parameters); + Return PostingDataTables; +EndFunction + +Procedure PostingCheckAfterWrite(Ref, Cancel, PostingMode, Parameters, AddInfo = Undefined) Export + CheckAfterWrite(Ref, Cancel, Parameters, AddInfo); +EndProcedure + +#EndRegion + +#Region Undoposting + +Function UndopostingGetDocumentDataTables(Ref, Cancel, Parameters, AddInfo = Undefined) Export + Return PostingGetDocumentDataTables(Ref, Cancel, Undefined, Parameters, AddInfo); +EndFunction + +Function UndopostingGetLockDataSource(Ref, Cancel, Parameters, AddInfo = Undefined) Export + DataMapWithLockFields = New Map; + Return DataMapWithLockFields; +EndFunction + +Procedure UndopostingCheckBeforeWrite(Ref, Cancel, Parameters, AddInfo = Undefined) Export + QueryArray = GetQueryTextsMasterTables(); + PostingServer.ExecuteQuery(Ref, QueryArray, Parameters); +EndProcedure + +Procedure UndopostingCheckAfterWrite(Ref, Cancel, Parameters, AddInfo = Undefined) Export + Parameters.Insert("Unposting", True); + CheckAfterWrite(Ref, Cancel, Parameters, AddInfo); +EndProcedure + +#EndRegion + +#Region CheckAfterWrite + +Procedure CheckAfterWrite(Ref, Cancel, Parameters, AddInfo = Undefined) + Return; +EndProcedure + +#EndRegion + +#Region Posting_Info + +Function GetInformationAboutMovements(Ref) Export + Str = New Structure; + Str.Insert("QueryParameters", GetAdditionalQueryParameters(Ref)); + Str.Insert("QueryTextsMasterTables", GetQueryTextsMasterTables()); + Str.Insert("QueryTextsSecondaryTables", GetQueryTextsSecondaryTables()); + Return Str; +EndFunction + +Function GetAdditionalQueryParameters(Ref) + RefData = CommonFunctionsServer.GetAttributesFromRef(Ref, "Company, EndDate"); + + StrParams = New Structure; + StrParams.Insert("Ref", Ref); + StrParams.Insert("Company", RefData.Company); + StrParams.Insert("Period", EndOfDay(RefData.EndDate)); + StrParams.Insert("BeforEnd", New Boundary(EndOfDay(RefData.EndDate), BoundaryType.Excluding)); + Return StrParams; +EndFunction + +Function GetQueryTextsSecondaryTables() + QueryArray = New Array; + Return QueryArray; +EndFunction + +Function GetQueryTextsMasterTables() + QueryArray = New Array; + QueryArray.Add(R9541T_VacationUsage()); + Return QueryArray; +EndFunction + +#EndRegion + +#Region Posting_SourceTable + +#EndRegion + +#Region Posting_MainTables + +Function R9541T_VacationUsage() + + Return + "SELECT + | T9510S_StaffingSliceLast.Company, + | T9510S_StaffingSliceLast.Employee + |INTO tmpStaff + |FROM + | InformationRegister.T9510S_Staffing.SliceLast(&Period, Company = &Company) AS T9510S_StaffingSliceLast + |WHERE + | NOT T9510S_StaffingSliceLast.Fired + |; + | + |//////////////////////////////////////////////////////////////////////////////// + |SELECT + | tmpStaff.Company, + | tmpStaff.Employee, + | CASE + | WHEN NOT EmployeeCompanyLimits.DayLimit IS NULL + | THEN EmployeeCompanyLimits.DayLimit + | WHEN NOT EmployeeLimits.DayLimit IS NULL + | THEN EmployeeLimits.DayLimit + | WHEN NOT CompanyLimits.DayLimit IS NULL + | THEN CompanyLimits.DayLimit + | WHEN NOT AllLimits.DayLimit IS NULL + | THEN AllLimits.DayLimit + | ELSE 0 + | END AS DayLimit + |INTO tmpDayLimits + |FROM + | tmpStaff AS tmpStaff + | LEFT JOIN InformationRegister.T9545S_VacationDaysLimits.SliceLast(&BeforEnd,) AS AllLimits + | ON AllLimits.Company = VALUE(Catalog.Companies.EmptyRef) + | AND AllLimits.Employee = VALUE(Catalog.Partners.EmptyRef) + | LEFT JOIN InformationRegister.T9545S_VacationDaysLimits.SliceLast(&BeforEnd,) AS CompanyLimits + | ON tmpStaff.Company = CompanyLimits.Company + | AND CompanyLimits.Employee = VALUE(Catalog.Partners.EmptyRef) + | LEFT JOIN InformationRegister.T9545S_VacationDaysLimits.SliceLast(&BeforEnd,) AS EmployeeLimits + | ON tmpStaff.Employee = EmployeeLimits.Employee + | AND EmployeeLimits.Company = VALUE(Catalog.Companies.EmptyRef) + | LEFT JOIN InformationRegister.T9545S_VacationDaysLimits.SliceLast(&BeforEnd,) AS EmployeeCompanyLimits + | ON tmpStaff.Company = EmployeeCompanyLimits.Company + | AND tmpStaff.Employee = EmployeeCompanyLimits.Employee + |WHERE + | CASE + | WHEN NOT EmployeeCompanyLimits.DayLimit IS NULL + | THEN EmployeeCompanyLimits.DayLimit + | WHEN NOT EmployeeLimits.DayLimit IS NULL + | THEN EmployeeLimits.DayLimit + | WHEN NOT CompanyLimits.DayLimit IS NULL + | THEN CompanyLimits.DayLimit + | WHEN NOT AllLimits.DayLimit IS NULL + | THEN AllLimits.DayLimit + | ELSE 0 + | END > 0 + |; + | + |//////////////////////////////////////////////////////////////////////////////// + |SELECT + | tmpDayLimits.Company, + | tmpDayLimits.Employee, + | tmpDayLimits.DayLimit, + | INT((DATEDIFF(BEGINOFPERIOD(&Period, Year), &Period, DAY) + 1) / (DATEDIFF(BEGINOFPERIOD(&Period, Year), + | ENDOFPERIOD(&Period, Year), DAY) + 1) * tmpDayLimits.DayLimit) - ISNULL(R9541T_VacationUsageTurnovers.DaysReceipt, + | 0) AS Days + |INTO tmpDeservedDays + |FROM + | tmpDayLimits AS tmpDayLimits + | LEFT JOIN AccumulationRegister.R9541T_VacationUsage.Turnovers(BEGINOFPERIOD(&Period, Year), &BeforEnd,,) AS + | R9541T_VacationUsageTurnovers + | ON tmpDayLimits.Company = R9541T_VacationUsageTurnovers.Company + | AND tmpDayLimits.Employee = R9541T_VacationUsageTurnovers.Employee + |; + | + |//////////////////////////////////////////////////////////////////////////////// + |SELECT + | VALUE(AccumulationRecordType.Receipt) AS RecordType, + | &Period AS Period, + | tmpDeservedDays.Company, + | tmpDeservedDays.Employee, + | tmpDeservedDays.Days + |INTO R9541T_VacationUsage + |FROM + | tmpDeservedDays AS tmpDeservedDays + |WHERE + | tmpDeservedDays.Days > 0 + |; + | + |//////////////////////////////////////////////////////////////////////////////// + |DROP tmpStaff + |; + | + |//////////////////////////////////////////////////////////////////////////////// + |DROP tmpDayLimits + |; + | + |//////////////////////////////////////////////////////////////////////////////// + |DROP tmpDeservedDays"; + +EndFunction + +#EndRegion + +#Region AccessObject + +// Get access key. +// +// Parameters: +// Obj - DocumentObjectDocumentName - +// +// Returns: +// Map +Function GetAccessKey(Obj) Export + AccessKeyMap = New Map; + AccessKeyMap.Insert("Company", Obj.Company); + Return AccessKeyMap; +EndFunction + +#EndRegion \ No newline at end of file diff --git a/IRP/src/Documents/CalculationDeservedVacations/ObjectModule.bsl b/IRP/src/Documents/CalculationDeservedVacations/ObjectModule.bsl new file mode 100644 index 0000000000..5d7935f288 --- /dev/null +++ b/IRP/src/Documents/CalculationDeservedVacations/ObjectModule.bsl @@ -0,0 +1,9 @@ +// @strict-types + +Procedure Posting(Cancel, PostingMode) + PostingServer.Post(ThisObject, Cancel, PostingMode, ThisObject.AdditionalProperties); +EndProcedure + +Procedure UndoPosting(Cancel) + UndopostingServer.Undopost(ThisObject, Cancel, ThisObject.AdditionalProperties); +EndProcedure diff --git a/IRP/src/Documents/CreditNote/CreditNote.mdo b/IRP/src/Documents/CreditNote/CreditNote.mdo index 3881a1c201..6c779ded84 100644 --- a/IRP/src/Documents/CreditNote/CreditNote.mdo +++ b/IRP/src/Documents/CreditNote/CreditNote.mdo @@ -39,6 +39,22 @@ InformationRegister.AddProperties.Dimension.Key InformationRegister.AddProperties.Dimension.Key + + Catalog.AddAttributeAndPropertySets.TabularSection.Attributes + Catalog.AddAttributeAndPropertySets.TabularSection.Attributes.Attribute.Attribute + Catalog.AddAttributeAndPropertySets.TabularSection.Attributes.StandardAttribute.Ref + + Catalog.AddAttributeAndPropertySets.Document_CreditNote + + -1 + Catalog.AddAttributeAndPropertySets.TabularSection.Attributes.Attribute.Collection + Document.CreditNote.TabularSection.AddAttributes + Document.CreditNote.TabularSection.AddAttributes.StandardAttribute.Ref + Document.CreditNote.TabularSection.AddAttributes.Attribute.Property + Document.CreditNote.TabularSection.AddAttributes.Attribute.Value + Document.CreditNote.TabularSection.AddAttributes.StandardAttribute.LineNumber + Document.CreditNote.TabularSection.AddAttributes.StandardAttribute.LineNumber + Catalog.CurrencyMovementSets.TabularSection.CurrencyMovements Catalog.CurrencyMovementSets.TabularSection.CurrencyMovements.Attribute.CurrencyMovementType @@ -104,6 +120,7 @@ AccumulationRegister.T1040T_AccountingAmounts AccumulationRegister.R5015B_OtherPartnersTransactions AccumulationRegister.R5020B_PartnersBalance + AccumulationRegister.R1040B_TaxesOutgoing true true DontUse @@ -503,6 +520,71 @@ Use Use + + VatRate + + en + VAT + + + ru + НДС + + + tr + KDV + + + CatalogRef.TaxRates + + + + Use + Use + + + NetAmount + + en + Net amount + + + ru + Сумма без налогов + + + tr + Net tutar + + + DefinedType.typeAmount + + + + ShowError + Use + + + TaxAmount + + en + Tax amount + + + ru + Сумма налогов + + + tr + Vergi tutarı + + + DefinedType.typeAmount + + + + Use + diff --git a/IRP/src/Documents/CreditNote/Forms/DocumentForm/Form.form b/IRP/src/Documents/CreditNote/Forms/DocumentForm/Form.form index d9245f3114..b096e23135 100644 --- a/IRP/src/Documents/CreditNote/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/CreditNote/Forms/DocumentForm/Form.form @@ -987,6 +987,169 @@ true + + TransactionsVatRate + 356 + true + true + + true + + + Object.Transactions.VatRate + + + OnChange + TransactionsVatRateOnChange + + + TransactionsVatRateExtendedTooltip + 358 + true + true + + true + + Label + true + true + + Left + + + + TransactionsVatRateContextMenu + 357 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + true + + + + TransactionsTaxAmount + 362 + true + true + + true + + + Object.Transactions.TaxAmount + + + OnChange + TransactionsTaxAmountOnChange + + + TransactionsTaxAmountExtendedTooltip + 364 + true + true + + true + + Label + true + true + + Left + + + + TransactionsTaxAmountContextMenu + 363 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + TransactionsNetAmount + 359 + true + true + + true + + + Object.Transactions.NetAmount + + + OnChange + TransactionsNetAmountOnChange + + + TransactionsNetAmountExtendedTooltip + 361 + true + true + + true + + Label + true + true + + Left + + + + TransactionsNetAmountContextMenu + 360 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + TransactionsAmount 91 @@ -998,6 +1161,10 @@ Object.Transactions.Amount + + OnChange + TransactionsAmountOnChange + TransactionsAmountExtendedTooltip 93 diff --git a/IRP/src/Documents/CreditNote/Forms/DocumentForm/Module.bsl b/IRP/src/Documents/CreditNote/Forms/DocumentForm/Module.bsl index df4423a988..0696dbd1e3 100644 --- a/IRP/src/Documents/CreditNote/Forms/DocumentForm/Module.bsl +++ b/IRP/src/Documents/CreditNote/Forms/DocumentForm/Module.bsl @@ -180,6 +180,26 @@ EndProcedure #EndRegion +&AtClient +Procedure TransactionsVatRateOnChange(Item) + DocCreditDebitNoteClient.TransactionsVatRateOnChange(Object, ThisObject, Item); +EndProcedure + +&AtClient +Procedure TransactionsNetAmountOnChange(Item) + DocCreditDebitNoteClient.TransactionsNetAmountOnChange(Object, ThisObject, Item); +EndProcedure + +&AtClient +Procedure TransactionsTaxAmountOnChange(Item) + DocCreditDebitNoteClient.TransactionsTaxAmountOnChange(Object, ThisObject, Item); +EndProcedure + +&AtClient +Procedure TransactionsAmountOnChange(Item) + DocCreditDebitNoteClient.TransactionsAmountOnChange(Object, ThisObject, Item); +EndProcedure + #EndRegion #EndRegion diff --git a/IRP/src/Documents/CreditNote/ManagerModule.bsl b/IRP/src/Documents/CreditNote/ManagerModule.bsl index 4a03f46e59..c25dfbde3b 100644 --- a/IRP/src/Documents/CreditNote/ManagerModule.bsl +++ b/IRP/src/Documents/CreditNote/ManagerModule.bsl @@ -11,6 +11,7 @@ EndFunction Function PostingGetDocumentDataTables(Ref, Cancel, PostingMode, Parameters, AddInfo = Undefined) Export Tables = New Structure; QueryArray = GetQueryTextsSecondaryTables(); + Parameters.Insert("QueryParameters", GetAdditionalQueryParameters(Ref)); PostingServer.ExecuteQuery(Ref, QueryArray, Parameters); AccountingServer.CreateAccountingDataTables(Ref, Cancel, PostingMode, Parameters, AddInfo); @@ -36,6 +37,7 @@ Procedure PostingCheckBeforeWrite(Ref, Cancel, PostingMode, Parameters, AddInfo Tables.R5015B_OtherPartnersTransactions.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); Tables.T1040T_AccountingAmounts.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); Tables.R5020B_PartnersBalance.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); + Tables.R1040B_TaxesOutgoing.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); PostingServer.FillPostingTables(Tables, Ref, QueryArray, Parameters); EndProcedure @@ -85,6 +87,7 @@ EndFunction Function GetAdditionalQueryParameters(Ref) StrParams = New Structure; StrParams.Insert("Ref", Ref); + StrParams.Insert("Vat", TaxesServer.GetVatRef()); Return StrParams; EndFunction @@ -109,6 +112,7 @@ Function GetQueryTextsMasterTables() QueryArray.Add(T2015S_TransactionsInfo()); QueryArray.Add(T1040T_AccountingAmounts()); QueryArray.Add(R5020B_PartnersBalance()); + QueryArray.Add(R1040B_TaxesOutgoing()); Return QueryArray; EndFunction @@ -146,6 +150,9 @@ Function Transactions() | Transactions.Currency, | Transactions.Key, | Transactions.Amount, + | Transactions.NetAmount, + | Transactions.TaxAmount, + | Transactions.VatRate, | Transactions.Ref.Branch AS Branch, | Transactions.LegalNameContract AS LegalNameContract, | Transactions.ProfitLossCenter, @@ -176,6 +183,7 @@ Function R5022T_Expenses() Return "SELECT | VALUE(AccumulationRecordType.Expense) AS RecordType, | Transactions.Amount AS AmountWithTaxes, + | Transactions.NetAmount AS Amount, | * |INTO R5022T_Expenses |FROM @@ -262,6 +270,46 @@ Function R5020B_PartnersBalance() Return AccumulationRegisters.R5020B_PartnersBalance.R5020B_PartnersBalance_CreditNote(); EndFunction +Function R1040B_TaxesOutgoing() + Return + "SELECT + | VALUE(AccumulationRecordType.Receipt) AS RecordType, + | Transactions.Period, + | Transactions.Key, + | Transactions.Company, + | Transactions.Branch, + | Transactions.Currency, + | &Vat AS Tax, + | Transactions.VatRate AS TaxRate, + | VALUE(Enum.InvoiceType.Invoice) AS InvoiceType, + | Transactions.TaxAmount AS Amount + |INTO R1040B_TaxesOutgoing + |FROM + | Transactions AS Transactions + |WHERE + | Transactions.IsVendor + | AND Transactions.TaxAmount <> 0 + | + |UNION ALL + | + |SELECT + | VALUE(AccumulationRecordType.Receipt) AS RecordType, + | Transactions.Period, + | Transactions.Key, + | Transactions.Company, + | Transactions.Branch, + | Transactions.Currency, + | &Vat AS Tax, + | Transactions.VatRate AS TaxRate, + | VALUE(Enum.InvoiceType.Return) AS InvoiceType, + | Transactions.TaxAmount AS Amount + |FROM + | Transactions AS Transactions + |WHERE + | Transactions.IsCustomer + | AND Transactions.TaxAmount <> 0"; +EndFunction + #EndRegion #Region AccessObject @@ -291,7 +339,7 @@ Function T1040T_AccountingAmounts() | Transactions.Key AS RowKey, | Transactions.Key AS Key, | Transactions.Currency, - | Transactions.Amount, + | Transactions.NetAmount AS Amount, | VALUE(Catalog.AccountingOperations.CreditNote_DR_R5022T_Expenses_CR_R2021B_CustomersTransactions) AS Operation, | UNDEFINED AS AdvancesClosing |INTO T1040T_AccountingAmounts @@ -303,6 +351,22 @@ Function T1040T_AccountingAmounts() |UNION ALL | |SELECT + | Transactions.Period, + | Transactions.Key AS RowKey, + | Transactions.Key AS Key, + | Transactions.Currency, + | Transactions.TaxAmount AS Amount, + | VALUE(Catalog.AccountingOperations.CreditNote_DR_R1040B_TaxesOutgoing_CR_R2021B_CustomersTransactions) AS Operation, + | UNDEFINED AS AdvancesClosing + |FROM + | Transactions AS Transactions + |WHERE + | Transactions.IsCustomer + | AND Transactions.TaxAmount <> 0 + | + |UNION ALL + | + |SELECT | OffsetOfAdvances.Period, | OffsetOfAdvances.Key, | OffsetOfAdvances.Key, @@ -323,7 +387,7 @@ Function T1040T_AccountingAmounts() | Transactions.Key, | Transactions.Key, | Transactions.Currency, - | Transactions.Amount AS Amount, + | Transactions.NetAmount AS Amount, | VALUE(Catalog.AccountingOperations.CreditNote_DR_R5022T_Expenses_CR_R1021B_VendorsTransactions), | UNDEFINED |FROM @@ -334,6 +398,22 @@ Function T1040T_AccountingAmounts() |UNION ALL | |SELECT + | Transactions.Period, + | Transactions.Key, + | Transactions.Key, + | Transactions.Currency, + | Transactions.TaxAmount AS Amount, + | VALUE(Catalog.AccountingOperations.CreditNote_DR_R1040B_TaxesOutgoing_CR_R1021B_VendorsTransactions), + | UNDEFINED + |FROM + | Transactions AS Transactions + |WHERE + | Transactions.IsVendor + | AND Transactions.TaxAmount <> 0 + | + |UNION ALL + | + |SELECT | OffsetOfAdvances.Period, | OffsetOfAdvances.Key, | OffsetOfAdvances.Key, @@ -376,6 +456,10 @@ Function GetAccountingAnalytics(Parameters) Export Return GetAnalytics_ExpensesVendorTransaction(Parameters); // Expenses - Vendor transactions ElsIf Parameters.Operation = AO.CreditNote_DR_R5022T_Expenses_CR_R5015B_OtherPartnersTransactions Then Return GetAnalytics_ExpensesOtherPartner(Parameters); // Expenses - Other partner + ElsIf Parameters.Operation = AO.CreditNote_DR_R1040B_TaxesOutgoing_CR_R2021B_CustomersTransactions Then + Return GetAnalytics_TaxesOutgoingCustomerTransaction(Parameters); // Taxes outgoing - Customer transacrions + ElsIf Parameters.Operation = AO.CreditNote_DR_R1040B_TaxesOutgoing_CR_R1021B_VendorsTransactions Then + Return GetAnalytics_TaxesOutgoingVendorTransaction(Parameters); // Taxes outgoing - Vendor transactions EndIf; Return Undefined; EndFunction @@ -405,6 +489,31 @@ Function GetAnalytics_ExpensesCustomerTransaction(Parameters) Return AccountingAnalytics; EndFunction +// Taxes outgoing - Customer transaction +Function GetAnalytics_TaxesOutgoingCustomerTransaction(Parameters) + AccountingAnalytics = AccountingServer.GetAccountingAnalyticsResult(Parameters); + AccountParameters = AccountingServer.GetAccountParameters(Parameters); + + // Debit + Debit = AccountingServer.GetT9013S_AccountsTax(AccountParameters, Parameters.RowData.TaxInfo); + If Parameters.RowData.Agreement.Type = Enums.AgreementTypes.Customer Then + AccountingAnalytics.Debit = Debit.OutgoingAccountReturn; + Else + AccountingAnalytics.Debit = Debit.OutgoingAccount; + EndIf; + AccountingServer.SetDebitExtDimensions(Parameters, AccountingAnalytics, Parameters.RowData.TaxInfo); + + // Credit + Credit = AccountingServer.GetT9012S_AccountsPartner(AccountParameters, + Parameters.RowData.Partner, + Parameters.RowData.Agreement, + Parameters.RowData.Currency); + AccountingAnalytics.Credit = Credit.AccountTransactionsCustomer; + AccountingServer.SetCreditExtDimensions(Parameters, AccountingAnalytics); + + Return AccountingAnalytics; +EndFunction + // Advances from customers - Customers transactions Function GetAnalytics_OffsetOfAdvancesCustomer(Parameters) AccountingAnalytics = AccountingServer.GetAccountingAnalyticsResult(Parameters); @@ -449,6 +558,31 @@ Function GetAnalytics_ExpensesVendorTransaction(Parameters) Return AccountingAnalytics; EndFunction +// Taxes outgoing - Vendor transactions +Function GetAnalytics_TaxesOutgoingVendorTransaction(Parameters) + AccountingAnalytics = AccountingServer.GetAccountingAnalyticsResult(Parameters); + AccountParameters = AccountingServer.GetAccountParameters(Parameters); + + // Debit + Debit = AccountingServer.GetT9013S_AccountsTax(AccountParameters, Parameters.RowData.TaxInfo); + If Parameters.RowData.Agreement.Type = Enums.AgreementTypes.Vendor Then + AccountingAnalytics.Debit = Debit.OutgoingAccount; + Else + AccountingAnalytics.Debit = Debit.OutgoingAccountReturn; + EndIf; + AccountingServer.SetDebitExtDimensions(Parameters, AccountingAnalytics, Parameters.RowData.TaxInfo); + + // Credit + Credit = AccountingServer.GetT9012S_AccountsPartner(AccountParameters, + Parameters.RowData.Partner, + Parameters.RowData.Agreement, + Parameters.RowData.Currency); + AccountingAnalytics.Credit = Credit.AccountTransactionsVendor; + AccountingServer.SetCreditExtDimensions(Parameters, AccountingAnalytics); + + Return AccountingAnalytics; +EndFunction + // Vendors transactions - Advances to vendors Function GetAnalytics_OffsetOfAdvancesVendor(Parameters) AccountingAnalytics = AccountingServer.GetAccountingAnalyticsResult(Parameters); diff --git a/IRP/src/Documents/DebitCreditNote/DebitCreditNote.mdo b/IRP/src/Documents/DebitCreditNote/DebitCreditNote.mdo index 9dd92c2d87..9f1fc68d76 100644 --- a/IRP/src/Documents/DebitCreditNote/DebitCreditNote.mdo +++ b/IRP/src/Documents/DebitCreditNote/DebitCreditNote.mdo @@ -95,6 +95,8 @@ AccumulationRegister.R5020B_PartnersBalance AccumulationRegister.R5010B_ReconciliationStatement AccumulationRegister.T1040T_AccountingAmounts + AccumulationRegister.R5022T_Expenses + AccumulationRegister.R5021T_Revenues true true DontUse @@ -211,6 +213,7 @@ + ShowError Use Use @@ -405,6 +408,7 @@ + ShowError Use Use @@ -558,18 +562,18 @@ Use - Amount + DELETE_Amount en - Amount + DELETE amount ru - Сумма + УДАЛИТЬ сумму tr - Tutar + DELETE amount DefinedType.typeAmount @@ -580,6 +584,277 @@ Use Use + + SendUUID + + en + Send UUID + + + ru + UUID отправки + + + tr + Giden UUID + + + DefinedType.typeRowID + + + + + Use + Use + + + ReceiveUUID + + en + Receive UUID + + + ru + UUID получения + + + tr + Gelen UUID + + + DefinedType.typeRowID + + + + + Use + Use + + + SendAmount + + en + Amount (send) + + + ru + Сумма (отправка) + + + tr + Amount (send) + + + DefinedType.typeAmount + + + + ShowError + + Use + Use + + + ReceiveAmount + + en + Amount (receive) + + + ru + Сумма (получение) + + + tr + Amount (receive) + + + DefinedType.typeAmount + + + + ShowError + + Use + Use + + + SendCurrency + + en + Currency (send) + + + ru + Валюта (отправка) + + + tr + Currency (send) + + + CatalogRef.Currencies + + + + ShowError + true + + Use + Use + + + ReceiveCurrency + + en + Currency (receive) + + + ru + Валюта (получение) + + + tr + Currency (receive) + + + CatalogRef.Currencies + + + + ShowError + true + + Use + Use + + + ExpenseType + + en + Expense type + + + ru + Статья затрат + + + tr + Gider tipi + + + CatalogRef.ExpenseAndRevenueTypes + + + + + Filter.IsExpense + + true + + + + Use + Use + + + LossCenter + + en + Loss center + + + ru + Центр убытков + + + tr + Zarar merkezi + + + CatalogRef.BusinessUnits + + + + + Use + Use + + + RevenueType + + en + Revenue type + + + ru + Статья доходов + + + tr + Gelir tipi + + + CatalogRef.ExpenseAndRevenueTypes + + + + + Filter.IsRevenue + + true + + + + Use + Use + + + ProfitCenter + + en + Profit center + + + ru + Центр прибыли + + + tr + Kâr merkezi + + + CatalogRef.BusinessUnits + + + + + Use + Use + + + TransitUUID + + en + Transit UUID + + + ru + UUID транзита + + + tr + Geçiş UUID + + + DefinedType.typeRowID + + + + + Use + Use + DocumentForm diff --git a/IRP/src/Documents/DebitCreditNote/Forms/DocumentForm/Form.form b/IRP/src/Documents/DebitCreditNote/Forms/DocumentForm/Form.form index 527c359bd5..ff65fd312a 100644 --- a/IRP/src/Documents/DebitCreditNote/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/DebitCreditNote/Forms/DocumentForm/Form.form @@ -567,111 +567,161 @@ GroupDebitCreditNote 42 - GroupCommandBar - 568 - - EditCurrencies - 564 - true - true - - true - - - EditCurrenciesExtendedTooltip - 565 + GroupInfoTitle + 31 + + GroupInfoTitleLeft + 33 + + GroupCommandBarLeft + 593 + + EditCurrenciesSender + 591 + true + true + + true + + + EditCurrenciesSenderExtendedTooltip + 592 + true + true + + true + + Label + true + true + + Left + + + Form.Command.EditCurrenciesSender + Auto + true + true + UserCmds + Auto + + + EditAccounting + 566 + true + true + + true + + + EditAccountingExtendedTooltip + 567 + true + true + + true + + Label + true + true + + Left + + + Form.Command.EditAccounting + Auto + true + true + UserCmds + Auto + true true true - Label - true - true - + + <key>en</key> + <value>Command bar left</value> + + + <key>ru</key> + <value>Панель команд лево</value> + + + <key>tr</key> + <value>Command bar left</value> + + + GroupCommandBarLeftExtendedTooltip + 594 + true + true + + true + + Label + true + true + + Left + + + CommandBar + Left - - Form.Command.EditCurrencies - Auto - true - true - UserCmds - Auto - - - EditAccounting - 566 - true - true - - true - - - EditAccountingExtendedTooltip - 567 - true + + + SendUUID + 570 true true - Label - true - true - - Left + + Object.SendUUID + + + SendUUIDExtendedTooltip + 572 + true + true + + true + + Label + true + true + + Left + + + + SendUUIDContextMenu + 571 + true + true + + true + + true + + InputField + true + Enter + true + Left + true + + true + true + true + true + true + true - - Form.Command.EditAccounting - Auto - true - true - UserCmds - Auto - - true - true - - true - - - <key>en</key> - <value>Command bar</value> - - - <key>ru</key> - <value>Командная панель</value> - - - <key>tr</key> - <value>Komut çubuğu</value> - - - GroupCommandBarExtendedTooltip - 569 - true - true - - true - - Label - true - true - - Left - - - CommandBar - - Left - - - - GroupInfoTitle - 31 - - GroupInfoTitleLeft - 33 + SendDebtType 541 @@ -850,6 +900,60 @@ true + + SendCurrency + 573 + true + true + + true + + + Object.SendCurrency + + + OnChange + SendCurrencyOnChange + + + SendCurrencyExtendedTooltip + 575 + true + true + + true + + Label + true + true + + Left + + + + SendCurrencyContextMenu + 574 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + SendLegalName 398 @@ -1175,19 +1279,23 @@ - Amount - 559 + SendAmount + 576 true true true - Object.Amount + Object.SendAmount + + OnChange + SendAmountOnChange + - AmountExtendedTooltip - 561 + SendAmountExtendedTooltip + 578 true true @@ -1201,8 +1309,8 @@ - AmountContextMenu - 560 + SendAmountContextMenu + 577 true true @@ -1270,24 +1378,89 @@ GroupInfoTitleRight 35 - - ReceiveDebtType - 544 + + GroupCommandBarRight + 595 + + EditCurrenciesReceiver + 597 + true + true + + true + + + EditCurrenciesReceiverExtendedTooltip + 598 + true + true + + true + + Label + true + true + + Left + + + Form.Command.EditCurrenciesReceiver + Auto + true + true + UserCmds + Auto + true true true + + <key>en</key> + <value>Command bar right</value> + + + <key>ru</key> + <value>Панель команд право</value> + + + <key>tr</key> + <value>Command bar right</value> + + + GroupCommandBarRightExtendedTooltip + 596 + true + true + + true + + Label + true + true + + Left + + + CommandBar + + Left + + + + ReceiveUUID + 579 + true + + true + - Object.ReceiveDebtType + Object.ReceiveUUID - - OnChange - ReceiveDebtTypeOnChange - - ReceiveDebtTypeExtendedTooltip - 546 + ReceiveUUIDExtendedTooltip + 581 true true @@ -1301,8 +1474,8 @@ - ReceiveDebtTypeContextMenu - 545 + ReceiveUUIDContextMenu + 580 true true @@ -1311,6 +1484,7 @@ true InputField + true Enter true Left @@ -1325,23 +1499,23 @@ - ReceivePartner - 392 + ReceiveDebtType + 544 true true true - Object.ReceivePartner + Object.ReceiveDebtType OnChange - ReceivePartnerOnChange + ReceiveDebtTypeOnChange - ReceivePartnerExtendedTooltip - 394 + ReceiveDebtTypeExtendedTooltip + 546 true true @@ -1355,7 +1529,61 @@ - ReceivePartnerContextMenu + ReceiveDebtTypeContextMenu + 545 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + ReceivePartner + 392 + true + true + + true + + + Object.ReceivePartner + + + OnChange + ReceivePartnerOnChange + + + ReceivePartnerExtendedTooltip + 394 + true + true + + true + + Label + true + true + + Left + + + + ReceivePartnerContextMenu 393 true true @@ -1448,6 +1676,60 @@ true + + ReceiveCurrency + 585 + true + true + + true + + + Object.ReceiveCurrency + + + OnChange + ReceiveCurrencyOnChange + + + ReceiveCurrencyExtendedTooltip + 587 + true + true + + true + + Label + true + true + + Left + + + + ReceiveCurrencyContextMenu + 586 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + ReceiveLegalName 386 @@ -1760,6 +2042,60 @@ true + + ReceiveAmount + 588 + true + true + + true + + + Object.ReceiveAmount + + + OnChange + ReceiveAmountOnChange + + + ReceiveAmountExtendedTooltip + 590 + true + true + + true + + Label + true + true + + Left + + + + ReceiveAmountContextMenu + 589 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + true true @@ -1979,7 +2315,7 @@ Currency - 407 + 617 true true @@ -1994,7 +2330,7 @@ CurrencyExtendedTooltip - 409 + 619 true true @@ -2009,7 +2345,7 @@ CurrencyContextMenu - 408 + 618 true true @@ -2131,6 +2467,345 @@ true + + GroupExpeneRevenue + 599 + + GroupExpense + 601 + + ExpenseType + 603 + true + true + + true + + + Object.ExpenseType + + + ExpenseTypeExtendedTooltip + 605 + true + true + + true + + Label + true + true + + Left + + + + ExpenseTypeContextMenu + 604 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + LossCenter + 606 + true + true + + true + + + Object.LossCenter + + + LossCenterExtendedTooltip + 608 + true + true + + true + + Label + true + true + + Left + + + + LossCenterContextMenu + 607 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + true + true + + true + + + <key>en</key> + <value>Expense</value> + + + <key>ru</key> + <value>Расход</value> + + + <key>tr</key> + <value>Gider</value> + + + GroupExpenseExtendedTooltip + 602 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + Vertical + Auto + WeakSeparation + true + true + true + Auto + Auto + + + + GroupRevenue + 609 + + RevenueType + 611 + true + true + + true + + + Object.RevenueType + + + RevenueTypeExtendedTooltip + 613 + true + true + + true + + Label + true + true + + Left + + + + RevenueTypeContextMenu + 612 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + ProfitCenter + 614 + true + true + + true + + + Object.ProfitCenter + + + ProfitCenterExtendedTooltip + 616 + true + true + + true + + Label + true + true + + Left + + + + ProfitCenterContextMenu + 615 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + true + true + + true + + + <key>en</key> + <value>Revenue</value> + + + <key>ru</key> + <value>Доход</value> + + + <key>tr</key> + <value>Gelir</value> + + + GroupRevenueExtendedTooltip + 610 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + Vertical + Auto + WeakSeparation + true + true + true + Auto + Auto + + + true + true + + true + + + <key>en</key> + <value>Group Expense\Revenue</value> + + + <key>ru</key> + <value>Группа Расходы\Доходы</value> + + + <key>tr</key> + <value>Grup Gider\Gelir</value> + + + GroupExpeneRevenueExtendedTooltip + 600 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + Vertical + Auto + true + true + Auto + Auto + + true true @@ -2580,20 +3255,50 @@ Auto - EditCurrencies + EditAccounting + + <key>en</key> + <value>Edit accounting</value> + + + <key>ru</key> + <value>Изменить бух. проводки</value> + + + <key>tr</key> + <value>Muhasebe değiştir</value> + + 6 + + true + + + StdPicture.ChartOfAccounts + + + + EditAccounting + + + FunctionalOption.UseAccounting + Picture + Auto + + + EditCurrenciesSender <key>en</key> - <value>Edit currencies</value> + <value>Edit currencies (sender)</value> <key>ru</key> - <value>Редактирование валют</value> + <value>Редактировать валюты (отправитель)</value> <key>tr</key> - <value>Dövizleri düzelt</value> + <value>Edit currencies (sender)</value> - 5 + 7 true @@ -2602,39 +3307,38 @@ - EditCurrencies + EditCurrenciesSender Picture Auto - EditAccounting + EditCurrenciesReceiver <key>en</key> - <value>Edit accounting</value> + <value>Edit currencies (receiver)</value> <key>ru</key> - <value>Изменить бух. проводки</value> + <value>Редактировать валюты (получатель)</value> <key>tr</key> - <value>Muhasebe değiştir</value> + <value>Edit currencies (receiver)</value> - 6 + 8 true - StdPicture.ChartOfAccounts + CommonPicture.EditCurrencies - EditAccounting + EditCurrenciesReceiver - FunctionalOption.UseAccounting Picture Auto diff --git a/IRP/src/Documents/DebitCreditNote/Forms/DocumentForm/Module.bsl b/IRP/src/Documents/DebitCreditNote/Forms/DocumentForm/Module.bsl index 609fe6200d..582ab8f577 100644 --- a/IRP/src/Documents/DebitCreditNote/Forms/DocumentForm/Module.bsl +++ b/IRP/src/Documents/DebitCreditNote/Forms/DocumentForm/Module.bsl @@ -54,7 +54,8 @@ Procedure SetVisibilityAvailability(Object, Form) Form.Items.SendLegalName.Enabled = ValueIsFilled(Object.SendPartner); Form.Items.ReceiveLegalName.Enabled = ValueIsFilled(Object.ReceivePartner); - Form.Items.EditCurrencies.Enabled = Not Form.ReadOnly; + Form.Items.EditCurrenciesSender.Enabled = Not Form.ReadOnly; + Form.Items.EditCurrenciesReceiver.Enabled = Not Form.ReadOnly; Form.Items.EditAccounting.Enabled = Not Form.ReadOnly; IsEnabled_SendBasisDocument = True; @@ -127,15 +128,6 @@ EndProcedure #EndRegion -#Region CURRENCY - -&AtClient -Procedure CurrencyOnChange(Item) - DocDebitCreditNoteClient.CurrencyOnChange(Object, ThisObject, Item); -EndProcedure - -#EndRegion - #Region SEND_DEBT_TYPE &AtClient @@ -268,6 +260,31 @@ EndProcedure #EndRegion +&AtClient +Procedure CurrencyOnChange(Item) + DocDebitCreditNoteClient.CurrencyOnChange(Object, ThisObject, Item); +EndProcedure + +&AtClient +Procedure SendCurrencyOnChange(Item) + DocDebitCreditNoteClient.SendCurrencyOnChange(Object, ThisObject, Item); +EndProcedure + +&AtClient +Procedure ReceiveCurrencyOnChange(Item) + DocDebitCreditNoteClient.ReceiveCurrencyOnChange(Object, ThisObject, Item); +EndProcedure + +&AtClient +Procedure SendAmountOnChange(Item) + DocDebitCreditNoteClient.SendAmountOnChange(Object, ThisObject, Item); +EndProcedure + +&AtClient +Procedure ReceiveAmountOnChange(Item) + DocDebitCreditNoteClient.ReceiveAmountOnChange(Object, ThisObject, Item); +EndProcedure + #Region SERVICE #Region DESCRIPTION @@ -363,8 +380,20 @@ Procedure ShowHiddenTables(Command) EndProcedure &AtClient -Procedure EditCurrencies(Command) - FormParameters = CurrenciesClientServer.GetParameters_V7(Object, "", Object.Currency, Object.Amount); +Procedure EditCurrenciesSender(Command) + FormParameters = CurrenciesClientServer.GetParameters_V7(Object, Object.SendUUID, Object.SendCurrency, + Object.SendAmount, Object.SendAgreement); + NotifyParameters = New Structure(); + NotifyParameters.Insert("Object", Object); + NotifyParameters.Insert("Form" , ThisObject); + Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters); + OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow); +EndProcedure + +&AtClient +Procedure EditCurrenciesReceiver(Command) + FormParameters = CurrenciesClientServer.GetParameters_V7(Object, Object.ReceiveUUID, Object.ReceiveCurrency, + Object.ReceiveAmount, Object.ReceiveAgreement); NotifyParameters = New Structure(); NotifyParameters.Insert("Object", Object); NotifyParameters.Insert("Form" , ThisObject); diff --git a/IRP/src/Documents/DebitCreditNote/ManagerModule.bsl b/IRP/src/Documents/DebitCreditNote/ManagerModule.bsl index c6ee78bf26..38a35e59aa 100644 --- a/IRP/src/Documents/DebitCreditNote/ManagerModule.bsl +++ b/IRP/src/Documents/DebitCreditNote/ManagerModule.bsl @@ -25,6 +25,14 @@ Procedure PostingCheckBeforeWrite(Ref, Cancel, PostingMode, Parameters, AddInfo Tables = Parameters.DocumentDataTables; QueryArray = GetQueryTextsMasterTables(); PostingServer.SetRegisters(Tables, Ref); + + Tables.R1020B_AdvancesToVendors.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); + Tables.R1021B_VendorsTransactions.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); + Tables.R2020B_AdvancesFromCustomers.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); + Tables.R2021B_CustomersTransactions.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); + Tables.T1040T_AccountingAmounts.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); + Tables.R5020B_PartnersBalance.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); + PostingServer.FillPostingTables(Tables, Ref, QueryArray, Parameters); EndProcedure @@ -126,7 +134,7 @@ Function SendAdvances() | Doc.SendPartner, | Doc.SendLegalName, | Doc.SendLegalNameContract, - | Doc.Currency, + | Doc.SendCurrency AS Currency, | Doc.SendAgreement, | Doc.SendProject, | Doc.SendOrder, @@ -152,7 +160,8 @@ Function SendAdvances() | Or Doc.SendAgreement <> Doc.ReceiveAgreement | Or case when Doc.SendBasisDocument.Ref IS NULL Then Undefined else Doc.SendBasisDocument end | <> case when Doc.ReceiveBasisDocument.Ref IS NULL Then Undefined else Doc.ReceiveBasisDocument end) AS IsDifferentPartners, - | Doc.Amount + | Doc.SendAmount AS Amount, + | Doc.SendUUID AS Key |INTO SendAdvances |FROM | Document.DebitCreditNote AS Doc @@ -183,7 +192,7 @@ Function ReceiveAdvances() | Doc.ReceivePartner, | Doc.ReceiveLegalName, | Doc.ReceiveLegalNameContract, - | Doc.Currency, + | Doc.ReceiveCurrency AS Currency, | Doc.ReceiveAgreement, | Doc.ReceiveProject, | Doc.ReceiveOrder, @@ -209,7 +218,8 @@ Function ReceiveAdvances() | Or Doc.SendAgreement <> Doc.ReceiveAgreement | Or case when Doc.SendBasisDocument.Ref IS NULL Then Undefined else Doc.SendBasisDocument end | <> case when Doc.ReceiveBasisDocument.Ref IS NULL Then Undefined else Doc.ReceiveBasisDocument end) AS IsDifferentPartners, - | Doc.Amount + | Doc.ReceiveAmount AS Amount, + | Doc.ReceiveUUID AS Key |INTO ReceiveAdvances |FROM | Document.DebitCreditNote AS Doc @@ -240,7 +250,7 @@ Function SendTransactions() | Doc.SendPartner, | Doc.SendLegalName, | Doc.SendLegalNameContract, - | Doc.Currency, + | Doc.SendCurrency AS Currency, | Doc.SendAgreement, | Doc.SendProject, | Doc.SendOrder, @@ -267,7 +277,8 @@ Function SendTransactions() | Or Doc.SendAgreement <> Doc.ReceiveAgreement | Or case when Doc.SendBasisDocument.Ref IS NULL Then Undefined else Doc.SendBasisDocument end | <> case when Doc.ReceiveBasisDocument.Ref IS NULL Then Undefined else Doc.ReceiveBasisDocument end) AS IsDifferentPartners, - | Doc.Amount + | Doc.SendAmount AS Amount, + | Doc.SendUUID AS Key |INTO SendTransactions |FROM | Document.DebitCreditNote AS Doc @@ -298,7 +309,7 @@ Function ReceiveTransactions() | Doc.ReceivePartner, | Doc.ReceiveLegalName, | Doc.ReceiveLegalNameContract, - | Doc.Currency, + | Doc.ReceiveCurrency AS Currency, | Doc.ReceiveAgreement, | Doc.ReceiveProject, | Doc.ReceiveOrder, @@ -329,7 +340,8 @@ Function ReceiveTransactions() | Or Doc.SendAgreement <> Doc.ReceiveAgreement | Or case when Doc.SendBasisDocument.Ref IS NULL Then Undefined else Doc.SendBasisDocument end | <> case when Doc.ReceiveBasisDocument.Ref IS NULL Then Undefined else Doc.ReceiveBasisDocument end) AS IsDifferentPartners, - | Doc.Amount + | Doc.ReceiveAmount AS Amount, + | Doc.ReceiveUUID AS Key |INTO ReceiveTransactions |FROM | Document.DebitCreditNote AS Doc @@ -564,13 +576,79 @@ EndFunction Function T1040T_AccountingAmounts() Return +// "SELECT +// | Doc.Date AS Period, +// | UNDEFINED AS RowKey, +// | Doc.SendUUID AS Key, +// | Doc.SendCurrency AS Currency, +// | Doc.SendAmount AS Amount, +// | VALUE(Catalog.AccountingOperations.DebitCreditNote_R5020B_PartnersBalance) AS Operation, +// | UNDEFINED AS AdvancesClosing +// |INTO T1040T_AccountingAmounts +// |FROM +// | Document.DebitCreditNote AS Doc +// |WHERE +// | Doc.Ref = &Ref "SELECT | Doc.Date AS Period, | UNDEFINED AS RowKey, - | UNDEFINED AS Key, - | Doc.Currency, - | Doc.Amount, + | Doc.SendUUID AS Key, + | Doc.SendCurrency AS Currency, + | Doc.SendAmount AS Amount, | VALUE(Catalog.AccountingOperations.DebitCreditNote_R5020B_PartnersBalance) AS Operation, + // Dr currency + | case + | when Doc.SendDebtType = value(enum.DebtTypes.TransactionCustomer) + | or Doc.SendDebtType = value(enum.DebtTypes.AdvanceVendor) Then + | + | Doc.ReceiveCurrency + | + | when Doc.SendDebtType = value(enum.DebtTypes.TransactionVendor) + | or Doc.SendDebtType = value(enum.DebtTypes.AdvanceCustomer) Then + | + | Doc.SendCurrency + | + | else undefined end as DrCurrency, + // Dr currency amount + | case + | when Doc.SendDebtType = value(enum.DebtTypes.TransactionCustomer) + | or Doc.SendDebtType = value(enum.DebtTypes.AdvanceVendor) Then + | + | Doc.ReceiveAmount + | + | when Doc.SendDebtType = value(enum.DebtTypes.TransactionVendor) + | or Doc.SendDebtType = value(enum.DebtTypes.AdvanceCustomer) Then + | + | Doc.SendAmount + | + | else 0 end as DrCurrencyAmount, + // Cr currency + | case + | when Doc.SendDebtType = value(enum.DebtTypes.TransactionCustomer) + | or Doc.SendDebtType = value(enum.DebtTypes.AdvanceVendor) Then + | + | Doc.SendCurrency + | + | when Doc.SendDebtType = value(enum.DebtTypes.TransactionVendor) + | or Doc.SendDebtType = value(enum.DebtTypes.AdvanceCustomer) Then + | + | Doc.ReceiveCurrency + | + | else undefined end as CrCurrency, + // Cr currency amount + | case + | when Doc.SendDebtType = value(enum.DebtTypes.TransactionCustomer) + | or Doc.SendDebtType = value(enum.DebtTypes.AdvanceVendor) Then + | + | Doc.SendAmount + | + | when Doc.SendDebtType = value(enum.DebtTypes.TransactionVendor) + | or Doc.SendDebtType = value(enum.DebtTypes.AdvanceCustomer) Then + | + | Doc.ReceiveAmount + | + | else 0 end as CrCurrencyAmount, + | | UNDEFINED AS AdvancesClosing |INTO T1040T_AccountingAmounts |FROM @@ -587,6 +665,10 @@ Function T1040T_AccountingAmounts() | OffsetOfAdvances.Currency, | OffsetOfAdvances.Amount, | VALUE(Catalog.AccountingOperations.DebitCreditNote_DR_R1021B_VendorsTransactions_CR_R1020B_AdvancesToVendors_Offset), + | Undefined, + | 0, + | Undefined, + | 0, | OffsetOfAdvances.Recorder |FROM | InformationRegister.T2010S_OffsetOfAdvances AS OffsetOfAdvances @@ -603,6 +685,10 @@ Function T1040T_AccountingAmounts() | OffsetOfAdvances.Currency, | OffsetOfAdvances.Amount, | VALUE(Catalog.AccountingOperations.DebitCreditNote_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransactions_Offset), + | Undefined, + | 0, + | Undefined, + | 0, | OffsetOfAdvances.Recorder |FROM | InformationRegister.T2010S_OffsetOfAdvances AS OffsetOfAdvances @@ -620,6 +706,10 @@ Function GetAccountingAnalytics(Parameters) Export Return GetAnalytics_DR_R1021B_VendorsTransactions_CR_R1020B_AdvancesToVendors_Offset(Parameters); ElsIf Parameters.Operation = AO.DebitCreditNote_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransactions_Offset Then Return GetAnalytics_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransactions_Offset(Parameters); + ElsIf Parameters.Operation = AO.DebitCreditNote_DR_R5020B_PartnersBalance_CR_R5021_Revenues Then + Return GetAnalytics_DR_R5020B_PartnersBalance_CR_R5021_Revenues(Parameters); + ElsIf Parameters.Operation = AO.DebitCreditNote_DR_R5022T_Expenses_CR_R5020B_PartnersBalance Then + Return GetAnalytics_DR_R5022T_Expenses_CR_R5020B_PartnersBalance(Parameters); EndIf; Return Undefined; @@ -643,7 +733,7 @@ Function GetAnalytics_R5020B_PartnersBalance(Parameters) Sender = AccountingServer.GetT9012S_AccountsPartner(AccountParameters, Parameters.ObjectData.SendPartner, Parameters.ObjectData.SendAgreement, - Parameters.ObjectData.Currency); + Parameters.ObjectData.SendCurrency); // Receiver AdditionalAnalytics_Receiver = New Structure(); @@ -657,7 +747,7 @@ Function GetAnalytics_R5020B_PartnersBalance(Parameters) Receiver = AccountingServer.GetT9012S_AccountsPartner(AccountParameters, Parameters.ObjectData.SendPartner, Parameters.ObjectData.SendAgreement, - Parameters.ObjectData.Currency); + Parameters.ObjectData.ReceiveCurrency); From_CustomerAdvance_To_CustomerAdvance = (Parameters.ObjectData.SendDebtType = Enums.DebtTypes.AdvanceCustomer @@ -685,7 +775,7 @@ Function GetAnalytics_R5020B_PartnersBalance(Parameters) - // Advance customer (sender) -> Advance customer (receiver) + // Advance customer (sender) -> Advance customer (receiver)* If From_CustomerAdvance_To_CustomerAdvance Then Debit_Account = Sender.AccountAdvancesCustomer; @@ -694,7 +784,7 @@ Function GetAnalytics_R5020B_PartnersBalance(Parameters) Credit_Account = Receiver.AccountAdvancesCustomer; Credit_Analytics = AdditionalAnalytics_Receiver; - // Customer transaction (sender) -> Customer transaction (receiver) + // Customer transaction (sender) -> Customer transaction (receiver)* ElsIf From_CustomerTransaction_To_CustomerTransaction Then Debit_Account = Receiver.AccountTransactionsCustomer; @@ -703,7 +793,7 @@ Function GetAnalytics_R5020B_PartnersBalance(Parameters) Credit_Account = Sender.AccountTransactionsCustomer; Credit_Analytics = AdditionalAnalytics_Sender; - // Advance customer (sender) -> Customer transaction (receiver) + // Advance customer (sender) -> Customer transaction (receiver)* ElsIf From_CustomerAdvance_To_CustomerTransaction Then Debit_Account = Sender.AccountAdvancesCustomer; @@ -712,7 +802,7 @@ Function GetAnalytics_R5020B_PartnersBalance(Parameters) Credit_Account = Receiver.AccountTransactionsCustomer; Credit_Analytics = AdditionalAnalytics_Receiver; - // Advance vendor (sender) -> Advance vendor (receiver) + // Advance vendor (sender) -> Advance vendor (receiver)* ElsIf From_VendorAdvance_To_VendorAdvance Then Debit_Account = Receiver.AccountAdvancesVendor; @@ -721,21 +811,21 @@ Function GetAnalytics_R5020B_PartnersBalance(Parameters) Credit_Account = Sender.AccountAdvancesVendor; Credit_Analytics = AdditionalAnalytics_Sender; - // Vendor transaction (sender) -> Vendor transaction (receiver) + // Vendor transaction (sender) -> Vendor transaction (receiver)* ElsIf From_VendorTransaction_To_VendorTransaction Then - Debit_Account = Sender.AccountAdvancesCustomer; + Debit_Account = Sender.AccountTransactionsVendor; Debit_Analytics = AdditionalAnalytics_Sender; - Credit_Account = Receiver.AccountAdvancesCustomer; + Credit_Account = Receiver.AccountTransactionsVendor; Credit_Analytics = AdditionalAnalytics_Receiver; - // Advance vendor (sender) -> Vendor transaction (receiver) + // Advance vendor (sender) -> Vendor transaction (receiver)* ElsIf From_VendorAdvance_To_VendorTransaction Then - Debit_Account = Receiver.AccountTransactionsVendor; + Debit_Account = Receiver.AccountAdvancesVendor; Debit_Analytics = AdditionalAnalytics_Receiver; - Credit_Account = Sender.AccountAdvancesVendor; + Credit_Account = Sender.AccountTransactionsVendor; Credit_Analytics = AdditionalAnalytics_Sender; EndIf; @@ -767,7 +857,7 @@ Function GetAnalytics_DR_R1021B_VendorsTransactions_CR_R1020B_AdvancesToVendors_ Accounts = AccountingServer.GetT9012S_AccountsPartner(AccountParameters, Parameters.ObjectData.ReceivePartner, Parameters.ObjectData.ReceiveAgreement, - Parameters.ObjectData.Currency); + Parameters.ObjectData.ReceiveCurrency); // Debit AccountingAnalytics.Debit = Accounts.AccountTransactionsVendor; AccountingServer.SetDebitExtDimensions(Parameters, AccountingAnalytics, AdditionalAnalytics); @@ -795,7 +885,7 @@ Function GetAnalytics_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransac Accounts = AccountingServer.GetT9012S_AccountsPartner(AccountParameters, Parameters.ObjectData.ReceivePartner, Parameters.ObjectData.ReceiveAgreement, - Parameters.ObjectData.Currency); + Parameters.ObjectData.ReceiveCurrency); // Debit AccountingAnalytics.Debit = Accounts.AccountAdvancesCustomer; AccountingServer.SetDebitExtDimensions(Parameters, AccountingAnalytics, AdditionalAnalytics); @@ -807,6 +897,94 @@ Function GetAnalytics_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransac Return AccountingAnalytics; EndFunction +Function GetAnalytics_DR_R5020B_PartnersBalance_CR_R5021_Revenues(Parameters) + AccountingAnalytics = AccountingServer.GetAccountingAnalyticsResult(Parameters); + AccountParameters = AccountingServer.GetAccountParameters(Parameters); + + AdditionalAnalytics_Partner = New Structure(); + AdditionalAnalytics_Partner.Insert("Partner" , Parameters.ObjectData.ReceivePartner); + AdditionalAnalytics_Partner.Insert("LegalName" , Parameters.ObjectData.ReceiveLegalName); + AdditionalAnalytics_Partner.Insert("Agreement" , Parameters.ObjectData.ReceiveAgreement); + AdditionalAnalytics_Partner.Insert("Contract" , Parameters.ObjectData.ReceiveLegalNameContract); + AdditionalAnalytics_Partner.Insert("Order" , Parameters.ObjectData.ReceiveOrder); + AdditionalAnalytics_Partner.Insert("BasisDocument" , Parameters.ObjectData.ReceiveBasisDocument); + + Accounts_Partner = AccountingServer.GetT9012S_AccountsPartner(AccountParameters, + Parameters.ObjectData.ReceivePartner, + Parameters.ObjectData.ReceiveAgreement, + Parameters.ObjectData.ReceiveCurrency); + + AdditionalAnalytics_Revenue = New Structure(); + AdditionalAnalytics_Revenue.Insert("RevenueType" , Parameters.ObjectData.RevenueType); + AdditionalAnalytics_Revenue.Insert("ProfitCenter" , Parameters.ObjectData.ProfitCenter); + + Accounts_Revenue = AccountingServer.GetT9014S_AccountsExpenseRevenue(AccountParameters, + Parameters.ObjectData.RevenueType, + Parameters.ObjectData.ProfitCenter); + + // Debit + If Parameters.ObjectData.ReceiveDebtType = Enums.DebtTypes.TransactionCustomer Then + AccountingAnalytics.Debit = Accounts_Partner.AccountTransactionsCustomer; + ElsIf Parameters.ObjectData.ReceiveDebtType = Enums.DebtTypes.AdvanceCustomer Then + AccountingAnalytics.Debit = Accounts_Partner.AccountAdvancesCustomer; + ElsIf Parameters.ObjectData.ReceiveDebtType = Enums.DebtTypes.TransactionVendor Then + AccountingAnalytics.Debit = Accounts_Partner.AccountTransactionsVendor; + ElsIf Parameters.ObjectData.ReceiveDebtType = Enums.DebtTypes.AdvanceVendor Then + AccountingAnalytics.Debit = Accounts_Partner.AccountAdvancesVendor; + EndIf; + AccountingServer.SetDebitExtDimensions(Parameters, AccountingAnalytics, AdditionalAnalytics_Partner); + + // Credit + AccountingAnalytics.Credit = Accounts_Revenue.AccountRevenue; + AccountingServer.SetCreditExtDimensions(Parameters, AccountingAnalytics, AdditionalAnalytics_Revenue); + + Return AccountingAnalytics; +EndFunction + +Function GetAnalytics_DR_R5022T_Expenses_CR_R5020B_PartnersBalance(Parameters) + AccountingAnalytics = AccountingServer.GetAccountingAnalyticsResult(Parameters); + AccountParameters = AccountingServer.GetAccountParameters(Parameters); + + AdditionalAnalytics_Partner = New Structure(); + AdditionalAnalytics_Partner.Insert("Partner" , Parameters.ObjectData.ReceivePartner); + AdditionalAnalytics_Partner.Insert("LegalName" , Parameters.ObjectData.ReceiveLegalName); + AdditionalAnalytics_Partner.Insert("Agreement" , Parameters.ObjectData.ReceiveAgreement); + AdditionalAnalytics_Partner.Insert("Contract" , Parameters.ObjectData.ReceiveLegalNameContract); + AdditionalAnalytics_Partner.Insert("Order" , Parameters.ObjectData.ReceiveOrder); + AdditionalAnalytics_Partner.Insert("BasisDocument" , Parameters.ObjectData.ReceiveBasisDocument); + + Accounts_Partner = AccountingServer.GetT9012S_AccountsPartner(AccountParameters, + Parameters.ObjectData.ReceivePartner, + Parameters.ObjectData.ReceiveAgreement, + Parameters.ObjectData.ReceiveCurrency); + + AdditionalAnalytics_Expense = New Structure(); + AdditionalAnalytics_Expense.Insert("ExpenseType" , Parameters.ObjectData.ExpenseType); + AdditionalAnalytics_Expense.Insert("LossCenter" , Parameters.ObjectData.LossCenter); + + Accounts_Expense = AccountingServer.GetT9014S_AccountsExpenseRevenue(AccountParameters, + Parameters.ObjectData.ExpenseType, + Parameters.ObjectData.LossCenter); + + // Debit + AccountingAnalytics.Debit = Accounts_Expense.AccountExpense; + AccountingServer.SetDebitExtDimensions(Parameters, AccountingAnalytics, AdditionalAnalytics_Expense); + + // Credit + If Parameters.ObjectData.ReceiveDebtType = Enums.DebtTypes.TransactionCustomer Then + AccountingAnalytics.Credit = Accounts_Partner.AccountTransactionsCustomer; + ElsIf Parameters.ObjectData.ReceiveDebtType = Enums.DebtTypes.AdvanceCustomer Then + AccountingAnalytics.Credit = Accounts_Partner.AccountAdvancesCustomer; + ElsIf Parameters.ObjectData.ReceiveDebtType = Enums.DebtTypes.TransactionVendor Then + AccountingAnalytics.Credit = Accounts_Partner.AccountTransactionsVendor; + ElsIf Parameters.ObjectData.ReceiveDebtType = Enums.DebtTypes.AdvanceVendor Then + AccountingAnalytics.Credit = Accounts_Partner.AccountAdvancesVendor; + EndIf; + AccountingServer.SetCreditExtDimensions(Parameters, AccountingAnalytics, AdditionalAnalytics_Partner); + + Return AccountingAnalytics; +EndFunction + Function GetHintDebitExtDimension(Parameters, ExtDimensionType, Value) Export Return Value; EndFunction diff --git a/IRP/src/Documents/DebitCreditNote/ObjectModule.bsl b/IRP/src/Documents/DebitCreditNote/ObjectModule.bsl index 3501350a1e..654258031e 100644 --- a/IRP/src/Documents/DebitCreditNote/ObjectModule.bsl +++ b/IRP/src/Documents/DebitCreditNote/ObjectModule.bsl @@ -3,10 +3,44 @@ Procedure BeforeWrite(Cancel, WriteMode, PostingMode) Return; EndIf; - Parameters = CurrenciesClientServer.GetParameters_V7(ThisObject, "", ThisObject.Currency, ThisObject.Amount); - CurrenciesClientServer.DeleteRowsByKeyFromCurrenciesTable(ThisObject.Currencies); +// Parameters = CurrenciesClientServer.GetParameters_V7(ThisObject, "", ThisObject.Currency, ThisObject.Amount); +// CurrenciesClientServer.DeleteRowsByKeyFromCurrenciesTable(ThisObject.Currencies); +// CurrenciesServer.UpdateCurrencyTable(Parameters, ThisObject.Currencies); + + If Not ValueIsFilled(ThisObject.SendUUID) Then + ThisObject.SendUUID = New UUID(); + EndIf; + + If Not ValueIsFilled(ThisObject.ReceiveUUID) Then + ThisObject.ReceiveUUID = New UUID(); + EndIf; + + If Not ValueIsFilled(ThisObject.TransitUUID) Then + ThisObject.TransitUUID = New UUID(); + EndIf; + + TotalTable = New ValueTable(); + TotalTable.Columns.Add("Key"); + TotalTable.Add().Key = ThisObject.SendUUID; + TotalTable.Add().Key = ThisObject.ReceiveUUID; + TotalTable.Add().Key = ThisObject.TransitUUID; + + CurrenciesClientServer.DeleteUnusedRowsFromCurrenciesTable(ThisObject.Currencies, TotalTable); + + Parameters = CurrenciesClientServer.GetParameters_V7(ThisObject, ThisObject.SendUUID, ThisObject.SendCurrency, + ThisObject.SendAmount, ThisObject.SendAgreement); + CurrenciesClientServer.DeleteRowsByKeyFromCurrenciesTable(ThisObject.Currencies, ThisObject.SendUUID); CurrenciesServer.UpdateCurrencyTable(Parameters, ThisObject.Currencies); + Parameters = CurrenciesClientServer.GetParameters_V7(ThisObject, ThisObject.ReceiveUUID, ThisObject.ReceiveCurrency, + ThisObject.ReceiveAmount, ThisObject.ReceiveAgreement); + CurrenciesClientServer.DeleteRowsByKeyFromCurrenciesTable(ThisObject.Currencies, ThisObject.ReceiveUUID); + CurrenciesServer.UpdateCurrencyTable(Parameters, ThisObject.Currencies); + + Parameters = CurrenciesClientServer.GetParameters_V7(ThisObject, ThisObject.TransitUUID, ThisObject.Currency, ThisObject.SendAmount); + CurrenciesClientServer.DeleteRowsByKeyFromCurrenciesTable(ThisObject.Currencies, ThisObject.TransitUUID); + CurrenciesServer.UpdateCurrencyTable(Parameters, ThisObject.Currencies); + ThisObject.AdditionalProperties.Insert("WriteMode", WriteMode); EndProcedure diff --git a/IRP/src/Documents/DebitNote/DebitNote.mdo b/IRP/src/Documents/DebitNote/DebitNote.mdo index 51d00177d4..7223bbf119 100644 --- a/IRP/src/Documents/DebitNote/DebitNote.mdo +++ b/IRP/src/Documents/DebitNote/DebitNote.mdo @@ -39,6 +39,22 @@ InformationRegister.AddProperties.Dimension.Key InformationRegister.AddProperties.Dimension.Key + + Catalog.AddAttributeAndPropertySets.TabularSection.Attributes + Catalog.AddAttributeAndPropertySets.TabularSection.Attributes.Attribute.Attribute + Catalog.AddAttributeAndPropertySets.TabularSection.Attributes.StandardAttribute.Ref + + Catalog.AddAttributeAndPropertySets.Document_DebitNote + + -1 + Catalog.AddAttributeAndPropertySets.TabularSection.Attributes.Attribute.Collection + Document.DebitNote.TabularSection.AddAttributes + Document.DebitNote.TabularSection.AddAttributes.StandardAttribute.Ref + Document.DebitNote.TabularSection.AddAttributes.Attribute.Property + Document.DebitNote.TabularSection.AddAttributes.Attribute.Value + Document.DebitNote.TabularSection.AddAttributes.StandardAttribute.LineNumber + Document.DebitNote.TabularSection.AddAttributes.StandardAttribute.LineNumber + Catalog.CurrencyMovementSets.TabularSection.CurrencyMovements Catalog.CurrencyMovementSets.TabularSection.CurrencyMovements.Attribute.CurrencyMovementType @@ -104,6 +120,7 @@ AccumulationRegister.T1040T_AccountingAmounts AccumulationRegister.R5015B_OtherPartnersTransactions AccumulationRegister.R5020B_PartnersBalance + AccumulationRegister.R2040B_TaxesIncoming true true DontUse @@ -503,6 +520,71 @@ Use Use + + VatRate + + en + VAT + + + ru + НДС + + + tr + KDV + + + CatalogRef.TaxRates + + + + Use + Use + + + NetAmount + + en + Net amount + + + ru + Сумма без налогов + + + tr + Net tutar + + + DefinedType.typeAmount + + + + ShowError + Use + + + TaxAmount + + en + Tax amount + + + ru + Сумма налогов + + + tr + Vergi tutarı + + + DefinedType.typeAmount + + + + Use + diff --git a/IRP/src/Documents/DebitNote/Forms/DocumentForm/Form.form b/IRP/src/Documents/DebitNote/Forms/DocumentForm/Form.form index 407faaebce..ca0b4d8e88 100644 --- a/IRP/src/Documents/DebitNote/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/DebitNote/Forms/DocumentForm/Form.form @@ -987,6 +987,169 @@ true + + TransactionsVatRate + 316 + true + true + + true + + + Object.Transactions.VatRate + + + OnChange + TransactionsVatRateOnChange + + + TransactionsVatRateExtendedTooltip + 318 + true + true + + true + + Label + true + true + + Left + + + + TransactionsVatRateContextMenu + 317 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + true + + + + TransactionsTaxAmount + 319 + true + true + + true + + + Object.Transactions.TaxAmount + + + OnChange + TransactionsTaxAmountOnChange + + + TransactionsTaxAmountExtendedTooltip + 321 + true + true + + true + + Label + true + true + + Left + + + + TransactionsTaxAmountContextMenu + 320 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + TransactionsNetAmount + 322 + true + true + + true + + + Object.Transactions.NetAmount + + + OnChange + TransactionsNetAmountOnChange + + + TransactionsNetAmountExtendedTooltip + 324 + true + true + + true + + Label + true + true + + Left + + + + TransactionsNetAmountContextMenu + 323 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + TransactionsAmount 91 @@ -998,6 +1161,10 @@ Object.Transactions.Amount + + OnChange + TransactionsAmountOnChange + TransactionsAmountExtendedTooltip 93 diff --git a/IRP/src/Documents/DebitNote/Forms/DocumentForm/Module.bsl b/IRP/src/Documents/DebitNote/Forms/DocumentForm/Module.bsl index d5e9d8571f..0389c1fc85 100644 --- a/IRP/src/Documents/DebitNote/Forms/DocumentForm/Module.bsl +++ b/IRP/src/Documents/DebitNote/Forms/DocumentForm/Module.bsl @@ -180,6 +180,26 @@ EndProcedure #EndRegion +&AtClient +Procedure TransactionsVatRateOnChange(Item) + DocCreditDebitNoteClient.TransactionsVatRateOnChange(Object, ThisObject, Item); +EndProcedure + +&AtClient +Procedure TransactionsNetAmountOnChange(Item) + DocCreditDebitNoteClient.TransactionsNetAmountOnChange(Object, ThisObject, Item); +EndProcedure + +&AtClient +Procedure TransactionsTaxAmountOnChange(Item) + DocCreditDebitNoteClient.TransactionsTaxAmountOnChange(Object, ThisObject, Item); +EndProcedure + +&AtClient +Procedure TransactionsAmountOnChange(Item) + DocCreditDebitNoteClient.TransactionsAmountOnChange(Object, ThisObject, Item); +EndProcedure + #EndRegion #EndRegion diff --git a/IRP/src/Documents/DebitNote/ManagerModule.bsl b/IRP/src/Documents/DebitNote/ManagerModule.bsl index 51f4f04ada..160f84dae7 100644 --- a/IRP/src/Documents/DebitNote/ManagerModule.bsl +++ b/IRP/src/Documents/DebitNote/ManagerModule.bsl @@ -11,6 +11,7 @@ EndFunction Function PostingGetDocumentDataTables(Ref, Cancel, PostingMode, Parameters, AddInfo = Undefined) Export Tables = New Structure; QueryArray = GetQueryTextsSecondaryTables(); + Parameters.Insert("QueryParameters", GetAdditionalQueryParameters(Ref)); PostingServer.ExecuteQuery(Ref, QueryArray, Parameters); AccountingServer.CreateAccountingDataTables(Ref, Cancel, PostingMode, Parameters, AddInfo); @@ -36,6 +37,7 @@ Procedure PostingCheckBeforeWrite(Ref, Cancel, PostingMode, Parameters, AddInfo Tables.R5015B_OtherPartnersTransactions.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); Tables.T1040T_AccountingAmounts.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); Tables.R5020B_PartnersBalance.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); + Tables.R2040B_TaxesIncoming.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); PostingServer.FillPostingTables(Tables, Ref, QueryArray, Parameters); EndProcedure @@ -85,6 +87,7 @@ EndFunction Function GetAdditionalQueryParameters(Ref) StrParams = New Structure; StrParams.Insert("Ref", Ref); + StrParams.Insert("Vat", TaxesServer.GetVatRef()); Return StrParams; EndFunction @@ -109,6 +112,7 @@ Function GetQueryTextsMasterTables() QueryArray.Add(T2015S_TransactionsInfo()); QueryArray.Add(T1040T_AccountingAmounts()); QueryArray.Add(R5020B_PartnersBalance()); + QueryArray.Add(R2040B_TaxesIncoming()); Return QueryArray; EndFunction @@ -147,6 +151,9 @@ Function Transactions() | Transactions.Currency, | Transactions.Key, | Transactions.Amount, + | Transactions.NetAmount, + | Transactions.TaxAmount, + | Transactions.VatRate, | Transactions.Ref.Branch AS Branch, | Transactions.LegalNameContract AS LegalNameContract, | Transactions.ProfitLossCenter, @@ -177,6 +184,7 @@ Function R5021T_Revenues() Return "SELECT | VALUE(AccumulationRecordType.Receipt) AS RecordType, | Transactions.Amount AS AmountWithTaxes, + | Transactions.NetAmount AS Amount, | * |INTO R5021T_Revenues |FROM @@ -263,6 +271,46 @@ Function T2015S_TransactionsInfo() Return InformationRegisters.T2015S_TransactionsInfo.T2015S_TransactionsInfo_DebitNote(); EndFunction +Function R2040B_TaxesIncoming() + Return + "SELECT + | VALUE(AccumulationRecordType.Receipt) AS RecordType, + | Transactions.Period, + | Transactions.Key, + | Transactions.Company, + | Transactions.Branch, + | Transactions.Currency, + | &Vat AS Tax, + | Transactions.VatRate AS TaxRate, + | Transactions.TaxAmount AS Amount, + | VALUE(Enum.InvoiceType.Invoice) AS InvoiceType + |INTO R2040B_TaxesIncoming + |FROM + | Transactions AS Transactions + |WHERE + | Transactions.IsCustomer + | AND Transactions.TaxAmount <> 0 + | + |UNION ALL + | + |SELECT + | VALUE(AccumulationRecordType.Receipt) AS RecordType, + | Transactions.Period, + | Transactions.Key, + | Transactions.Company, + | Transactions.Branch, + | Transactions.Currency, + | &Vat AS Tax, + | Transactions.VatRate AS TaxRate, + | Transactions.TaxAmount AS Amount, + | VALUE(Enum.InvoiceType.Return) AS InvoiceType + |FROM + | Transactions AS Transactions + |WHERE + | Transactions.IsVendor + | AND Transactions.TaxAmount <> 0"; +EndFunction + #EndRegion #Region AccessObject @@ -292,7 +340,7 @@ Function T1040T_AccountingAmounts() | Transactions.Key AS RowKey, | Transactions.Key AS Key, | Transactions.Currency, - | Transactions.Amount, + | Transactions.NetAmount AS Amount, | VALUE(Catalog.AccountingOperations.DebitNote_DR_R1021B_VendorsTransactions_CR_R5021_Revenues) AS Operation, | UNDEFINED AS AdvancesClosing |INTO T1040T_AccountingAmounts @@ -304,6 +352,23 @@ Function T1040T_AccountingAmounts() |UNION ALL | |SELECT + | Transactions.Period, + | Transactions.Key AS RowKey, + | Transactions.Key AS Key, + | Transactions.Currency, + | Transactions.TaxAmount AS Amount, + | VALUE(Catalog.AccountingOperations.DebitNote_DR_R1021B_VendorsTransactions_CR_R2040B_TaxesIncoming) AS Operation, + | UNDEFINED AS AdvancesClosing + | + |FROM + | Transactions AS Transactions + |WHERE + | Transactions.IsVendor + | AND Transactions.TaxAmount <> 0 + | + |UNION ALL + | + |SELECT | OffsetOfAdvances.Period, | OffsetOfAdvances.Key, | OffsetOfAdvances.Key, @@ -324,13 +389,30 @@ Function T1040T_AccountingAmounts() | Transactions.Key, | Transactions.Key, | Transactions.Currency, - | Transactions.Amount AS Amount, + | Transactions.NetAmount AS Amount, | VALUE(Catalog.AccountingOperations.DebitNote_DR_R2021B_CustomersTransactions_CR_R5021_Revenues), | UNDEFINED |FROM | Transactions AS Transactions |WHERE | Transactions.IsCustomer + | + |UNION ALL + | + |SELECT + | Transactions.Period, + | Transactions.Key, + | Transactions.Key, + | Transactions.Currency, + | Transactions.TaxAmount AS Amount, + | VALUE(Catalog.AccountingOperations.DebitNote_DR_R2021B_CustomersTransactions_CR_R2040B_TaxesIncoming), + | UNDEFINED + |FROM + | Transactions AS Transactions + |WHERE + | Transactions.IsCustomer + | AND Transactions.TaxAmount <> 0 + | |UNION ALL | @@ -377,13 +459,17 @@ Function GetAccountingAnalytics(Parameters) Export Return GetAnalytics_OffsetOfAdvancesCustomer(Parameters); // Advances from customers - Customers transactions ElsIf Parameters.Operation = AO.DebitNote_DR_R5015B_OtherPartnersTransactions_CR_R5021_Revenues Then Return GetAnalytics_OtherPartnerRevenues(Parameters); // OtherPartner - Revenues + ElsIf Parameters.Operation = AO.DebitNote_DR_R1021B_VendorsTransactions_CR_R2040B_TaxesIncoming Then + Return GetAnalytics_VendorTransactionTaxIncoming(Parameters); // Vendors transactions - Tax incoming + ElsIf Parameters.Operation = AO.DebitNote_DR_R2021B_CustomersTransactions_CR_R2040B_TaxesIncoming Then + Return GetAnalytics_CustomerTransactionTaxesIncoming(Parameters); // Vendors transactions - Tax incoming EndIf; Return Undefined; EndFunction #Region Accounting_Analytics -// Vendors advances - Revenues +// Vendors transaction - Revenues Function GetAnalytics_VendorTransactionRevenues(Parameters) AccountingAnalytics = AccountingServer.GetAccountingAnalyticsResult(Parameters); AccountParameters = AccountingServer.GetAccountParameters(Parameters); @@ -406,6 +492,31 @@ Function GetAnalytics_VendorTransactionRevenues(Parameters) Return AccountingAnalytics; EndFunction +// Vendors advances - Tax incoming +Function GetAnalytics_VendorTransactionTaxIncoming(Parameters) + AccountingAnalytics = AccountingServer.GetAccountingAnalyticsResult(Parameters); + AccountParameters = AccountingServer.GetAccountParameters(Parameters); + + // Debit + Debit = AccountingServer.GetT9012S_AccountsPartner(AccountParameters, + Parameters.RowData.Partner, + Parameters.RowData.Agreement, + Parameters.RowData.Currency); + AccountingAnalytics.Debit = Debit.AccountTransactionsVendor; + AccountingServer.SetDebitExtDimensions(Parameters, AccountingAnalytics); + + // Credit + Credit = AccountingServer.GetT9013S_AccountsTax(AccountParameters, Parameters.RowData.TaxInfo); + If Parameters.RowData.Agreement.Type = Enums.AgreementTypes.Vendor Then + AccountingAnalytics.Credit = Credit.IncomingAccountReturn; + Else + AccountingAnalytics.Credit = Credit.IncomingAccount; + EndIf; + AccountingServer.SetCreditExtDimensions(Parameters, AccountingAnalytics, Parameters.RowData.TaxInfo); + + Return AccountingAnalytics; +EndFunction + // Vendors transactions - Advances to vendors Function GetAnalytics_OffsetOfAdvancesVendor(Parameters) AccountingAnalytics = AccountingServer.GetAccountingAnalyticsResult(Parameters); @@ -448,6 +559,31 @@ Function GetAnalytics_CustomerTransactionRevenues(Parameters) Return AccountingAnalytics; EndFunction +// Customer transactions - Taxes incoming +Function GetAnalytics_CustomerTransactionTaxesIncoming(Parameters) + AccountingAnalytics = AccountingServer.GetAccountingAnalyticsResult(Parameters); + AccountParameters = AccountingServer.GetAccountParameters(Parameters); + + // Debit + Debit = AccountingServer.GetT9012S_AccountsPartner(AccountParameters, + Parameters.RowData.Partner, + Parameters.RowData.Agreement, + Parameters.RowData.Currency); + AccountingAnalytics.Debit = Debit.AccountTransactionsCustomer; + AccountingServer.SetDebitExtDimensions(Parameters, AccountingAnalytics); + + // Credit + Credit = AccountingServer.GetT9013S_AccountsTax(AccountParameters, Parameters.RowData.TaxInfo); + If Parameters.RowData.Agreement.Type = Enums.AgreementTypes.Customer Then + AccountingAnalytics.Credit = Credit.IncomingAccount; + Else + AccountingAnalytics.Credit = Credit.IncomingAccountReturn; + EndIf; + AccountingServer.SetCreditExtDimensions(Parameters, AccountingAnalytics, Parameters.RowData.TaxInfo); + + Return AccountingAnalytics; +EndFunction + // Advances from customers - Customers transactions Function GetAnalytics_OffsetOfAdvancesCustomer(Parameters) AccountingAnalytics = AccountingServer.GetAccountingAnalyticsResult(Parameters); diff --git a/IRP/src/Documents/DepreciationCalculation/Forms/DocumentForm/Form.form b/IRP/src/Documents/DepreciationCalculation/Forms/DocumentForm/Form.form index 62326158e3..3a38cdb18c 100644 --- a/IRP/src/Documents/DepreciationCalculation/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/DepreciationCalculation/Forms/DocumentForm/Form.form @@ -1851,6 +1851,68 @@ UserCmds Auto + + FormShowRowKey + 124 + true + true + + true + + + FormShowRowKeyExtendedTooltip + 125 + true + true + + true + + Label + true + true + + Left + + + Form.Command.ShowRowKey + Auto + true + true + UserCmds + Auto + InAdditionalSubmenu + + + FormShowHiddenTables + 126 + true + true + + true + + + FormShowHiddenTablesExtendedTooltip + 127 + true + true + + true + + Label + true + true + + Left + + + Form.Command.ShowHiddenTables + Auto + true + true + UserCmds + Auto + InAdditionalSubmenu + true true @@ -2085,6 +2147,62 @@ Picture Auto + + ShowHiddenTables + + <key>en</key> + <value>Show hidden tables</value> + + + <key>ru</key> + <value>Показать скрытые таблицы</value> + + + <key>tr</key> + <value>Gizli tabloları göster</value> + + 4 + + true + + + StdPicture.ShowData + + + + ShowHiddenTables + + + Auto + + + ShowRowKey + + <key>en</key> + <value>Show row key</value> + + + <key>ru</key> + <value>Показать row key</value> + + + <key>tr</key> + <value>Satır antahtarı göster</value> + + 5 + + true + + + StdPicture.GetURL + + + + ShowRowKey + + + Auto + diff --git a/IRP/src/Documents/DepreciationCalculation/Forms/DocumentForm/Module.bsl b/IRP/src/Documents/DepreciationCalculation/Forms/DocumentForm/Module.bsl index e50487f444..809b699c2b 100644 --- a/IRP/src/Documents/DepreciationCalculation/Forms/DocumentForm/Module.bsl +++ b/IRP/src/Documents/DepreciationCalculation/Forms/DocumentForm/Module.bsl @@ -111,6 +111,16 @@ Procedure UpdateAccountingData() ThisObject.AccountingExtDimensions.Load(_AccountingExtDimensions); EndProcedure +&AtClient +Procedure ShowRowKey(Command) + DocumentsClient.ShowRowKey(ThisObject); +EndProcedure + +&AtClient +Procedure ShowHiddenTables(Command) + DocumentsClient.ShowHiddenTables(Object, ThisObject); +EndProcedure + #EndRegion #Region TITLE_DECORATIONS diff --git a/IRP/src/Documents/DepreciationCalculation/ManagerModule.bsl b/IRP/src/Documents/DepreciationCalculation/ManagerModule.bsl index 310ddf5879..f32f91c99f 100644 --- a/IRP/src/Documents/DepreciationCalculation/ManagerModule.bsl +++ b/IRP/src/Documents/DepreciationCalculation/ManagerModule.bsl @@ -134,8 +134,15 @@ EndFunction Function R8510B_BookValueOfFixedAsset() Return "SELECT - | *, + | Calculations.Company, + | Calculations.Branch, + | Calculations.ProfitLossCenter, + | Calculations.FixedAsset, + | Calculations.LedgerType, + | Calculations.Schedule, + | Calculations.Amount, | &Date AS Period, + | Calculations.Ref.Company.LandedCostCurrencyMovementType.Currency AS Currency, | VALUE(AccumulationRecordType.Expense) AS RecordType |INTO R8510B_BookValueOfFixedAsset |FROM @@ -147,8 +154,15 @@ EndFunction Function R5022T_Expenses() Return "SELECT - | *, - | &Date AS Period + | Calculations.Company, + | Calculations.Branch, + | Calculations.ProfitLossCenter, + | Calculations.FixedAsset, + | Calculations.LedgerType, + | Calculations.ExpenseType, + | Calculations.Amount, + | &Date AS Period, + | Calculations.Ref.Company.LandedCostCurrencyMovementType.Currency AS Currency |INTO R5022T_Expenses |FROM | Calculations diff --git a/IRP/src/Documents/EmployeeCashAdvance/EmployeeCashAdvance.mdo b/IRP/src/Documents/EmployeeCashAdvance/EmployeeCashAdvance.mdo index 4e4578fd7f..5ff42d475d 100644 --- a/IRP/src/Documents/EmployeeCashAdvance/EmployeeCashAdvance.mdo +++ b/IRP/src/Documents/EmployeeCashAdvance/EmployeeCashAdvance.mdo @@ -14,7 +14,7 @@ ru - Подотчет сотрудника + Авансовый отчет сотрудника tr @@ -64,7 +64,7 @@ ru - Подотчет сотрудника + Авансовый отчет сотрудника tr @@ -99,6 +99,7 @@ AccumulationRegister.R5012B_VendorsAging AccumulationRegister.T1040T_AccountingAmounts AccumulationRegister.R5020B_PartnersBalance + AccumulationRegister.R1040B_TaxesOutgoing true true DontUse diff --git a/IRP/src/Documents/EmployeeCashAdvance/ManagerModule.bsl b/IRP/src/Documents/EmployeeCashAdvance/ManagerModule.bsl index 7afa5f68a5..c216cb476e 100644 --- a/IRP/src/Documents/EmployeeCashAdvance/ManagerModule.bsl +++ b/IRP/src/Documents/EmployeeCashAdvance/ManagerModule.bsl @@ -11,6 +11,7 @@ EndFunction Function PostingGetDocumentDataTables(Ref, Cancel, PostingMode, Parameters, AddInfo = Undefined) Export Tables = New Structure; QueryArray = GetQueryTextsSecondaryTables(); + Parameters.Insert("QueryParameters", GetAdditionalQueryParameters(Ref)); PostingServer.ExecuteQuery(Ref, QueryArray, Parameters); AccountingServer.CreateAccountingDataTables(Ref, Cancel, PostingMode, Parameters, AddInfo); @@ -30,6 +31,7 @@ Procedure PostingCheckBeforeWrite(Ref, Cancel, PostingMode, Parameters, AddInfo Tables.R3027B_EmployeeCashAdvance.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); Tables.R5022T_Expenses.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); + Tables.R1040B_TaxesOutgoing.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); Tables.R1020B_AdvancesToVendors.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); Tables.R5020B_PartnersBalance.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); Tables.T1040T_AccountingAmounts.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); @@ -82,6 +84,7 @@ EndFunction Function GetAdditionalQueryParameters(Ref) StrParams = New Structure; StrParams.Insert("Ref", Ref); + StrParams.Insert("Vat", TaxesServer.GetVatRef()); Return StrParams; EndFunction @@ -98,6 +101,7 @@ Function GetQueryTextsMasterTables() QueryArray.Add(R5010B_ReconciliationStatement()); QueryArray.Add(R5012B_VendorsAging()); QueryArray.Add(R5022T_Expenses()); + QueryArray.Add(R1040B_TaxesOutgoing()); QueryArray.Add(T2015S_TransactionsInfo()); QueryArray.Add(R5020B_PartnersBalance()); QueryArray.Add(T1040T_AccountingAmounts()); @@ -118,6 +122,7 @@ Function PaymentList() | PaymentList.NetAmount AS NetAmount, | PaymentList.TaxAmount AS TaxAmount, | PaymentList.TotalAmount AS TotalAmount, + | PaymentList.VatRate AS VatRate, | PaymentList.Key, | PaymentList.ProfitLossCenter, | PaymentList.AdditionalAnalytic, @@ -207,6 +212,27 @@ Function R5020B_PartnersBalance() Return AccumulationRegisters.R5020B_PartnersBalance.R5020B_PartnersBalance_ECA(); EndFunction +Function R1040B_TaxesOutgoing() + Return + "SELECT + | VALUE(AccumulationRecordType.Receipt) AS RecordType, + | PaymentList.Period, + | PaymentList.Company, + | PaymentList.Branch, + | PaymentList.Currency, + | PaymentList.Key, + | &Vat AS Tax, + | PaymentList.VatRate AS TaxRate, + | VALUE(Enum.InvoiceType.Invoice) AS InvoiceType, + | PaymentList.TaxAmount AS Amount + |INTO R1040B_TaxesOutgoing + |FROM + | PaymentList AS PaymentList + |WHERE + | PaymentList.IsExpense + | AND PaymentList.TaxAmount <> 0"; +EndFunction + #EndRegion #Region AccessObject @@ -253,28 +279,42 @@ Function T1040T_AccountingAmounts() | PaymentList.Key AS RowKey, | PaymentList.Key AS Key, | PaymentList.Currency, - | PaymentList.TotalAmount, + | PaymentList.NetAmount, | VALUE(Catalog.AccountingOperations.EmployeeCashAdvance_DR_R5022T_Expenses_CR_R3027B_EmployeeCashAdvance) AS | Operation, | UNDEFINED AS AdvancesClosing |FROM | PaymentList AS PaymentList |WHERE - | NOT PaymentList.IsPurchase"; + | PaymentList.IsExpense + | + |UNION ALL + | + |SELECT + | PaymentList.Period, + | PaymentList.Key AS RowKey, + | PaymentList.Key AS Key, + | PaymentList.Currency, + | PaymentList.TaxAmount, + | VALUE(Catalog.AccountingOperations.EmployeeCashAdvance_DR_R1040B_TaxesOutgoing_CR_R3027B_EmployeeCashAdvance) AS + | Operation, + | UNDEFINED AS AdvancesClosing + |FROM + | PaymentList AS PaymentList + |WHERE + | PaymentList.IsExpense And PaymentList.TaxAmount <> 0"; EndFunction - Function GetAccountingAnalytics(Parameters) Export AO = Catalogs.AccountingOperations; If Parameters.Operation = AO.EmployeeCashAdvance_DR_R1021B_VendorsTransactions_CR_R3027B_EmployeeCashAdvance Then - Return GetAnalytics_DR_R1021B_VendorsTransactions_CR_R3027B_EmployeeCashAdvance(Parameters); // Vendor transactions - Employee cash advance - ElsIf Parameters.Operation = AO.EmployeeCashAdvance_DR_R5022T_Expenses_CR_R3027B_EmployeeCashAdvance Then - Return GetAnalytics_DR_R5022T_Expenses_CR_R3027B_EmployeeCashAdvance(Parameters); // Expenses - Employee cash advance - + ElsIf Parameters.Operation = AO.EmployeeCashAdvance_DR_R1040B_TaxesOutgoing_CR_R3027B_EmployeeCashAdvance Then + Return GetAnalytics_DR_R1040B_TaxesOutgoing_CR_R3027B_EmployeeCashAdvance(Parameters); // Taxes outgoing - Employee cash advance EndIf; + Return Undefined; EndFunction @@ -308,6 +348,24 @@ Function GetAnalytics_DR_R1021B_VendorsTransactions_CR_R3027B_EmployeeCashAdvanc EndFunction // Expenses - Employee cash advance +Function GetAnalytics_DR_R1040B_TaxesOutgoing_CR_R3027B_EmployeeCashAdvance(Parameters) + AccountingAnalytics = AccountingServer.GetAccountingAnalyticsResult(Parameters); + AccountParameters = AccountingServer.GetAccountParameters(Parameters); + + // Debit + Debit = AccountingServer.GetT9013S_AccountsTax(AccountParameters, Parameters.RowData.TaxInfo); + AccountingAnalytics.Debit = Debit.OutgoingAccount; + AccountingServer.SetDebitExtDimensions(Parameters, AccountingAnalytics, Parameters.RowData.TaxInfo); + + // Credit + Credit = AccountingServer.GetT9016S_AccountsEmployee(AccountParameters, Parameters.ObjectData.Partner); + AccountingAnalytics.Credit = Credit.AccountCashAdvance; + AccountingServer.SetCreditExtDimensions(Parameters, AccountingAnalytics); + + Return AccountingAnalytics; +EndFunction + +// Tax outgoing - Employee cash advance Function GetAnalytics_DR_R5022T_Expenses_CR_R3027B_EmployeeCashAdvance(Parameters) AccountingAnalytics = AccountingServer.GetAccountingAnalyticsResult(Parameters); AccountParameters = AccountingServer.GetAccountParameters(Parameters); diff --git a/IRP/src/Documents/EmployeeFiring/EmployeeFiring.mdo b/IRP/src/Documents/EmployeeFiring/EmployeeFiring.mdo index ce9adb5f43..b41be09564 100644 --- a/IRP/src/Documents/EmployeeFiring/EmployeeFiring.mdo +++ b/IRP/src/Documents/EmployeeFiring/EmployeeFiring.mdo @@ -91,6 +91,7 @@ Document.EmployeeFiring.Form.ChoiceForm Deny InformationRegister.T9510S_Staffing + AccumulationRegister.R9541T_VacationUsage true true DontUse diff --git a/IRP/src/Documents/EmployeeFiring/ManagerModule.bsl b/IRP/src/Documents/EmployeeFiring/ManagerModule.bsl index bdddc6c3a5..d5b965d266 100644 --- a/IRP/src/Documents/EmployeeFiring/ManagerModule.bsl +++ b/IRP/src/Documents/EmployeeFiring/ManagerModule.bsl @@ -96,6 +96,7 @@ EndFunction Function GetQueryTextsMasterTables() QueryArray = New Array; QueryArray.Add(T9510S_Staffing()); + QueryArray.Add(R9541T_VacationUsage()); Return QueryArray; EndFunction @@ -121,6 +122,29 @@ Function T9510S_Staffing() | EmployeeFiring.Ref = &Ref"; EndFunction +Function R9541T_VacationUsage() + Return + "SELECT + | VALUE(AccumulationRecordType.Expense) AS RecordType, + | EmployeeFiring.Date AS Period, + | EmployeeFiring.Company, + | EmployeeFiring.Employee, + | ISNULL(R9541T_VacationUsageBalance.DaysBalance, 0) + ISNULL(R9541T_VacationUsageTurnovers.DaysExpense, 0) AS Days + |INTO R9541T_VacationUsage + |FROM + | Document.EmployeeFiring AS EmployeeFiring + | LEFT JOIN AccumulationRegister.R9541T_VacationUsage.Balance AS R9541T_VacationUsageBalance + | ON EmployeeFiring.Company = R9541T_VacationUsageBalance.Company + | AND EmployeeFiring.Employee = R9541T_VacationUsageBalance.Employee + | LEFT JOIN AccumulationRegister.R9541T_VacationUsage.Turnovers(,, Recorder,) AS R9541T_VacationUsageTurnovers + | ON R9541T_VacationUsageTurnovers.Recorder = &Ref + | AND R9541T_VacationUsageTurnovers.Company = EmployeeFiring.Company + | AND R9541T_VacationUsageTurnovers.Employee = EmployeeFiring.Employee + |WHERE + | EmployeeFiring.Ref = &Ref + | AND ISNULL(R9541T_VacationUsageBalance.DaysBalance, 0) + ISNULL(R9541T_VacationUsageTurnovers.DaysExpense, 0) <> 0"; +EndFunction + #EndRegion #Region AccessObject diff --git a/IRP/src/Documents/EmployeeHiring/EmployeeHiring.mdo b/IRP/src/Documents/EmployeeHiring/EmployeeHiring.mdo index 579ab0eee1..7a21d54d52 100644 --- a/IRP/src/Documents/EmployeeHiring/EmployeeHiring.mdo +++ b/IRP/src/Documents/EmployeeHiring/EmployeeHiring.mdo @@ -304,6 +304,33 @@ Use Use + + VacationDayLimit + + en + Vacation day limit + + + ru + Лимит дней отпуска + + + tr + Vacation day limit + + + Number + + 3 + true + + + + + + Use + Use + DocumentForm diff --git a/IRP/src/Documents/EmployeeHiring/Forms/DocumentForm/Form.form b/IRP/src/Documents/EmployeeHiring/Forms/DocumentForm/Form.form index a3b9ad6526..9a81d9dff0 100644 --- a/IRP/src/Documents/EmployeeHiring/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/EmployeeHiring/Forms/DocumentForm/Form.form @@ -871,6 +871,7 @@ true Tumbler + true en @@ -1174,6 +1175,191 @@ Auto + + GroupVacationLimit + 1516 + + VacationDaysType + 1518 + true + true + + true + + + VacationDaysType + + + OnChange + VacationDaysTypeOnChange + + + VacationDaysTypeExtendedTooltip + 1520 + true + true + + true + + Label + true + true + + Left + + + + VacationDaysTypeContextMenu + 1519 + true + true + + true + + true + + RadioButtonField + Enter + true + Left + true + + Tumbler + true + + + en + By company + + + ru + По компании + + + tr + By company + + + ByCompany + + + + + en + Personal + + + ru + Личный + + + tr + Kişisel + + + Personal + + + + + + VacationDays + 1521 + true + true + + true + + + VacationDays + + None + + OnChange + VacationDaysOnChange + + + VacationDaysExtendedTooltip + 1523 + true + true + + true + + Label + true + true + + Left + + + + VacationDaysContextMenu + 1522 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + true + + + true + true + + true + + + <key>en</key> + <value>Group of vacation limit</value> + + + <key>ru</key> + <value>Группа лимита отпусков</value> + + + <key>tr</key> + <value>Group of vacation limit</value> + + + GroupVacationLimitExtendedTooltip + 1517 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + HorizontalIfPossible + Auto + true + true + Auto + Auto + + true true @@ -1883,6 +2069,92 @@ true + + VacationDays + + <key>en</key> + <value>Vacation days</value> + + + <key>ru</key> + <value>Дней отпуска</value> + + + <key>tr</key> + <value>Vacation days</value> + + 12 + + Number + + 3 + true + + + + true + + + true + + + + VacationDaysType + + <key>en</key> + <value>Vacation days</value> + + + <key>ru</key> + <value>Дней отпуска</value> + + + <key>tr</key> + <value>Vacation days</value> + + 13 + + String + + 10 + + + + true + + + true + + + + VacationDaysCompany + + <key>en</key> + <value>Vacation days (company)</value> + + + <key>ru</key> + <value>Дней отпуска (компания)</value> + + + <key>tr</key> + <value>Vacation days (company)</value> + + 14 + + Number + + 3 + true + + + + true + + + true + + ShowRowKey diff --git a/IRP/src/Documents/EmployeeHiring/Forms/DocumentForm/Module.bsl b/IRP/src/Documents/EmployeeHiring/Forms/DocumentForm/Module.bsl index 6477cb35c5..dfd5b9aec9 100644 --- a/IRP/src/Documents/EmployeeHiring/Forms/DocumentForm/Module.bsl +++ b/IRP/src/Documents/EmployeeHiring/Forms/DocumentForm/Module.bsl @@ -11,10 +11,20 @@ EndProcedure &AtServer Procedure OnCreateAtServer(Cancel, StandardProcessing) DocEmployeeHiringServer.OnCreateAtServer(Object, ThisObject, Cancel, StandardProcessing); + ThisObject.SalaryType = ?(ValueIsFilled(Object.PersonalSalary),"Personal", "ByPosition"); - If Parameters.Key.IsEmpty() Then - SetVisibilityAvailability(Object, ThisObject); + + ThisObject.VacationDaysCompany = + InformationRegisters.T9545S_VacationDaysLimits.GetLimit(Object.Date, Object.Company); + If ValueIsFilled(ThisObject.VacationDays) Then + ThisObject.VacationDays = Object.VacationDayLimit; + ThisObject.VacationDaysType = "Personal"; + Else + ThisObject.VacationDays = ThisObject.VacationDaysCompany; + ThisObject.VacationDaysType = "ByCompany"; EndIf; + + SetVisibilityAvailability(Object, ThisObject); EndProcedure &AtServer @@ -62,6 +72,12 @@ Procedure SetVisibilityAvailability(Object, Form) Else Form.Items.GroupSalaryAmount.CurrentPage = Form.Items.GroupSalaryByPosition; EndIf; + + If Form.VacationDaysType = "Personal" Then + Form.Items.VacationDays.ReadOnly = False; + Else + Form.Items.VacationDays.ReadOnly = True; + EndIf; EndProcedure &AtClient @@ -73,6 +89,23 @@ Procedure SalaryTypeOnChange(Item) SetVisibilityAvailability(Object, ThisObject); EndProcedure +&AtClient +Procedure VacationDaysTypeOnChange(Item) + If ThisObject.VacationDaysType = "ByCompany" Then + Object.VacationDayLimit = 0; + ThisObject.VacationDays = ThisObject.VacationDaysCompany; + Else + Object.VacationDayLimit = ThisObject.VacationDays; + EndIf; + + SetVisibilityAvailability(Object, ThisObject); +EndProcedure + +&AtClient +Procedure VacationDaysOnChange(Item) + Object.VacationDayLimit = ThisObject.VacationDays; +EndProcedure + &AtClient Procedure _IdeHandler() ViewClient_V2.ViewIdleHandler(ThisObject, Object); diff --git a/IRP/src/Documents/EmployeeHiring/ManagerModule.bsl b/IRP/src/Documents/EmployeeHiring/ManagerModule.bsl index 1c6d20c4fd..1b4106da0a 100644 --- a/IRP/src/Documents/EmployeeHiring/ManagerModule.bsl +++ b/IRP/src/Documents/EmployeeHiring/ManagerModule.bsl @@ -14,7 +14,7 @@ Function PostingGetDocumentDataTables(Ref, Cancel, PostingMode, Parameters, AddI Parameters.Insert("QueryParameters", GetAdditionalQueryParameters(Ref)); ClearSelfRecords(Ref); - If ValueIsFilled(Ref.PersonalSalary) And ValueIsFilled(Ref.AccrualType) And PostingMode <> Undefined Then + If PostingMode <> Undefined Then WriteSelfRecords(Ref); EndIf; @@ -155,6 +155,8 @@ EndFunction Procedure ClearSelfRecords(Ref) Query = New Query(); + Query.SetParameter("Document", Ref); + Query.Text = "SELECT | Table.EmployeeOrPosition, @@ -164,7 +166,6 @@ Procedure ClearSelfRecords(Ref) | InformationRegister.T9500S_AccrualAndDeductionValues AS Table |WHERE | Table.Document = &Document"; - Query.SetParameter("Document", Ref); QueryResult = Query.Execute(); QuerySelection = QueryResult.Select(); @@ -176,21 +177,58 @@ Procedure ClearSelfRecords(Ref) RecordSet.Clear(); RecordSet.Write(); EndDo; + + Query.Text = + "SELECT + | T9545S_VacationDaysLimits.Period, + | T9545S_VacationDaysLimits.Company, + | T9545S_VacationDaysLimits.Employee + |FROM + | InformationRegister.T9545S_VacationDaysLimits AS T9545S_VacationDaysLimits + |WHERE + | T9545S_VacationDaysLimits.Document = &Document"; + QuerySelection = Query.Execute().Select(); + While QuerySelection.Next() Do + RecordManager = InformationRegisters.T9545S_VacationDaysLimits.CreateRecordManager(); + RecordManager.Period = QuerySelection.Period; + RecordManager.Company = QuerySelection.Company; + RecordManager.Employee = QuerySelection.Employee; + RecordManager.Read(); + If RecordManager.Selected() Then + RecordManager.Delete(); + EndIf; + EndDo; EndProcedure Procedure WriteSelfRecords(Ref) - RecordSet = InformationRegisters.T9500S_AccrualAndDeductionValues.CreateRecordSet(); - RecordSet.Filter.EmployeeOrPosition.Set(Ref.Employee); - RecordSet.Filter.AccualOrDeductionType.Set(Ref.AccrualType); - NewRecord = RecordSet.Add(); - NewRecord.Period = Ref.Date; - NewRecord.EmployeeOrPosition = Ref.Employee; - NewRecord.AccualOrDeductionType = Ref.AccrualType; - NewRecord.Value = Ref.PersonalSalary; - NewRecord.Document = Ref; + If ValueIsFilled(Ref.PersonalSalary) And ValueIsFilled(Ref.AccrualType) Then + RecordSet = InformationRegisters.T9500S_AccrualAndDeductionValues.CreateRecordSet(); + RecordSet.Filter.EmployeeOrPosition.Set(Ref.Employee); + RecordSet.Filter.AccualOrDeductionType.Set(Ref.AccrualType); + NewRecord = RecordSet.Add(); + + NewRecord.Period = Ref.Date; + NewRecord.EmployeeOrPosition = Ref.Employee; + NewRecord.AccualOrDeductionType = Ref.AccrualType; + NewRecord.Value = Ref.PersonalSalary; + NewRecord.Document = Ref; + + RecordSet.Write(); + EndIf; + + If Ref.VacationDayLimit > 0 Then + RecordManager = InformationRegisters.T9545S_VacationDaysLimits.CreateRecordManager(); + + RecordManager.Period = Ref.Date; + RecordManager.Company = Ref.Company; + RecordManager.Employee = Ref.Employee; + RecordManager.DayLimit = Ref.VacationDayLimit; + RecordManager.Document = Ref; + + RecordManager.Write(); + EndIf; - RecordSet.Write(); EndProcedure #EndRegion diff --git a/IRP/src/Documents/EmployeeVacation/EmployeeVacation.mdo b/IRP/src/Documents/EmployeeVacation/EmployeeVacation.mdo index 9525e8651a..9d405a6bc8 100644 --- a/IRP/src/Documents/EmployeeVacation/EmployeeVacation.mdo +++ b/IRP/src/Documents/EmployeeVacation/EmployeeVacation.mdo @@ -91,6 +91,7 @@ <defaultChoiceForm>Document.EmployeeVacation.Form.ChoiceForm</defaultChoiceForm> <realTimePosting>Deny</realTimePosting> <registerRecords>InformationRegister.T9540S_EmployeeVacations</registerRecords> + <registerRecords>AccumulationRegister.R9541T_VacationUsage</registerRecords> <postInPrivilegedMode>true</postInPrivilegedMode> <unpostInPrivilegedMode>true</unpostInPrivilegedMode> <choiceHistoryOnInput>DontUse</choiceHistoryOnInput> @@ -278,6 +279,32 @@ <dataHistory>Use</dataHistory> <fullTextSearch>Use</fullTextSearch> </attributes> + <attributes uuid="4746d8a1-4acc-4d7a-a05c-7681f81a9b8e"> + <name>PaidDays</name> + <synonym> + <key>en</key> + <value>Paid days</value> + </synonym> + <synonym> + <key>ru</key> + <value>Оплачиваемые дни</value> + </synonym> + <synonym> + <key>tr</key> + <value>Paid days</value> + </synonym> + <type> + <types>Number</types> + <numberQualifiers> + <precision>3</precision> + <nonNegative>true</nonNegative> + </numberQualifiers> + </type> + <minValue xsi:type="core:UndefinedValue"/> + <maxValue xsi:type="core:UndefinedValue"/> + <dataHistory>Use</dataHistory> + <fullTextSearch>Use</fullTextSearch> + </attributes> </tabularSections> <tabularSections uuid="0ec660d1-4fc2-41e2-908f-27df1ad30bcb"> <producedTypes> diff --git a/IRP/src/Documents/EmployeeVacation/Forms/DocumentForm/Form.form b/IRP/src/Documents/EmployeeVacation/Forms/DocumentForm/Form.form index 34a325734f..be754eb27e 100644 --- a/IRP/src/Documents/EmployeeVacation/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/EmployeeVacation/Forms/DocumentForm/Form.form @@ -629,6 +629,10 @@ <dataPath xsi:type="form:DataPath"> <segments>Object.EmployeeList.Employee</segments> </dataPath> + <handlers> + <event>OnChange</event> + <name>EmployeeListEmployeeOnChange</name> + </handlers> <extendedTooltip> <name>EmployeeListEmployeeExtendedTooltip</name> <id>1496</id> @@ -679,6 +683,10 @@ <dataPath xsi:type="form:DataPath"> <segments>Object.EmployeeList.BeginDate</segments> </dataPath> + <handlers> + <event>OnChange</event> + <name>EmployeeListBeginDateOnChange</name> + </handlers> <extendedTooltip> <name>EmployeeListBeginDateExtendedTooltip</name> <id>1499</id> @@ -729,6 +737,10 @@ <dataPath xsi:type="form:DataPath"> <segments>Object.EmployeeList.EndDate</segments> </dataPath> + <handlers> + <event>OnChange</event> + <name>EmployeeListEndDateOnChange</name> + </handlers> <extendedTooltip> <name>EmployeeListEndDateExtendedTooltip</name> <id>1502</id> @@ -768,6 +780,265 @@ <textEdit>true</textEdit> </extInfo> </items> + <items xsi:type="form:FormField"> + <name>EmployeeListPaidDays</name> + <id>1506</id> + <titleTextColor xsi:type="core:ColorDef"> + <red>51</red> + <green>102</green> + <blue>255</blue> + </titleTextColor> + <titleFont xsi:type="core:FontRef"> + <font>Style.NormalTextFont</font> + <bold>true</bold> + <italic>false</italic> + <underline>false</underline> + <strikeout>false</strikeout> + </titleFont> + <visible>true</visible> + <enabled>true</enabled> + <userVisible> + <common>true</common> + </userVisible> + <dataPath xsi:type="form:DataPath"> + <segments>Object.EmployeeList.PaidDays</segments> + </dataPath> + <handlers> + <event>OnChange</event> + <name>EmployeeListPaidDaysOnChange</name> + </handlers> + <extendedTooltip> + <name>EmployeeListPaidDaysExtendedTooltip</name> + <id>1508</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>EmployeeListPaidDaysContextMenu</name> + <id>1507</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> + <format> + <key>en</key> + <value>NZ=</value> + </format> + <format> + <key>ru</key> + <value>NZ=</value> + </format> + <format> + <key>tr</key> + <value>NZ=</value> + </format> + <editFormat> + <key>en</key> + <value>NZ=</value> + </editFormat> + <editFormat> + <key>ru</key> + <value>NZ=</value> + </editFormat> + <editFormat> + <key>tr</key> + <value>NZ=</value> + </editFormat> + <chooseType>true</chooseType> + <typeDomainEnabled>true</typeDomainEnabled> + <textEdit>true</textEdit> + </extInfo> + </items> + <items xsi:type="form:FormField"> + <name>EmployeeListOwnCostDays</name> + <id>1503</id> + <visible>true</visible> + <enabled>true</enabled> + <userVisible> + <common>true</common> + </userVisible> + <dataPath xsi:type="form:DataPath"> + <segments>Object.EmployeeList.OwnCostDays</segments> + </dataPath> + <titleBackColor xsi:type="core:ColorRef"> + <color>Style.ReportHeaderBackColor</color> + </titleBackColor> + <extendedTooltip> + <name>EmployeeListOwnCostDaysExtendedTooltip</name> + <id>1505</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>EmployeeListOwnCostDaysContextMenu</name> + <id>1504</id> + <visible>true</visible> + <enabled>true</enabled> + <userVisible> + <common>true</common> + </userVisible> + <autoFill>true</autoFill> + </contextMenu> + <type>InputField</type> + <readOnly>true</readOnly> + <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> + <format> + <key>en</key> + <value>NZ=</value> + </format> + <format> + <key>ru</key> + <value>NZ=</value> + </format> + <format> + <key>tr</key> + <value>NZ=</value> + </format> + <editFormat> + <key>en</key> + <value>NZ=</value> + </editFormat> + <editFormat> + <key>ru</key> + <value>NZ=</value> + </editFormat> + <editFormat> + <key>tr</key> + <value>NZ=</value> + </editFormat> + <chooseType>true</chooseType> + <typeDomainEnabled>true</typeDomainEnabled> + <textEdit>true</textEdit> + <backColor xsi:type="core:ColorRef"> + <color>Style.ReportHeaderBackColor</color> + </backColor> + </extInfo> + </items> + <items xsi:type="form:FormField"> + <name>EmployeeListTotalDays</name> + <id>1509</id> + <titleFont xsi:type="core:FontRef"> + <font>Style.NormalTextFont</font> + <bold>true</bold> + <italic>false</italic> + <underline>false</underline> + <strikeout>false</strikeout> + </titleFont> + <visible>true</visible> + <enabled>true</enabled> + <userVisible> + <common>true</common> + </userVisible> + <dataPath xsi:type="form:DataPath"> + <segments>Object.EmployeeList.TotalDays</segments> + </dataPath> + <titleBackColor xsi:type="core:ColorRef"> + <color>Style.ReportHeaderBackColor</color> + </titleBackColor> + <extendedTooltip> + <name>EmployeeListTotalDaysExtendedTooltip</name> + <id>1511</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>EmployeeListTotalDaysContextMenu</name> + <id>1510</id> + <visible>true</visible> + <enabled>true</enabled> + <userVisible> + <common>true</common> + </userVisible> + <autoFill>true</autoFill> + </contextMenu> + <type>InputField</type> + <readOnly>true</readOnly> + <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> + <format> + <key>en</key> + <value>NZ=</value> + </format> + <format> + <key>ru</key> + <value>NZ=</value> + </format> + <format> + <key>tr</key> + <value>NZ=</value> + </format> + <editFormat> + <key>en</key> + <value>NZ=</value> + </editFormat> + <editFormat> + <key>ru</key> + <value>NZ=</value> + </editFormat> + <editFormat> + <key>tr</key> + <value>NZ=</value> + </editFormat> + <chooseType>true</chooseType> + <typeDomainEnabled>true</typeDomainEnabled> + <textEdit>true</textEdit> + <backColor xsi:type="core:ColorRef"> + <color>Style.ReportHeaderBackColor</color> + </backColor> + </extInfo> + </items> <autoCommandBar> <name>EmployeeListCommandBar</name> <id>1479</id> @@ -1525,6 +1796,69 @@ </edit> <main>true</main> <savedData>true</savedData> + <additionalColumns> + <tablePath xsi:type="form:DataPath"> + <segments>Object.EmployeeList</segments> + </tablePath> + <columns> + <name>TotalDays</name> + <title> + <key>en</key> + <value>Total</value> + + + <key>ru</key> + <value>Итого</value> + + + <key>tr</key> + <value>Toplam</value> + + 11 + + Number + + 3 + true + + + + true + + + true + + + + OwnCostDays + + <key>en</key> + <value>Own cost days</value> + + + <key>ru</key> + <value>Дней за свой счет</value> + + + <key>tr</key> + <value>Own cost days</value> + + 12 + + Number + + 3 + true + + + + true + + + true + + + Description diff --git a/IRP/src/Documents/EmployeeVacation/Forms/DocumentForm/Module.bsl b/IRP/src/Documents/EmployeeVacation/Forms/DocumentForm/Module.bsl index 0a09e11825..b8e4915b47 100644 --- a/IRP/src/Documents/EmployeeVacation/Forms/DocumentForm/Module.bsl +++ b/IRP/src/Documents/EmployeeVacation/Forms/DocumentForm/Module.bsl @@ -4,6 +4,9 @@ &AtServer Procedure OnReadAtServer(CurrentObject) DocEmployeeVacationServer.OnReadAtServer(Object, ThisObject, CurrentObject); + For Each EmployeeRow In Object.EmployeeList Do + CalculateEmployeeRowAtServer(EmployeeRow.GetID()); + EndDo; SetVisibilityAvailability(CurrentObject, ThisObject); EndProcedure //++ @@ -23,6 +26,9 @@ EndProcedure &AtServer Procedure AfterWriteAtServer(CurrentObject, WriteParameters) DocEmployeeVacationServer.AfterWriteAtServer(Object, ThisObject, CurrentObject, WriteParameters); + For Each EmployeeRow In Object.EmployeeList Do + CalculateEmployeeRowAtServer(EmployeeRow.GetID()); + EndDo; SetVisibilityAvailability(CurrentObject, ThisObject); EndProcedure @@ -76,6 +82,8 @@ EndProcedure #EndRegion +#Region FORM_ITEMS + #Region _DATE //++ &AtClient @@ -94,6 +102,32 @@ EndProcedure #EndRegion +&AtClient +Procedure EmployeeListEmployeeOnChange(Item) + CalculateEmployeeRow(Items.EmployeeList.CurrentData); +EndProcedure + +&AtClient +Procedure EmployeeListEndDateOnChange(Item) + CalculateEmployeeRow(Items.EmployeeList.CurrentData); +EndProcedure + +&AtClient +Procedure EmployeeListBeginDateOnChange(Item) + CalculateEmployeeRow(Items.EmployeeList.CurrentData); +EndProcedure + +&AtClient +Procedure EmployeeListPaidDaysOnChange(Item) + EmployeeRow = Items.EmployeeList.CurrentData; + If EmployeeRow.PaidDays > EmployeeRow.TotalDays Then + EmployeeRow.PaidDays = EmployeeRow.TotalDays; + EndIf; + EmployeeRow.OwnCostDays = EmployeeRow.TotalDays - EmployeeRow.PaidDays; +EndProcedure + +#EndRegion + #Region SERVICE //++ &AtClient @@ -200,4 +234,28 @@ Procedure ShowHiddenTables(Command) DocumentsClient.ShowHiddenTables(Object, ThisObject); EndProcedure +&AtClient +Procedure CalculateEmployeeRow(EmployeeRow) + If NOT ValueIsFilled(EmployeeRow.Employee) + OR NOT ValueIsFilled(EmployeeRow.BeginDate) + OR NOT ValueIsFilled(EmployeeRow.EndDate) + OR EmployeeRow.EndDate < EmployeeRow.BeginDate Then + EmployeeRow.TotalDays = 0; + EmployeeRow.PaidDays = 0; + EmployeeRow.OwnCostDays = 0; + Return; + EndIf; + CalculateEmployeeRowAtServer(EmployeeRow.GetID()); +EndProcedure + +&AtServer +Procedure CalculateEmployeeRowAtServer(EmployeeRowID) + EmployeeRow = Object.EmployeeList.FindByID(EmployeeRowID); + EmployeeRow.TotalDays = Max((EmployeeRow.EndDate - EmployeeRow.BeginDate) / 86400 + 1, 0); + If EmployeeRow.PaidDays = 0 Or EmployeeRow.PaidDays > EmployeeRow.TotalDays Then + EmployeeRow.PaidDays = EmployeeRow.TotalDays; + EndIf; + EmployeeRow.OwnCostDays = EmployeeRow.TotalDays - EmployeeRow.PaidDays; +EndProcedure + #EndRegion diff --git a/IRP/src/Documents/EmployeeVacation/ManagerModule.bsl b/IRP/src/Documents/EmployeeVacation/ManagerModule.bsl index c81aa2d262..5faa406011 100644 --- a/IRP/src/Documents/EmployeeVacation/ManagerModule.bsl +++ b/IRP/src/Documents/EmployeeVacation/ManagerModule.bsl @@ -49,13 +49,16 @@ Function PostingGetDocumentDataTables(Ref, Cancel, PostingMode, Parameters, AddI |SELECT | EmployeeList.Ref.Date AS Period, | DateTable.Date AS Date, + | EmployeeList.BeginDate AS BeginDate, + | EmployeeList.EndDate AS EndDate, + | EmployeeList.PaidDays AS PaidDays, | EmployeeList.Employee AS Employee, | EmployeeList.Ref.Company AS Company, | EmployeeList.Ref.Branch AS Branch |INTO EmployeeVacations |FROM | Document.EmployeeVacation.EmployeeList AS EmployeeList - | LEFT JOIN DateTable AS DateTable + | INNER JOIN DateTable AS DateTable | ON DateTable.Date >= EmployeeList.BeginDate | AND DateTable.Date <= EmployeeList.EndDate | AND EmployeeList.Ref = &Ref @@ -136,6 +139,7 @@ EndFunction Function GetAdditionalQueryParameters(Ref) StrParams = New Structure; StrParams.Insert("Ref", Ref); + StrParams.Insert("DateBefore", New Boundary(CommonFunctionsServer.GetRefAttribute(Ref, "Date"), BoundaryType.Excluding)); Return StrParams; EndFunction @@ -147,6 +151,7 @@ EndFunction Function GetQueryTextsMasterTables() QueryArray = New Array; QueryArray.Add(T9540S_EmployeeVacations()); + QueryArray.Add(R9541T_VacationUsage()); Return QueryArray; EndFunction @@ -173,6 +178,21 @@ Function T9540S_EmployeeVacations() | TRUE"; EndFUnction +Function R9541T_VacationUsage() + Return + "SELECT + | VALUE(AccumulationRecordType.Expense) AS RecordType, + | EmployeeVacations.Date AS Period, + | EmployeeVacations.Company, + | EmployeeVacations.Employee, + | 1 AS Days + |INTO R9541T_VacationUsage + |FROM + | EmployeeVacations AS EmployeeVacations + |WHERE + | EmployeeVacations.Date < DATEADD(EmployeeVacations.BeginDate, Day, EmployeeVacations.PaidDays)"; +EndFUnction + #EndRegion #Region AccessObject diff --git a/IRP/src/Documents/ForeignCurrencyRevaluation/ForeignCurrencyRevaluation.mdo b/IRP/src/Documents/ForeignCurrencyRevaluation/ForeignCurrencyRevaluation.mdo index 825f0c347a..ebdd8f7d4c 100644 --- a/IRP/src/Documents/ForeignCurrencyRevaluation/ForeignCurrencyRevaluation.mdo +++ b/IRP/src/Documents/ForeignCurrencyRevaluation/ForeignCurrencyRevaluation.mdo @@ -78,6 +78,8 @@ AccumulationRegister.R5020B_PartnersBalance AccumulationRegister.R3016B_ChequeAndBonds AccumulationRegister.R5015B_OtherPartnersTransactions + AccumulationRegister.R1040B_TaxesOutgoing + AccumulationRegister.R2040B_TaxesIncoming true true diff --git a/IRP/src/Documents/ForeignCurrencyRevaluation/ManagerModule.bsl b/IRP/src/Documents/ForeignCurrencyRevaluation/ManagerModule.bsl index 458ba62f7c..eb8dcc5bb3 100644 --- a/IRP/src/Documents/ForeignCurrencyRevaluation/ManagerModule.bsl +++ b/IRP/src/Documents/ForeignCurrencyRevaluation/ManagerModule.bsl @@ -38,6 +38,17 @@ Function PostingGetDocumentDataTables(Ref, Cancel, PostingMode, Parameters, AddI | and (CurrencyMovementType = VALUE(ChartOfCharacteristicTypes.CurrencyMovementType.SettlementCurrency) | or Currency <> TransactionCurrency)) AS Reg |; + |// active + |SELECT + | *, + | Reg.CurrencyMovementType.Source AS Source, + | Reg.AmountBalance AS Amount + |INTO _R1040B_TaxesOutgoing + |FROM + | AccumulationRegister.R1040B_TaxesOutgoing.Balance(&Period, Company = &Company + | and (CurrencyMovementType = VALUE(ChartOfCharacteristicTypes.CurrencyMovementType.SettlementCurrency) + | or Currency <> TransactionCurrency)) AS Reg + |; |// passive |SELECT | *, @@ -60,6 +71,17 @@ Function PostingGetDocumentDataTables(Ref, Cancel, PostingMode, Parameters, AddI | and (CurrencyMovementType = VALUE(ChartOfCharacteristicTypes.CurrencyMovementType.SettlementCurrency) | or Currency <> TransactionCurrency)) AS Reg |; + |// passive + |SELECT + | *, + | Reg.CurrencyMovementType.Source AS Source, + | Reg.AmountBalance AS Amount + |INTO _R2040B_TaxesIncoming + |FROM + | AccumulationRegister.R2040B_TaxesIncoming.Balance(&Period, Company = &Company + | and (CurrencyMovementType = VALUE(ChartOfCharacteristicTypes.CurrencyMovementType.SettlementCurrency) + | or Currency <> TransactionCurrency)) AS Reg + |; |// passive |SELECT | *, @@ -416,6 +438,24 @@ Function PostingGetDocumentDataTables(Ref, Cancel, PostingMode, Parameters, AddI | Reg.Source AS Source |FROM | _R5020B_PartnersBalance_OtherTransaction AS Reg + | + |UNION ALL + | + |SELECT + | Reg.TransactionCurrency AS CurrencyFrom, + | Reg.Currency AS CurrencyTo, + | Reg.Source AS Source + |FROM + | _R1040B_TaxesOutgoing AS Reg + | + |UNION ALL + | + |SELECT + | Reg.TransactionCurrency AS CurrencyFrom, + | Reg.Currency AS CurrencyTo, + | Reg.Source AS Source + |FROM + | _R2040B_TaxesIncoming AS Reg |; | |//////////////////////////////////////////////////////////////////////////////// @@ -468,11 +508,13 @@ Function PostingGetDocumentDataTables(Ref, Cancel, PostingMode, Parameters, AddI ArrayOfActives.Add("R3027B_EmployeeCashAdvance"); ArrayOfActives.Add("R5015B_OtherPartnersTransactions"); ArrayOfActives.Add("R8510B_BookValueOfFixedAsset"); +// ArrayOfActives.Add("R1040B_TaxesOutgoing"); ArrayOfPassives = New Array(); ArrayOfPassives.Add("R1021B_VendorsTransactions"); ArrayOfPassives.Add("R2020B_AdvancesFromCustomers"); ArrayOfPassives.Add("R9510B_SalaryPayment"); +// ArrayOfPassives.Add("R2040B_TaxesIncoming"); ArrayOfOthers = New Array(); ArrayOfOthers.Add("R3016B_ChequeAndBonds"); @@ -551,8 +593,7 @@ Function T1040T_AccountingAmounts() | Table.CurrencyMovementType, | Table.TransactionCurrency AS RevaluatedCurrency, | Table.AmountRevaluated AS Amount, - | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R2020B_AdvancesFromCustomers) AS - | Operation + | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R2020B_AdvancesFromCustomers) AS Operation |INTO T1040T_AccountingAmounts |FROM | Revaluated_R2020B_AdvancesFromCustomers AS Table @@ -570,8 +611,7 @@ Function T1040T_AccountingAmounts() | Table.CurrencyMovementType, | Table.TransactionCurrency, | Table.AmountRevaluated AS Amount, - | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R2020B_AdvancesFromCustomers_CR_R5021T_Revenues) AS - | Operation + | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R2020B_AdvancesFromCustomers_CR_R5021T_Revenues) AS Operation |FROM | Revaluated_R2020B_AdvancesFromCustomers AS Table |WHERE @@ -588,8 +628,7 @@ Function T1040T_AccountingAmounts() | Table.CurrencyMovementType, | Table.TransactionCurrency, | Table.AmountRevaluated AS Amount, - | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R1021B_VendorsTransactions) AS - | Operation + | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R1021B_VendorsTransactions) AS Operation |FROM | Revaluated_R1021B_VendorsTransactions AS Table |WHERE @@ -606,8 +645,7 @@ Function T1040T_AccountingAmounts() | Table.CurrencyMovementType, | Table.TransactionCurrency, | Table.AmountRevaluated AS Amount, - | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R1021B_VendorsTransactions_CR_R5021T_Revenues) AS - | Operation + | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R1021B_VendorsTransactions_CR_R5021T_Revenues) AS Operation |FROM | Revaluated_R1021B_VendorsTransactions AS Table |WHERE @@ -624,8 +662,7 @@ Function T1040T_AccountingAmounts() | Table.CurrencyMovementType, | Table.TransactionCurrency, | Table.AmountRevaluated AS Amount, - | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R9510B_SalaryPayment) AS - | Operation + | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R9510B_SalaryPayment) AS Operation |FROM | Revaluated_R9510B_SalaryPayment AS Table |WHERE @@ -642,14 +679,48 @@ Function T1040T_AccountingAmounts() | Table.CurrencyMovementType, | Table.TransactionCurrency, | Table.AmountRevaluated AS Amount, - | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R9510B_SalaryPayment_CR_R5021T_Revenues) AS - | Operation + | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R9510B_SalaryPayment_CR_R5021T_Revenues) AS Operation |FROM | Revaluated_R9510B_SalaryPayment AS Table |WHERE | Table.RecordType = Value(AccumulationRecordType.Expense) | AND Table.AmountRevaluated > 0 | +// |UNION ALL +// | +// |SELECT +// | Table.Period, +// | Table.Key AS RowKey, +// | Table.Key AS Key, +// | Table.Currency, +// | Table.CurrencyMovementType, +// | Table.TransactionCurrency, +// | Table.AmountRevaluated AS Amount, +// | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R2040B_TaxesIncoming) AS Operation +// |FROM +// | Revaluated_R2040B_TaxesIncoming AS Table +// |WHERE +// | Table.RecordType = Value(AccumulationRecordType.Receipt) +// | AND Table.AmountRevaluated > 0 +// | +// |UNION ALL +// | +// |SELECT +// | Table.Period, +// | Table.Key AS RowKey, +// | Table.Key AS Key, +// | Table.Currency, +// | Table.CurrencyMovementType, +// | Table.TransactionCurrency, +// | Table.AmountRevaluated AS Amount, +// | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R2040B_TaxesIncoming_CR_R5021T_Revenues) AS Operation +// |FROM +// | Revaluated_R2040B_TaxesIncoming AS Table +// |WHERE +// | Table.RecordType = Value(AccumulationRecordType.Expense) +// | AND Table.AmountRevaluated > 0 +// | + | // active RecordType.Receipt - Revenue RecordType.Expense - Expense |UNION ALL | @@ -695,8 +766,7 @@ Function T1040T_AccountingAmounts() | Table.CurrencyMovementType, | Table.TransactionCurrency, | Table.AmountRevaluated AS Amount, - | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R1020B_AdvancesToVendors) AS - | Operation + | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R1020B_AdvancesToVendors) AS Operation |FROM | Revaluated_R1020B_AdvancesToVendors AS Table |WHERE @@ -713,8 +783,7 @@ Function T1040T_AccountingAmounts() | Table.CurrencyMovementType, | Table.TransactionCurrency, | Table.AmountRevaluated AS Amount, - | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R1020B_AdvancesToVendors_CR_R5021T_Revenues) AS - | Operation + | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R1020B_AdvancesToVendors_CR_R5021T_Revenues) AS Operation |FROM | Revaluated_R1020B_AdvancesToVendors AS Table |WHERE @@ -731,8 +800,7 @@ Function T1040T_AccountingAmounts() | Table.CurrencyMovementType, | Table.TransactionCurrency, | Table.AmountRevaluated AS Amount, - | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R2021B_CustomersTransactions) AS - | Operation + | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R2021B_CustomersTransactions) AS Operation |FROM | Revaluated_R2021B_CustomersTransactions AS Table |WHERE @@ -749,8 +817,7 @@ Function T1040T_AccountingAmounts() | Table.CurrencyMovementType, | Table.TransactionCurrency, | Table.AmountRevaluated AS Amount, - | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R2021B_CustomersTransactions_CR_R5021T_Revenues) AS - | Operation + | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R2021B_CustomersTransactions_CR_R5021T_Revenues) AS Operation |FROM | Revaluated_R2021B_CustomersTransactions AS Table |WHERE @@ -801,8 +868,7 @@ Function T1040T_AccountingAmounts() | Table.CurrencyMovementType, | Table.TransactionCurrency, | Table.AmountRevaluated AS Amount, - | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R3027B_EmployeeCashAdvance) AS - | Operation + | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R3027B_EmployeeCashAdvance) AS Operation |FROM | Revaluated_R3027B_EmployeeCashAdvance AS Table |WHERE @@ -819,8 +885,7 @@ Function T1040T_AccountingAmounts() | Table.CurrencyMovementType, | Table.TransactionCurrency, | Table.AmountRevaluated AS Amount, - | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R3027B_EmployeeCashAdvance_CR_R5021T_Revenues) AS - | Operation + | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R3027B_EmployeeCashAdvance_CR_R5021T_Revenues) AS Operation |FROM | Revaluated_R3027B_EmployeeCashAdvance AS Table |WHERE @@ -837,8 +902,7 @@ Function T1040T_AccountingAmounts() | Table.CurrencyMovementType, | Table.TransactionCurrency, | Table.AmountRevaluated AS Amount, - | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R5015B_OtherPartnersTransactions) AS - | Operation + | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R5015B_OtherPartnersTransactions) AS Operation |FROM | Revaluated_R5015B_OtherPartnersTransactions AS Table |WHERE @@ -855,8 +919,7 @@ Function T1040T_AccountingAmounts() | Table.CurrencyMovementType, | Table.TransactionCurrency, | Table.AmountRevaluated AS Amount, - | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5015B_OtherPartnersTransactions_CR_R5021T_Revenues) AS - | Operation + | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5015B_OtherPartnersTransactions_CR_R5021T_Revenues) AS Operation |FROM | Revaluated_R5015B_OtherPartnersTransactions AS Table |WHERE @@ -873,8 +936,7 @@ Function T1040T_AccountingAmounts() | Table.CurrencyMovementType, | Table.TransactionCurrency, | Table.AmountRevaluated AS Amount, - | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R8510B_BookValueOfFixedAsset) AS - | Operation + | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R8510B_BookValueOfFixedAsset) AS Operation |FROM | Revaluated_R8510B_BookValueOfFixedAsset AS Table |WHERE @@ -891,15 +953,46 @@ Function T1040T_AccountingAmounts() | Table.CurrencyMovementType, | Table.TransactionCurrency, | Table.AmountRevaluated AS Amount, - | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R8510B_BookValueOfFixedAsset_CR_R5021T_Revenues) AS - | Operation + | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R8510B_BookValueOfFixedAsset_CR_R5021T_Revenues) AS Operation |FROM | Revaluated_R8510B_BookValueOfFixedAsset AS Table |WHERE | Table.RecordType = Value(AccumulationRecordType.Receipt) | AND Table.AmountRevaluated > 0"; - - //R3010B_CashOnHand +// | +// |UNION ALL +// | +// |SELECT +// | Table.Period, +// | Table.Key AS RowKey, +// | Table.Key AS Key, +// | Table.Currency, +// | Table.CurrencyMovementType, +// | Table.TransactionCurrency, +// | Table.AmountRevaluated AS Amount, +// | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R1040B_TaxesOutgoing) AS Operation +// |FROM +// | Revaluated_R1040B_TaxesOutgoing AS Table +// |WHERE +// | Table.RecordType = Value(AccumulationRecordType.Expense) +// | AND Table.AmountRevaluated > 0 +// | +// |UNION ALL +// | +// |SELECT +// | Table.Period, +// | Table.Key AS RowKey, +// | Table.Key AS Key, +// | Table.Currency, +// | Table.CurrencyMovementType, +// | Table.TransactionCurrency, +// | Table.AmountRevaluated AS Amount, +// | VALUE(Catalog.AccountingOperations.ForeignCurrencyRevaluation_DR_R1040B_TaxesOutgoing_CR_R5021T_Revenues) AS Operation +// |FROM +// | Revaluated_R1040B_TaxesOutgoing AS Table +// |WHERE +// | Table.RecordType = Value(AccumulationRecordType.Receipt) +// | AND Table.AmountRevaluated > 0"; EndFunction Function GetAccountingDataTable(Operation, AddInfo) Export @@ -940,9 +1033,17 @@ Function GetAccountingDataTable(Operation, AddInfo) Export "SELECT * FROM Revaluated_R9510B_SalaryPayment AS Table WHERE |Table.RecordType = Value(AccumulationRecordType.Expense) AND Table.AmountRevaluated > 0"; Return Query.Execute().Unload(); + ElsIf Operation = AO.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R2040B_TaxesIncoming Then + Query.Text = + "SELECT * FROM Revaluated_R2040B_TaxesIncoming AS Table WHERE + |Table.RecordType = Value(AccumulationRecordType.Receipt) AND Table.AmountRevaluated > 0"; + Return Query.Execute().Unload(); + ElsIf Operation = AO.ForeignCurrencyRevaluation_DR_R2040B_TaxesIncoming_CR_R5021T_Revenues Then + Query.Text = + "SELECT * FROM Revaluated_R2040B_TaxesIncoming AS Table WHERE + |Table.RecordType = Value(AccumulationRecordType.Expense) AND Table.AmountRevaluated > 0"; + Return Query.Execute().Unload(); - - // active ElsIf Operation = AO.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R3010B_CashOnHand Then @@ -1022,7 +1123,16 @@ Function GetAccountingDataTable(Operation, AddInfo) Export |Table.RecordType = Value(AccumulationRecordType.Receipt) AND Table.AmountRevaluated > 0"; Return Query.Execute().Unload(); - + ElsIf Operation = AO.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R1040B_TaxesOutgoing Then + Query.Text = + "SELECT * FROM Revaluated_R1040B_TaxesOutgoing AS Table WHERE + |Table.RecordType = Value(AccumulationRecordType.Expense) AND Table.AmountRevaluated > 0"; + Return Query.Execute().Unload(); + ElsIf Operation = AO.ForeignCurrencyRevaluation_DR_R1040B_TaxesOutgoing_CR_R5021T_Revenues Then + Query.Text = + "SELECT * FROM Revaluated_R1040B_TaxesOutgoing AS Table WHERE + |Table.RecordType = Value(AccumulationRecordType.Receipt) AND Table.AmountRevaluated > 0"; + Return Query.Execute().Unload(); EndIf; Return New ValueTable(); EndFunction @@ -1045,6 +1155,10 @@ Function GetAccountingAnalytics(Parameters) Export ElsIf Parameters.Operation = AO.ForeignCurrencyRevaluation_DR_R9510B_SalaryPayment_CR_R5021T_Revenues Then Return GetAnalytics_DR_R9510B_SalaryPayment_CR_R5021T_Revenues(Parameters); // Salary payments - Revenue + ElsIf Parameters.Operation = AO.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R2040B_TaxesIncoming Then + Return GetAnalytics_DR_R5022T_Expenses_CR_R2040B_TaxesIncoming(Parameters); // Expenses - Taxes incoming + ElsIf Parameters.Operation = AO.ForeignCurrencyRevaluation_DR_R2040B_TaxesIncoming_CR_R5021T_Revenues Then + Return GetAnalytics_DR_R2040B_TaxesIncoming_CR_R5021T_Revenues(Parameters); // Taxes incoming - Revenue // active @@ -1082,7 +1196,12 @@ Function GetAccountingAnalytics(Parameters) Export Return GetAnalytics_DR_R5022T_Expenses_CR_R8510B_BookValueOfFixedAsset(Parameters); // Expenses - Fixed asset ElsIf Parameters.Operation = AO.ForeignCurrencyRevaluation_DR_R8510B_BookValueOfFixedAsset_CR_R5021T_Revenues Then Return GetAnalytics_DR_R8510B_BookValueOfFixedAsset_CR_R5021T_Revenues(Parameters); // Fixed asset - Revenues - + + ElsIf Parameters.Operation = AO.ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R1040B_TaxesOutgoing Then + Return GetAnalytics_DR_R5022T_Expenses_CR_R1040B_TaxesOutgoing(Parameters); // Expenses - Taxes outgoing + ElsIf Parameters.Operation = AO.ForeignCurrencyRevaluation_DR_R1040B_TaxesOutgoing_CR_R5021T_Revenues Then + Return GetAnalytics_DR_R1040B_TaxesOutgoing_CR_R5021T_Revenues(Parameters); // Taxes outgoing - Revenues + EndIf; Return Undefined; EndFunction @@ -1249,6 +1368,56 @@ Function GetAnalytics_DR_R9510B_SalaryPayment_CR_R5021T_Revenues(Parameters) Return AccountingAnalytics; EndFunction +// Expenses - Taxes incoming +Function GetAnalytics_DR_R5022T_Expenses_CR_R2040B_TaxesIncoming(Parameters) + AccountingAnalytics = AccountingServer.GetAccountingAnalyticsResult(Parameters); + AccountParameters = AccountingServer.GetAccountParameters(Parameters); + + // Debit + Debit = AccountingServer.GetT9014S_AccountsExpenseRevenue(AccountParameters, + Parameters.ObjectData.ExpenseType, + Parameters.ObjectData.ExpenseProfitLossCenter); + AccountingAnalytics.Debit = Debit.AccountExpense; + + AdditionalAnalytics = New Structure(); + AdditionalAnalytics.Insert("ExpenseType", Parameters.ObjectData.ExpenseType); + AdditionalAnalytics.Insert("ExpenseCenter", Parameters.ObjectData.ExpenseProfitLossCenter); + AccountingServer.SetDebitExtDimensions(Parameters, AccountingAnalytics, AdditionalAnalytics); + + // Credit + Credit = AccountingServer.GetT9013S_AccountsTax(AccountParameters, + New Structure("Tax, VatRate", Parameters.RowData.Tax, Parameters.RowData.TaxRate)); + AccountingAnalytics.Credit = Credit.IncomingAccount; + AccountingServer.SetCreditExtDimensions(Parameters, AccountingAnalytics); + + Return AccountingAnalytics; +EndFunction + +// Taxes incoming - Revenue +Function GetAnalytics_DR_R2040B_TaxesIncoming_CR_R5021T_Revenues(Parameters) + AccountingAnalytics = AccountingServer.GetAccountingAnalyticsResult(Parameters); + AccountParameters = AccountingServer.GetAccountParameters(Parameters); + + // Debit + Debit = AccountingServer.GetT9013S_AccountsTax(AccountParameters, + New Structure("Tax, VatRate", Parameters.RowData.Tax, Parameters.RowData.TaxRate)); + AccountingAnalytics.Debit = Debit.IncomingAccount; + AccountingServer.SetDebitExtDimensions(Parameters, AccountingAnalytics); + + // Credit + Credit = AccountingServer.GetT9014S_AccountsExpenseRevenue(AccountParameters, + Parameters.ObjectData.RevenueType, + Parameters.ObjectData.RevenueProfitLossCenter); + AccountingAnalytics.Credit = Credit.AccountRevenue; + + AdditionalAnalytics = New Structure(); + AdditionalAnalytics.Insert("RevenueType", Parameters.ObjectData.RevenueType); + AdditionalAnalytics.Insert("RevenueCenter", Parameters.ObjectData.RevenueProfitLossCenter); + AccountingServer.SetCreditExtDimensions(Parameters, AccountingAnalytics, AdditionalAnalytics); + + Return AccountingAnalytics; +EndFunction + // active // Expenses - Cash on hand @@ -1417,6 +1586,56 @@ Function GetAnalytics_DR_R2021B_CustomersTransactions_CR_R5021T_Revenues(Paramet Return AccountingAnalytics; EndFunction +// Expenses - Taxes outgoing +Function GetAnalytics_DR_R5022T_Expenses_CR_R1040B_TaxesOutgoing(Parameters) + AccountingAnalytics = AccountingServer.GetAccountingAnalyticsResult(Parameters); + AccountParameters = AccountingServer.GetAccountParameters(Parameters); + + // Debit + Debit = AccountingServer.GetT9014S_AccountsExpenseRevenue(AccountParameters, + Parameters.ObjectData.ExpenseType, + Parameters.ObjectData.ExpenseProfitLossCenter); + AccountingAnalytics.Debit = Debit.AccountExpense; + + AdditionalAnalyticsDr = New Structure(); + AdditionalAnalyticsDr.Insert("ExpenseType", Parameters.ObjectData.ExpenseType); + AdditionalAnalyticsDr.Insert("ExpenseCenter", Parameters.ObjectData.ExpenseProfitLossCenter); + AccountingServer.SetDebitExtDimensions(Parameters, AccountingAnalytics, AdditionalAnalyticsDr); + + // Credit + Credit = AccountingServer.GetT9013S_AccountsTax(AccountParameters, + New Structure("Tax, VatRate", Parameters.RowData.Tax, Parameters.RowData.TaxRate)); + AccountingAnalytics.Credit = Credit.OutgoingAccount; + AccountingServer.SetCreditExtDimensions(Parameters, AccountingAnalytics); + + Return AccountingAnalytics; +EndFunction + +// Taxes outgoing - Revenue +Function GetAnalytics_DR_R1040B_TaxesOutgoing_CR_R5021T_Revenues(Parameters) + AccountingAnalytics = AccountingServer.GetAccountingAnalyticsResult(Parameters); + AccountParameters = AccountingServer.GetAccountParameters(Parameters); + + // Debit + Debit = AccountingServer.GetT9013S_AccountsTax(AccountParameters, + New Structure("Tax, VatRate", Parameters.RowData.Tax, Parameters.RowData.TaxRate)); + AccountingAnalytics.Debit = Debit.OutgoingAccount; + AccountingServer.SetDebitExtDimensions(Parameters, AccountingAnalytics); + + // Credit + Credit = AccountingServer.GetT9014S_AccountsExpenseRevenue(AccountParameters, + Parameters.ObjectData.RevenueType, + Parameters.ObjectData.RevenueProfitLossCenter); + AccountingAnalytics.Credit = Credit.AccountRevenue; + + AdditionalAnalyticsCr = New Structure(); + AdditionalAnalyticsCr.Insert("RevenueType", Parameters.ObjectData.RevenueType); + AdditionalAnalyticsCr.Insert("RevenueCenter", Parameters.ObjectData.RevenueProfitLossCenter); + AccountingServer.SetCreditExtDimensions(Parameters, AccountingAnalytics, AdditionalAnalyticsCr); + + Return AccountingAnalytics; +EndFunction + // Expenses - Cash advance Function GetAnalytics_DR_R5022T_Expenses_CR_R3015B_CashAdvance(Parameters) Raise "Not supported [DR_R5022T_Expenses_CR_R3015B_CashAdvance]"; @@ -1694,6 +1913,8 @@ Function GetQueryTextsMasterTables() QueryArray.Add(R8510B_BookValueOfFixedAsset()); QueryArray.Add(T1040T_AccountingAmounts()); QueryArray.Add(R5020B_PartnersBalance()); +// QueryArray.Add(R1040B_TaxesOutgoing()); +// QueryArray.Add(R2040B_TaxesIncoming()); Return QueryArray; EndFunction @@ -1982,6 +2203,47 @@ Function R8510B_BookValueOfFixedAsset() | TRUE"; EndFunction +Function R1040B_TaxesOutgoing() + Return + "SELECT + | Table.RecordType, + | Table.Period, + | Table.Company, + | Table.Branch, + | Table.Tax, + | Table.TaxRate, + | Table.InvoiceType, + | Table.Currency, + | Table.CurrencyMovementType, + | Table.TransactionCurrency, + | Table.AmountRevaluated AS Amount + |INTO R1040B_TaxesOutgoing + |FROM + | Revaluated_R1040B_TaxesOutgoing AS Table + |WHERE + | Table.AmountRevaluated <> 0"; +EndFunction + +Function R2040B_TaxesIncoming() + Return + "SELECT + | Table.RecordType, + | Table.Period, + | Table.Company, + | Table.Branch, + | Table.Tax, + | Table.TaxRate, + | Table.Currency, + | Table.CurrencyMovementType, + | Table.TransactionCurrency, + | Table.AmountRevaluated AS Amount + |INTO R2040B_TaxesIncoming + |FROM + | Revaluated_R2040B_TaxesIncoming AS Table + |WHERE + | Table.AmountRevaluated <> 0"; +EndFunction + #EndRegion #Region AccessObject diff --git a/IRP/src/Documents/JournalEntry/Forms/DocumentForm/Module.bsl b/IRP/src/Documents/JournalEntry/Forms/DocumentForm/Module.bsl index edca438b87..fc7f26fb50 100644 --- a/IRP/src/Documents/JournalEntry/Forms/DocumentForm/Module.bsl +++ b/IRP/src/Documents/JournalEntry/Forms/DocumentForm/Module.bsl @@ -49,7 +49,6 @@ EndProcedure &AtClientAtServerNoContext Procedure SetVisibilityAvailability(Object, Form) Form.Items.DecorationSaveDocument.Visible = Not ValueIsFilled(Object.Ref); - Form.Items.Basis.Visible = Not Object.UserDefined; Form.Items.RegularOperations.Visible = Object.UserDefined; EndProcedure @@ -143,9 +142,6 @@ EndProcedure &AtClient Procedure UserDefinedOnChange(Item) - If Object.UserDefined Then - Object.Basis = Undefined; - EndIf; SetVisibilityAvailability(Object, ThisObject); EndProcedure @@ -265,7 +261,20 @@ EndProcedure &AtServer Procedure ProfitLostOffsetAtServer() Object.RegisterRecords.Basic.Clear(); - DataTable = Catalogs.LedgerTypes.ProfitLostOffset(Object.Company, Object.LedgerType, Object.Ref, Object.Date); + + RegisterRecords = AccountingRegisters.Basic.CreateRecordSet(); + RegisterRecords.Filter.Recorder.Set(Object.Ref); + RegisterRecords.Write(); + + DataTable = Catalogs.LedgerTypes.ProfitLostOffset(Object.Company, + Object.LedgerType, + Object.Ref, + Object.Date, + Object.DeletionMark, + RegisterRecords); + + Object.RegisterRecords.Basic.Clear(); + AccountingServer.SetDataRegisterRecords(DataTable, Object.LedgerType, Object.RegisterRecords.Basic); For Each Record In Object.RegisterRecords.Basic Do Record.Active = Not Object.DeletionMark; diff --git a/IRP/src/Documents/JournalEntry/ObjectModule.bsl b/IRP/src/Documents/JournalEntry/ObjectModule.bsl index ceea883d62..0a63938539 100644 --- a/IRP/src/Documents/JournalEntry/ObjectModule.bsl +++ b/IRP/src/Documents/JournalEntry/ObjectModule.bsl @@ -3,6 +3,7 @@ Procedure BeforeWrite(Cancel, WriteMode, PostingMode) If DataExchange.Load Then Return; EndIf; + If ValueIsFilled(ThisObject.Basis) Then ThisObject.Date = ThisObject.Basis.Date; If CommonFunctionsClientServer.ObjectHasProperty(ThisObject.Basis, "Branch") Then diff --git a/IRP/src/Documents/ManualRegisterEntry/ManualRegisterEntry.mdo b/IRP/src/Documents/ManualRegisterEntry/ManualRegisterEntry.mdo index 37cc6924f3..7613669017 100644 --- a/IRP/src/Documents/ManualRegisterEntry/ManualRegisterEntry.mdo +++ b/IRP/src/Documents/ManualRegisterEntry/ManualRegisterEntry.mdo @@ -129,7 +129,6 @@ AccumulationRegister.R5011B_CustomersAging AccumulationRegister.R2020B_AdvancesFromCustomers AccumulationRegister.R5021T_Revenues - AccumulationRegister.R5041B_TaxesPayable AccumulationRegister.R2040B_TaxesIncoming AccumulationRegister.R4034B_GoodsShipmentSchedule AccumulationRegister.DELETE_R8013B_ConsignorBatchWiseBalance diff --git a/IRP/src/Documents/OpeningEntry/Forms/DocumentForm/Form.form b/IRP/src/Documents/OpeningEntry/Forms/DocumentForm/Form.form index c95911e350..a6d4688d39 100644 --- a/IRP/src/Documents/OpeningEntry/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/OpeningEntry/Forms/DocumentForm/Form.form @@ -12212,7 +12212,7 @@ <key>ru</key> - <value>Подотчет сотрудника</value> + <value>Авансовый отчет сотрудника</value> <key>tr</key> @@ -14911,6 +14911,1446 @@ <showTitle>true</showTitle> </extInfo> </items> + <items xsi:type="form:FormGroup"> + <name>GroupTaxes</name> + <id>1692</id> + <items xsi:type="form:FormGroup"> + <name>GroupIncomingAndOutgoing</name> + <id>1694</id> + <items xsi:type="form:FormGroup"> + <name>GroupIncoming</name> + <id>1696</id> + <items xsi:type="form:Table"> + <name>TaxesIncoming</name> + <id>1700</id> + <visible>true</visible> + <enabled>true</enabled> + <userVisible> + <common>true</common> + </userVisible> + <dataPath xsi:type="form:DataPath"> + <segments>Object.TaxesIncoming</segments> + </dataPath> + <titleLocation>None</titleLocation> + <items xsi:type="form:FormField"> + <name>TaxesIncomingLineNumber</name> + <id>1713</id> + <visible>true</visible> + <enabled>true</enabled> + <userVisible> + <common>true</common> + </userVisible> + <dataPath xsi:type="form:DataPath"> + <segments>Object.TaxesIncoming.LineNumber</segments> + </dataPath> + <extendedTooltip> + <name>TaxesIncomingLineNumberExtendedTooltip</name> + <id>1715</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>TaxesIncomingLineNumberContextMenu</name> + <id>1714</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:FormField"> + <name>TaxesIncomingKey</name> + <id>1716</id> + <enabled>true</enabled> + <userVisible> + <common>true</common> + </userVisible> + <dataPath xsi:type="form:DataPath"> + <segments>Object.TaxesIncoming.Key</segments> + </dataPath> + <extendedTooltip> + <name>TaxesIncomingKeyExtendedTooltip</name> + <id>1718</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>TaxesIncomingKeyContextMenu</name> + <id>1717</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:FormField"> + <name>TaxesIncomingCurrency</name> + <id>1719</id> + <visible>true</visible> + <enabled>true</enabled> + <userVisible> + <common>true</common> + </userVisible> + <dataPath xsi:type="form:DataPath"> + <segments>Object.TaxesIncoming.Currency</segments> + </dataPath> + <extendedTooltip> + <name>TaxesIncomingCurrencyExtendedTooltip</name> + <id>1721</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>TaxesIncomingCurrencyContextMenu</name> + <id>1720</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:FormField"> + <name>TaxesIncomingVatRate</name> + <id>1722</id> + <visible>true</visible> + <enabled>true</enabled> + <userVisible> + <common>true</common> + </userVisible> + <dataPath xsi:type="form:DataPath"> + <segments>Object.TaxesIncoming.VatRate</segments> + </dataPath> + <handlers> + <event>OnChange</event> + <name>TaxesIncomingVatRateOnChange</name> + </handlers> + <extendedTooltip> + <name>TaxesIncomingVatRateExtendedTooltip</name> + <id>1724</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>TaxesIncomingVatRateContextMenu</name> + <id>1723</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> + <quickChoice>true</quickChoice> + <chooseType>true</chooseType> + <typeDomainEnabled>true</typeDomainEnabled> + <textEdit>true</textEdit> + </extInfo> + </items> + <items xsi:type="form:FormField"> + <name>TaxesIncomingInvoiceType</name> + <id>1772</id> + <visible>true</visible> + <enabled>true</enabled> + <userVisible> + <common>true</common> + </userVisible> + <dataPath xsi:type="form:DataPath"> + <segments>Object.TaxesIncoming.InvoiceType</segments> + </dataPath> + <extendedTooltip> + <name>TaxesIncomingInvoiceTypeExtendedTooltip</name> + <id>1774</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>TaxesIncomingInvoiceTypeContextMenu</name> + <id>1773</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:FormField"> + <name>TaxesIncomingNetAmount</name> + <id>1725</id> + <visible>true</visible> + <enabled>true</enabled> + <userVisible> + <common>true</common> + </userVisible> + <dataPath xsi:type="form:DataPath"> + <segments>Object.TaxesIncoming.NetAmount</segments> + </dataPath> + <handlers> + <event>OnChange</event> + <name>TaxesIncomingNetAmountOnChange</name> + </handlers> + <extendedTooltip> + <name>TaxesIncomingNetAmountExtendedTooltip</name> + <id>1727</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>TaxesIncomingNetAmountContextMenu</name> + <id>1726</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:FormField"> + <name>TaxesIncomingTaxAmount</name> + <id>1728</id> + <visible>true</visible> + <enabled>true</enabled> + <userVisible> + <common>true</common> + </userVisible> + <dataPath xsi:type="form:DataPath"> + <segments>Object.TaxesIncoming.TaxAmount</segments> + </dataPath> + <handlers> + <event>OnChange</event> + <name>TaxesIncomingTaxAmountOnChange</name> + </handlers> + <extendedTooltip> + <name>TaxesIncomingTaxAmountExtendedTooltip</name> + <id>1730</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>TaxesIncomingTaxAmountContextMenu</name> + <id>1729</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:FormField"> + <name>TaxesIncomingTotalAmount</name> + <id>1731</id> + <visible>true</visible> + <enabled>true</enabled> + <userVisible> + <common>true</common> + </userVisible> + <dataPath xsi:type="form:DataPath"> + <segments>Object.TaxesIncoming.TotalAmount</segments> + </dataPath> + <handlers> + <event>OnChange</event> + <name>TaxesIncomingTotalAmountOnChange</name> + </handlers> + <extendedTooltip> + <name>TaxesIncomingTotalAmountExtendedTooltip</name> + <id>1733</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>TaxesIncomingTotalAmountContextMenu</name> + <id>1732</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> + <autoCommandBar> + <name>TaxesIncomingCommandBar</name> + <id>1701</id> + <items xsi:type="form:Button"> + <name>EditCurrenciesTaxesIncoming</name> + <id>1768</id> + <visible>true</visible> + <enabled>true</enabled> + <userVisible> + <common>true</common> + </userVisible> + <extendedTooltip> + <name>EditCurrenciesTaxesIncomingExtendedTooltip</name> + <id>1769</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> + <commandName>Form.Command.EditCurrenciesTaxesIncoming</commandName> + <representation>Auto</representation> + <autoMaxWidth>true</autoMaxWidth> + <autoMaxHeight>true</autoMaxHeight> + <placementArea>UserCmds</placementArea> + <representationInContextMenu>Auto</representationInContextMenu> + </items> + <visible>true</visible> + <enabled>true</enabled> + <userVisible> + <common>true</common> + </userVisible> + <horizontalAlign>Left</horizontalAlign> + <autoFill>true</autoFill> + </autoCommandBar> + <handlers> + <event>BeforeAddRow</event> + <name>TaxesIncomingBeforeAddRow</name> + </handlers> + <handlers> + <event>AfterDeleteRow</event> + <name>TaxesIncomingAfterDeleteRow</name> + </handlers> + <searchStringAddition> + <visible>true</visible> + <enabled>true</enabled> + <userVisible> + <common>true</common> + </userVisible> + <name>TaxesIncomingSearchString</name> + <id>1704</id> + <extendedTooltip> + <name>TaxesIncomingSearchStringExtendedTooltip</name> + <id>1706</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>TaxesIncomingSearchStringContextMenu</name> + <id>1705</id> + <visible>true</visible> + <enabled>true</enabled> + <userVisible> + <common>true</common> + </userVisible> + <autoFill>true</autoFill> + </contextMenu> + <source>TaxesIncomingSearchString</source> + <extInfo xsi:type="form:SearchStringAdditionExtInfo"> + <autoMaxWidth>true</autoMaxWidth> + </extInfo> + </searchStringAddition> + <viewStatusAddition> + <visible>true</visible> + <enabled>true</enabled> + <userVisible> + <common>true</common> + </userVisible> + <name>TaxesIncomingViewStatus</name> + <id>1710</id> + <extendedTooltip> + <name>TaxesIncomingViewStatusExtendedTooltip</name> + <id>1712</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>TaxesIncomingViewStatusContextMenu</name> + <id>1711</id> + <visible>true</visible> + <enabled>true</enabled> + <userVisible> + <common>true</common> + </userVisible> + <autoFill>true</autoFill> + </contextMenu> + <type>ViewStatusAddition</type> + <source>TaxesIncomingViewStatus</source> + <extInfo xsi:type="form:ViewStatusAdditionExtInfo"> + <autoMaxWidth>true</autoMaxWidth> + </extInfo> + </viewStatusAddition> + <searchControlAddition> + <visible>true</visible> + <enabled>true</enabled> + <userVisible> + <common>true</common> + </userVisible> + <name>TaxesIncomingSearchControl</name> + <id>1707</id> + <extendedTooltip> + <name>TaxesIncomingSearchControlExtendedTooltip</name> + <id>1709</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>TaxesIncomingSearchControlContextMenu</name> + <id>1708</id> + <visible>true</visible> + <enabled>true</enabled> + <userVisible> + <common>true</common> + </userVisible> + <autoFill>true</autoFill> + </contextMenu> + <type>SearchControlAddition</type> + <source>TaxesIncomingSearchControl</source> + <extInfo xsi:type="form:SearchControlAdditionExtInfo"> + <autoMaxWidth>true</autoMaxWidth> + </extInfo> + </searchControlAddition> + <extendedTooltip> + <name>TaxesIncomingExtendedTooltip</name> + <id>1703</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>TaxesIncomingContextMenu</name> + <id>1702</id> + <visible>true</visible> + <enabled>true</enabled> + <userVisible> + <common>true</common> + </userVisible> + <autoFill>true</autoFill> + </contextMenu> + <changeRowSet>true</changeRowSet> + <changeRowOrder>true</changeRowOrder> + <autoMaxWidth>true</autoMaxWidth> + <autoMaxHeight>true</autoMaxHeight> + <autoMaxRowsCount>true</autoMaxRowsCount> + <selectionMode>MultiRow</selectionMode> + <header>true</header> + <headerHeight>1</headerHeight> + <footerHeight>1</footerHeight> + <horizontalScrollBar>AutoUse</horizontalScrollBar> + <verticalScrollBar>AutoUse</verticalScrollBar> + <horizontalLines>true</horizontalLines> + <verticalLines>true</verticalLines> + <searchOnInput>Auto</searchOnInput> + <initialListView>Auto</initialListView> + <horizontalStretch>true</horizontalStretch> + <verticalStretch>true</verticalStretch> + <fileDragMode>AsFileRef</fileDragMode> + <rowFilter xsi:type="core:UndefinedValue"/> + </items> + <visible>true</visible> + <enabled>true</enabled> + <userVisible> + <common>true</common> + </userVisible> + <title> + <key>en</key> + <value>Incoming</value> + + + <key>ru</key> + <value>Входящий</value> + + + <key>tr</key> + <value>Gelen</value> + + + GroupIncomingExtendedTooltip + 1697 + true + true + + true + + Label + true + true + + Left + + + Page + + Vertical + true + + + + GroupOutgoing + 1698 + + TaxesOutgoing + 1734 + true + true + + true + + + Object.TaxesOutgoing + + None + + TaxesOutgoingLineNumber + 1747 + true + true + + true + + + Object.TaxesOutgoing.LineNumber + + + TaxesOutgoingLineNumberExtendedTooltip + 1749 + true + true + + true + + Label + true + true + + Left + + + + TaxesOutgoingLineNumberContextMenu + 1748 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + TaxesOutgoingKey + 1750 + true + + true + + + Object.TaxesOutgoing.Key + + + TaxesOutgoingKeyExtendedTooltip + 1752 + true + true + + true + + Label + true + true + + Left + + + + TaxesOutgoingKeyContextMenu + 1751 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + TaxesOutgoingCurrency + 1753 + true + true + + true + + + Object.TaxesOutgoing.Currency + + + TaxesOutgoingCurrencyExtendedTooltip + 1755 + true + true + + true + + Label + true + true + + Left + + + + TaxesOutgoingCurrencyContextMenu + 1754 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + TaxesOutgoingVatRate + 1756 + true + true + + true + + + Object.TaxesOutgoing.VatRate + + + OnChange + TaxesOutgoingVatRateOnChange + + + TaxesOutgoingVatRateExtendedTooltip + 1758 + true + true + + true + + Label + true + true + + Left + + + + TaxesOutgoingVatRateContextMenu + 1757 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + true + + + + TaxesOutgoingInvoiceType + 1775 + true + true + + true + + + Object.TaxesOutgoing.InvoiceType + + + TaxesOutgoingInvoiceTypeExtendedTooltip + 1777 + true + true + + true + + Label + true + true + + Left + + + + TaxesOutgoingInvoiceTypeContextMenu + 1776 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + TaxesOutgoingNetAmount + 1759 + true + true + + true + + + Object.TaxesOutgoing.NetAmount + + + OnChange + TaxesOutgoingNetAmountOnChange + + + TaxesOutgoingNetAmountExtendedTooltip + 1761 + true + true + + true + + Label + true + true + + Left + + + + TaxesOutgoingNetAmountContextMenu + 1760 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + TaxesOutgoingTaxAmount + 1762 + true + true + + true + + + Object.TaxesOutgoing.TaxAmount + + + OnChange + TaxesOutgoingTaxAmountOnChange + + + TaxesOutgoingTaxAmountExtendedTooltip + 1764 + true + true + + true + + Label + true + true + + Left + + + + TaxesOutgoingTaxAmountContextMenu + 1763 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + TaxesOutgoingTotalAmount + 1765 + true + true + + true + + + Object.TaxesOutgoing.TotalAmount + + + OnChange + TaxesOutgoingTotalAmountOnChange + + + TaxesOutgoingTotalAmountExtendedTooltip + 1767 + true + true + + true + + Label + true + true + + Left + + + + TaxesOutgoingTotalAmountContextMenu + 1766 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + TaxesOutgoingCommandBar + 1735 + + EditCurrenciesTaxesOutgoing + 1770 + true + true + + true + + + EditCurrenciesTaxesOutgoingExtendedTooltip + 1771 + true + true + + true + + Label + true + true + + Left + + + Form.Command.EditCurrenciesTaxesOutgoing + Auto + true + true + UserCmds + Auto + + true + true + + true + + Left + true + + + BeforeAddRow + TaxesOutgoingBeforeAddRow + + + AfterDeleteRow + TaxesOutgoingAfterDeleteRow + + + true + true + + true + + TaxesOutgoingSearchString + 1738 + + TaxesOutgoingSearchStringExtendedTooltip + 1740 + true + true + + true + + Label + true + true + + Left + + + + TaxesOutgoingSearchStringContextMenu + 1739 + true + true + + true + + true + + TaxesOutgoingSearchString + + true + + + + true + true + + true + + TaxesOutgoingViewStatus + 1744 + + TaxesOutgoingViewStatusExtendedTooltip + 1746 + true + true + + true + + Label + true + true + + Left + + + + TaxesOutgoingViewStatusContextMenu + 1745 + true + true + + true + + true + + ViewStatusAddition + TaxesOutgoingViewStatus + + true + + + + true + true + + true + + TaxesOutgoingSearchControl + 1741 + + TaxesOutgoingSearchControlExtendedTooltip + 1743 + true + true + + true + + Label + true + true + + Left + + + + TaxesOutgoingSearchControlContextMenu + 1742 + true + true + + true + + true + + SearchControlAddition + TaxesOutgoingSearchControl + + true + + + + TaxesOutgoingExtendedTooltip + 1737 + true + true + + true + + Label + true + true + + Left + + + + TaxesOutgoingContextMenu + 1736 + true + true + + true + + true + + true + true + true + true + true + MultiRow +
true
+ 1 + 1 + AutoUse + AutoUse + true + true + Auto + Auto + true + true + AsFileRef + + + true + true + + true + + + <key>en</key> + <value>Outgoing</value> + + + <key>ru</key> + <value>Исходящие</value> + + + <key>tr</key> + <value>Çıkan</value> + + + GroupOutgoingExtendedTooltip + 1699 + true + true + + true + + Label + true + true + + Left + + + Page + + Vertical + true + + + true + true + + true + + + <key>en</key> + <value>Incoming and Outgoing</value> + + + <key>ru</key> + <value>Входящие и исходящие</value> + + + <key>tr</key> + <value>Incoming and Outgoing</value> + + + GroupIncomingAndOutgoingExtendedTooltip + 1695 + true + true + + true + + Label + true + true + + Left + + + Pages + + Auto + Auto + + + true + true + + true + + + <key>en</key> + <value>Taxes</value> + + + <key>ru</key> + <value>Налоги</value> + + + <key>tr</key> + <value>Vergiler</value> + + + GroupTaxesExtendedTooltip + 1693 + true + true + + true + + Label + true + true + + Left + + + Page + + Vertical + true + + GroupOther 303 @@ -15990,6 +17430,64 @@ Picture Auto + + EditCurrenciesTaxesIncoming + + <key>en</key> + <value>Edit currencies taxes incoming</value> + + + <key>ru</key> + <value>Редактировать валюту входящих налогов</value> + + + <key>tr</key> + <value>Edit currencies taxes incoming</value> + + 18 + + true + + + CommonPicture.EditCurrencies + + + + EditCurrenciesTaxesIncoming + + + Picture + Auto + + + EditCurrenciesTaxesOutgoing + + <key>en</key> + <value>Edit currencies taxes outgoing</value> + + + <key>ru</key> + <value>Редактировать валюту исходящих налогов</value> + + + <key>tr</key> + <value>Edit currencies taxes outgoing</value> + + 19 + + true + + + CommonPicture.EditCurrencies + + + + EditCurrenciesTaxesOutgoing + + + Picture + Auto + diff --git a/IRP/src/Documents/OpeningEntry/Forms/DocumentForm/Module.bsl b/IRP/src/Documents/OpeningEntry/Forms/DocumentForm/Module.bsl index 12e0b3bff2..794b7936d6 100644 --- a/IRP/src/Documents/OpeningEntry/Forms/DocumentForm/Module.bsl +++ b/IRP/src/Documents/OpeningEntry/Forms/DocumentForm/Module.bsl @@ -85,7 +85,9 @@ Procedure SetVisibilityAvailability(Object, Form) Form.Items.EditCurrenciesAccountPayableOther.Enabled = Not Form.ReadOnly; Form.Items.EditCurrenciesAccountReceivableOther.Enabled = Not Form.ReadOnly; Form.Items.EditCurrenciesFixedAssets.Enabled = Not Form.ReadOnly; - + Form.Items.EditCurrenciesTaxesIncoming.Enabled = Not Form.ReadOnly; + Form.Items.EditCurrenciesTaxesOutgoing.Enabled = Not Form.ReadOnly; + UseCommissionTrading = FOServer.IsUseCommissionTrading(); Form.Items.GroupReceiptFromConsignor.Visible = UseCommissionTrading; @@ -103,7 +105,7 @@ Procedure SetVisibilityAvailability(Object, Form) Form.Items.ReceiptFromConsignor.Visible = UseCommissionTrading; Form.Items.SalaryPayment.Visible = FOServer.IsUseSalary(); - Form.Items.EmployeeList.Visible = FOServer.IsUseSalary(); + Form.Items.EmployeeList.Visible = FOServer.IsUseSalary(); Form.Items.AdvanceFromRetailCustomers.Visible = FOServer.IsUseRetail(); EndProcedure @@ -457,6 +459,74 @@ EndProcedure #EndRegion +#Region TAXES_INCOMING + +&AtClient +Procedure TaxesIncomingBeforeAddRow(Item, Cancel, Clone, Parent, IsFolder, Parameter) + DocOpeningEntryClient.TaxesIncomingBeforeAddRow(Object, ThisObject, Item, Cancel, Clone, Parent, IsFolder, Parameter); +EndProcedure + +&AtClient +Procedure TaxesIncomingAfterDeleteRow(Item) + DocOpeningEntryClient.TaxesIncomingAfterDeleteRow(Object, ThisObject, Item); +EndProcedure + +&AtClient +Procedure TaxesIncomingVatRateOnChange(Item) + DocOpeningEntryClient.TaxesIncomingVatRateOnChange(Object, ThisObject, Item); +EndProcedure + +&AtClient +Procedure TaxesIncomingNetAmountOnChange(Item) + DocOpeningEntryClient.TaxesIncomingNetAmountOnChange(Object, ThisObject, Item); +EndProcedure + +&AtClient +Procedure TaxesIncomingTaxAmountOnChange(Item) + DocOpeningEntryClient.TaxesIncomingTaxAmountOnChange(Object, ThisObject, Item); +EndProcedure + +&AtClient +Procedure TaxesIncomingTotalAmountOnChange(Item) + DocOpeningEntryClient.TaxesIncomingTotalAmountOnChange(Object, ThisObject, Item); +EndProcedure + +#EndRegion + +#Region TAXES_OUTGOING + +&AtClient +Procedure TaxesOutgoingBeforeAddRow(Item, Cancel, Clone, Parent, IsFolder, Parameter) + DocOpeningEntryClient.TaxesOutgoingBeforeAddRow(Object, ThisObject, Item, Cancel, Clone, Parent, IsFolder, Parameter); +EndProcedure + +&AtClient +Procedure TaxesOutgoingAfterDeleteRow(Item) + DocOpeningEntryClient.TaxesOutgoingAfterDeleteRow(Object, ThisObject, Item); +EndProcedure + +&AtClient +Procedure TaxesOutgoingVatRateOnChange(Item) + DocOpeningEntryClient.TaxesOutgoingVatRateOnChange(Object, ThisObject, Item); +EndProcedure + +&AtClient +Procedure TaxesOutgoingNetAmountOnChange(Item) + DocOpeningEntryClient.TaxesOutgoingNetAmountOnChange(Object, ThisObject, Item); +EndProcedure + +&AtClient +Procedure TaxesOutgoingTaxAmountOnChange(Item) + DocOpeningEntryClient.TaxesOutgoingTaxAmountOnChange(Object, ThisObject, Item); +EndProcedure + +&AtClient +Procedure TaxesOutgoingTotalAmountOnChange(Item) + DocOpeningEntryClient.TaxesOutgoingTotalAmountOnChange(Object, ThisObject, Item); +EndProcedure + +#EndRegion + &AtClient Procedure MainTableOnChange(Item) For Each Row In Object[Item.Name] Do @@ -1262,6 +1332,34 @@ Procedure EditCurrenciesReceiptFromConsignor(Command) OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow); EndProcedure +&AtClient +Procedure EditCurrenciesTaxesIncoming(Command) + CurrentData = ThisObject.Items.TaxesIncoming.CurrentData; + If CurrentData = Undefined Then + Return; + EndIf; + FormParameters = CurrenciesClientServer.GetParameters_V2(Object, CurrentData); + NotifyParameters = New Structure(); + NotifyParameters.Insert("Object", Object); + NotifyParameters.Insert("Form" , ThisObject); + Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters); + OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow); +EndProcedure + +&AtClient +Procedure EditCurrenciesTaxesOutgoing(Command) + CurrentData = ThisObject.Items.TaxesOutgoing.CurrentData; + If CurrentData = Undefined Then + Return; + EndIf; + FormParameters = CurrenciesClientServer.GetParameters_V2(Object, CurrentData); + NotifyParameters = New Structure(); + NotifyParameters.Insert("Object", Object); + NotifyParameters.Insert("Form" , ThisObject); + Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters); + OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow); +EndProcedure + &AtClient Procedure ShowHiddenTables(Command) DocumentsClient.ShowHiddenTables(Object, ThisObject); @@ -1673,5 +1771,5 @@ MainTables = "AccountBalance, AdvanceFromCustomers, AdvanceToSuppliers, |Inventory, |ShipmentToTradeAgent, ReceiptFromConsignor, |EmployeeCashAdvance, AdvanceFromRetailCustomers, SalaryPayment, EmployeeList, - |AccountReceivableOther, AccountPayableOther, CashInTransit, FixedAssets"; + |AccountReceivableOther, AccountPayableOther, CashInTransit, FixedAssets, TaxesIncoming, TaxesOutgoing"; diff --git a/IRP/src/Documents/OpeningEntry/ManagerModule.bsl b/IRP/src/Documents/OpeningEntry/ManagerModule.bsl index a792f906b9..73390b534c 100644 --- a/IRP/src/Documents/OpeningEntry/ManagerModule.bsl +++ b/IRP/src/Documents/OpeningEntry/ManagerModule.bsl @@ -143,6 +143,7 @@ Function PostingGetDocumentDataTables(Ref, Cancel, PostingMode, Parameters, AddI EndIf; QueryArray = GetQueryTextsSecondaryTables(); + Parameters.Insert("QueryParameters", GetAdditionalQueryParameters(Ref)); PostingServer.ExecuteQuery(Ref, QueryArray, Parameters); Calculate_BatchKeysInfo(Ref, Parameters, AddInfo); @@ -178,6 +179,8 @@ Procedure PostingCheckBeforeWrite(Ref, Cancel, PostingMode, Parameters, AddInfo Tables.R8510B_BookValueOfFixedAsset.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); Tables.CashInTransit.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); Tables.R5020B_PartnersBalance.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); + Tables.R2040B_TaxesIncoming.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); + Tables.R1040B_TaxesOutgoing.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); PostingServer.FillPostingTables(Tables, Ref, QueryArray, Parameters); EndProcedure @@ -346,6 +349,7 @@ EndFunction Function GetAdditionalQueryParameters(Ref) StrParams = New Structure; StrParams.Insert("Ref", Ref); + StrParams.Insert("Vat", TaxesServer.GetVatRef()); Return StrParams; EndFunction @@ -369,6 +373,8 @@ Function GetQueryTextsSecondaryTables() QueryArray.Add(CashInTransitDoc()); QueryArray.Add(FixedAssets()); QueryArray.Add(EmployeeList()); + QueryArray.Add(TaxesIncoming()); + QueryArray.Add(TaxesOutgoing()); QueryArray.Add(PostingServer.Exists_R4010B_ActualStocks()); QueryArray.Add(PostingServer.Exists_R4011B_FreeStocks()); QueryArray.Add(PostingServer.Exists_R4014B_SerialLotNumber()); @@ -406,7 +412,10 @@ Function GetQueryTextsMasterTables() QueryArray.Add(R8510B_BookValueOfFixedAsset()); QueryArray.Add(R5020B_PartnersBalance()); QueryArray.Add(T9510S_Staffing()); + QueryArray.Add(R9541T_VacationUsage()); QueryArray.Add(R9545T_PaidVacations()); + QueryArray.Add(R2040B_TaxesIncoming()); + QueryArray.Add(R1040B_TaxesOutgoing()); Return QueryArray; EndFunction @@ -848,6 +857,7 @@ Function EmployeeList() | EmployeeList.Position, | EmployeeList.EmployeeSchedule, | EmployeeList.ProfitLossCenter, + | EmployeeList.RemainingVacationDays, | CASE | WHEN EmployeeList.RemainingVacationDays >= EmployeeList.Ref.Company.SalaryMaxDaysVacation | THEN 0 @@ -860,6 +870,46 @@ Function EmployeeList() | EmployeeList.Ref = &Ref" EndFunction +Function TaxesIncoming() + Return + "SELECT + | TaxesIncoming.Ref.Date AS Period, + | TaxesIncoming.Ref.Company AS Company, + | TaxesIncoming.Ref.Branch AS Branch, + | TaxesIncoming.Key, + | TaxesIncoming.Currency, + | TaxesIncoming.VatRate AS TaxRate, + | TaxesIncoming.InvoiceType AS InvoiceType, + | TaxesIncoming.TaxAmount AS Amount, + | &Vat AS Tax + |INTO TaxesIncoming + |FROM + | Document.OpeningEntry.TaxesIncoming AS TaxesIncoming + |WHERE + | TaxesIncoming.Ref = &Ref + | AND TaxesIncoming.TaxAmount <> 0"; +EndFunction + +Function TaxesOutgoing() + Return + "SELECT + | TaxesOutgoing.Ref.Date AS Period, + | TaxesOutgoing.Ref.Company AS Company, + | TaxesOutgoing.Ref.Branch AS Branch, + | TaxesOutgoing.Key, + | TaxesOutgoing.Currency, + | TaxesOutgoing.VatRate AS TaxRate, + | TaxesOutgoing.InvoiceType AS InvoiceType, + | TaxesOutgoing.TaxAmount AS Amount, + | &Vat AS Tax + |INTO TaxesOutgoing + |FROM + | Document.OpeningEntry.TaxesOutgoing AS TaxesOutgoing + |WHERE + | TaxesOutgoing.Ref = &Ref + | AND TaxesOutgoing.TaxAmount <> 0"; +EndFunction + #EndRegion #Region Posting_MainTables @@ -1962,6 +2012,21 @@ Function T9510S_Staffing() | TRUE"; EndFunction +Function R9541T_VacationUsage() + Return + "SELECT + | VALUE(AccumulationRecordType.Receipt) AS RecordType, + | EmployeeList.Period, + | EmployeeList.Company, + | EmployeeList.Employee, + | EmployeeList.RemainingVacationDays AS Days + |INTO R9541T_VacationUsage + |FROM + | EmployeeList AS EmployeeList + |WHERE + | EmployeeList.RemainingVacationDays > 0"; +EndFunction + Function R9545T_PaidVacations() Return "SELECT @@ -1977,6 +2042,46 @@ Function R9545T_PaidVacations() | EmployeeList.PaidVacationDays <> 0"; EndFunction +Function R2040B_TaxesIncoming() + Return + "SELECT + | VALUE(AccumulationRecordType.Receipt) AS RecordType, + | TaxesIncoming.Key, + | TaxesIncoming.Period, + | TaxesIncoming.Company, + | TaxesIncoming.Branch, + | TaxesIncoming.Currency, + | TaxesIncoming.TaxRate, + | TaxesIncoming.InvoiceType, + | TaxesIncoming.Amount, + | TaxesIncoming.Tax + |INTO R2040B_TaxesIncoming + |FROM + | TaxesIncoming AS TaxesIncoming + |WHERE + | TRUE"; +EndFunction + +Function R1040B_TaxesOutgoing() + Return + "SELECT + | VALUE(AccumulationRecordType.Receipt) AS RecordType, + | TaxesOutgoing.Key, + | TaxesOutgoing.Period, + | TaxesOutgoing.Company, + | TaxesOutgoing.Branch, + | TaxesOutgoing.Currency, + | TaxesOutgoing.TaxRate, + | TaxesOutgoing.InvoiceType, + | TaxesOutgoing.Amount, + | TaxesOutgoing.Tax + |INTO R1040B_TaxesOutgoing + |FROM + | TaxesOutgoing AS TaxesOutgoing + |WHERE + | TRUE"; +EndFunction + #EndRegion #Region AccessObject diff --git a/IRP/src/Documents/OpeningEntry/ObjectModule.bsl b/IRP/src/Documents/OpeningEntry/ObjectModule.bsl index 1ca19b81ae..e6394b0b48 100644 --- a/IRP/src/Documents/OpeningEntry/ObjectModule.bsl +++ b/IRP/src/Documents/OpeningEntry/ObjectModule.bsl @@ -21,6 +21,8 @@ Procedure BeforeWrite(Cancel, WriteMode, PostingMode) ArrayOfTableNames.Add("AccountPayableOther"); ArrayOfTableNames.Add("CashInTransit"); ArrayOfTableNames.Add("FixedAssets"); + ArrayOfTableNames.Add("TaxesIncoming"); + ArrayOfTableNames.Add("TaxesOutgoing"); For Each TableName In ArrayOfTableNames Do For Each Row In ThisObject[TableName] Do @@ -105,6 +107,16 @@ Procedure BeforeWrite(Cancel, WriteMode, PostingMode) CurrenciesClientServer.DeleteRowsByKeyFromCurrenciesTable(ThisObject.Currencies, Row.Key); CurrenciesServer.UpdateCurrencyTable(Parameters, ThisObject.Currencies); EndDo; + For Each Row In ThisObject.TaxesIncoming Do + Parameters = CurrenciesClientServer.GetParameters_V2(ThisObject, Row); + CurrenciesClientServer.DeleteRowsByKeyFromCurrenciesTable(ThisObject.Currencies, Row.Key); + CurrenciesServer.UpdateCurrencyTable(Parameters, ThisObject.Currencies); + EndDo; + For Each Row In ThisObject.TaxesOutgoing Do + Parameters = CurrenciesClientServer.GetParameters_V2(ThisObject, Row); + CurrenciesClientServer.DeleteRowsByKeyFromCurrenciesTable(ThisObject.Currencies, Row.Key); + CurrenciesServer.UpdateCurrencyTable(Parameters, ThisObject.Currencies); + EndDo; ThisObject.AdditionalProperties.Insert("OriginalDocumentDate", PostingServer.GetOriginalDocumentDate(ThisObject)); ThisObject.AdditionalProperties.Insert("IsPostingNewDocument" , WriteMode = DocumentWriteMode.Posting And Not Ref.Posted); diff --git a/IRP/src/Documents/OpeningEntry/OpeningEntry.mdo b/IRP/src/Documents/OpeningEntry/OpeningEntry.mdo index 43f4b82dd3..812f9953d0 100644 --- a/IRP/src/Documents/OpeningEntry/OpeningEntry.mdo +++ b/IRP/src/Documents/OpeningEntry/OpeningEntry.mdo @@ -125,6 +125,9 @@ AccumulationRegister.R5020B_PartnersBalance InformationRegister.T9510S_Staffing AccumulationRegister.R9545T_PaidVacations + AccumulationRegister.R9541T_VacationUsage + AccumulationRegister.R1040B_TaxesOutgoing + AccumulationRegister.R2040B_TaxesIncoming true true DontUse @@ -3012,7 +3015,7 @@ ru - Подотчет сотрудника + Авансовый отчет сотрудника tr @@ -4523,6 +4526,356 @@ Use + + + + + + TaxesIncoming + + en + Taxes incoming + + + ru + Входящие налоги + + + tr + Taxes incoming + + + Key + + en + Key + + + ru + Ключ + + + tr + Anahtar + + + DefinedType.typeRowID + + + + Use + Use + + + Currency + + en + Currency + + + ru + Валюта + + + tr + Döviz + + + CatalogRef.Currencies + + + + ShowError + Use + Use + + + VatRate + + en + VAT + + + ru + НДС + + + tr + KDV + + + CatalogRef.TaxRates + + + + ShowError + Use + Use + + + InvoiceType + + en + Invoice type + + + ru + Тип инвойса + + + tr + Invoice type + + + EnumRef.InvoiceType + + + + ShowError + Use + Use + + + NetAmount + + en + Net amount + + + ru + Сумма без налогов + + + tr + Net tutar + + + DefinedType.typeAmount + + + + ShowError + Use + + + TaxAmount + + en + Tax amount + + + ru + Сумма налогов + + + tr + Vergi tutarı + + + DefinedType.typeAmount + + + + Use + + + TotalAmount + + en + Total amount + + + ru + Итого + + + tr + Toplam tutar + + + DefinedType.typeAmount + + + + ShowError + Use + + + + + + + + TaxesOutgoing + + en + Taxes outgoing + + + ru + Исходящие налоги + + + tr + Taxes outgoing + + + Key + + en + Key + + + ru + Ключ + + + tr + Anahtar + + + DefinedType.typeRowID + + + + Use + Use + + + Currency + + en + Currency + + + ru + Валюта + + + tr + Döviz + + + CatalogRef.Currencies + + + + ShowError + Use + Use + + + VatRate + + en + VAT + + + ru + НДС + + + tr + KDV + + + CatalogRef.TaxRates + + + + ShowError + Use + Use + + + InvoiceType + + en + Invoice type + + + ru + Тип инвойса + + + tr + Invoice type + + + EnumRef.InvoiceType + + + + ShowError + Use + Use + + + NetAmount + + en + Net amount + + + ru + Сумма без налогов + + + tr + Net tutar + + + DefinedType.typeAmount + + + + ShowError + Use + + + TaxAmount + + en + Tax amount + + + ru + Сумма налогов + + + tr + Vergi tutarı + + + DefinedType.typeAmount + + + + Use + + + TotalAmount + + en + Total amount + + + ru + Итого + + + tr + Toplam tutar + + + DefinedType.typeAmount + + + + ShowError + Use + + OpeningEntryPrint diff --git a/IRP/src/Documents/Payroll/ManagerModule.bsl b/IRP/src/Documents/Payroll/ManagerModule.bsl index fade5ad56f..32f00673d8 100644 --- a/IRP/src/Documents/Payroll/ManagerModule.bsl +++ b/IRP/src/Documents/Payroll/ManagerModule.bsl @@ -614,8 +614,12 @@ Function GetAnalytics_DR_R9510B_SalaryPayment_CR_R5015B_OtherPartnersTransaction Parameters.ObjectData.Partner, Parameters.ObjectData.Agreement, Parameters.ObjectData.Currency); + AdditonalAnalytics = New Structure(); + AdditonalAnalytics.Insert("Partner" ,Parameters.ObjectData.Partner); + AdditonalAnalytics.Insert("Agreement" ,Parameters.ObjectData.Agreement); + AccountingAnalytics.Credit = Credit.AccountTransactionsOther; - AccountingServer.SetCreditExtDimensions(Parameters, AccountingAnalytics); + AccountingServer.SetCreditExtDimensions(Parameters, AccountingAnalytics, AdditonalAnalytics); Return AccountingAnalytics; EndFunction @@ -638,8 +642,12 @@ Function GetAnalytics_DR_R5022T_Expenses_CR_R5015B_OtherPartnersTransactions_Tax Parameters.ObjectData.Partner, Parameters.ObjectData.Agreement, Parameters.ObjectData.Currency); + AdditonalAnalytics = New Structure(); + AdditonalAnalytics.Insert("Partner" ,Parameters.ObjectData.Partner); + AdditonalAnalytics.Insert("Agreement" ,Parameters.ObjectData.Agreement); + AccountingAnalytics.Credit = Credit.AccountTransactionsOther; - AccountingServer.SetCreditExtDimensions(Parameters, AccountingAnalytics); + AccountingServer.SetCreditExtDimensions(Parameters, AccountingAnalytics, AdditonalAnalytics); Return AccountingAnalytics; EndFunction diff --git a/IRP/src/Documents/PurchaseInvoice/Forms/DocumentForm/Form.form b/IRP/src/Documents/PurchaseInvoice/Forms/DocumentForm/Form.form index cb6020d69a..1b8ff32718 100644 --- a/IRP/src/Documents/PurchaseInvoice/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/PurchaseInvoice/Forms/DocumentForm/Form.form @@ -386,6 +386,7 @@ true true true + DontUse diff --git a/IRP/src/Documents/PurchaseInvoice/ManagerModule.bsl b/IRP/src/Documents/PurchaseInvoice/ManagerModule.bsl index 2a3178fc7b..49b58c14ff 100644 --- a/IRP/src/Documents/PurchaseInvoice/ManagerModule.bsl +++ b/IRP/src/Documents/PurchaseInvoice/ManagerModule.bsl @@ -981,15 +981,17 @@ Function R1040B_TaxesOutgoing() | ItemList.Period, | ItemList.Company, | ItemList.Branch, + | ItemList.Currency, | &Vat AS Tax, | ItemList.VatRate AS TaxRate, - | ItemList.NetAmount AS TaxableAmount, - | ItemList.TaxAmount AS TaxAmount + | VALUE(Enum.InvoiceType.Invoice) AS InvoiceType, + | ItemList.TaxAmount AS Amount |INTO R1040B_TaxesOutgoing |FROM | ItemList AS ItemLIst |WHERE - | ItemList.IsPurchase"; + | ItemList.IsPurchase + | AND ItemList.TaxAmount <> 0"; EndFunction Function R2013T_SalesOrdersProcurement() @@ -1504,6 +1506,7 @@ Function T1040T_AccountingAmounts() | ItemList as ItemList |WHERE | ItemList.IsPurchase + | AND ItemList.TaxAmount <> 0 | |UNION ALL | diff --git a/IRP/src/Documents/PurchaseOrder/Forms/DocumentForm/Form.form b/IRP/src/Documents/PurchaseOrder/Forms/DocumentForm/Form.form index 79bd5e126b..2a4df17175 100644 --- a/IRP/src/Documents/PurchaseOrder/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/PurchaseOrder/Forms/DocumentForm/Form.form @@ -542,6 +542,7 @@ true true true + DontUse diff --git a/IRP/src/Documents/PurchaseReturn/Forms/DocumentForm/Form.form b/IRP/src/Documents/PurchaseReturn/Forms/DocumentForm/Form.form index 6935c502eb..bbfa2a9631 100644 --- a/IRP/src/Documents/PurchaseReturn/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/PurchaseReturn/Forms/DocumentForm/Form.form @@ -386,6 +386,7 @@ true true true + DontUse diff --git a/IRP/src/Documents/PurchaseReturn/ManagerModule.bsl b/IRP/src/Documents/PurchaseReturn/ManagerModule.bsl index 6fe3d1dbbb..e0218e7fd4 100644 --- a/IRP/src/Documents/PurchaseReturn/ManagerModule.bsl +++ b/IRP/src/Documents/PurchaseReturn/ManagerModule.bsl @@ -269,7 +269,7 @@ Function GetQueryTextsMasterTables() QueryArray.Add(R1020B_AdvancesToVendors()); QueryArray.Add(R1021B_VendorsTransactions()); QueryArray.Add(R1031B_ReceiptInvoicing()); - QueryArray.Add(R1040B_TaxesOutgoing()); + QueryArray.Add(R2040B_TaxesIncoming()); QueryArray.Add(R4010B_ActualStocks()); QueryArray.Add(R4011B_FreeStocks()); QueryArray.Add(R4014B_SerialLotNumber()); @@ -617,22 +617,24 @@ Function R1031B_ReceiptInvoicing() EndFunction -Function R1040B_TaxesOutgoing() +Function R2040B_TaxesIncoming() Return "SELECT | VALUE(AccumulationRecordType.Receipt) AS RecordType, | ItemList.Period, | ItemList.Company, | ItemList.Branch, + | ItemList.Currency, | &Vat AS Tax, | ItemList.VatRate AS TaxRate, - | ItemList.NetAmount AS TaxableAmount, - | ItemList.TaxAmount AS TaxAmount - |INTO R1040B_TaxesOutgoing + | VALUE(Enum.InvoiceType.Return) AS InvoiceType, + | ItemList.TaxAmount AS Amount + |INTO R2040B_TaxesIncoming |FROM | ItemList AS ItemLIst |WHERE - | ItemList.IsReturnToVendor"; + | ItemList.IsReturnToVendor + | AND ItemList.TaxAmount <> 0"; EndFunction Function R4010B_ActualStocks() @@ -900,12 +902,13 @@ Function T1040T_AccountingAmounts() | ItemList.Key AS RowKey, | ItemList.Currency, | ItemList.TaxAmount, - | VALUE(Catalog.AccountingOperations.PurchaseReturn_DR_R2040B_TaxesIncoming_CR_R1021B_VendorsTransactions), + | VALUE(Catalog.AccountingOperations.PurchaseReturn_DR_R1021B_VendorsTransactions_CR_R2040B_TaxesIncoming), | UNDEFINED |FROM | ItemList as ItemList |WHERE | ItemList.IsReturnToVendor + | AND ItemList.TaxAmount <> 0 | |UNION ALL | @@ -941,8 +944,8 @@ Function GetAccountingAnalytics(Parameters) Export Return GetAnalytics_DR_R1020B_AdvancesToVendors_CR_R1021B_VendorsTransactions(Parameters); ElsIf Parameters.Operation = AO.PurchaseReturn_DR_R1021B_VendorsTransactions_CR_R4050B_StockInventory Then Return GetAnalytics_DR_R1021B_VendorsTransactions_CR_R4050B_StockInventory(Parameters); - ElsIf Parameters.Operation = AO.PurchaseReturn_DR_R2040B_TaxesIncoming_CR_R1021B_VendorsTransactions Then - Return GetAnalytics_DR_R2040B_TaxesIncoming_CR_R1021B_VendorsTransactions(Parameters); + ElsIf Parameters.Operation = AO.PurchaseReturn_DR_R1021B_VendorsTransactions_CR_R2040B_TaxesIncoming Then + Return GetAnalytics_DR_R1021B_VendorsTransactions_CR_R2040B_TaxesIncoming(Parameters); EndIf; Return Undefined; @@ -998,25 +1001,25 @@ Function GetAnalytics_DR_R1021B_VendorsTransactions_CR_R4050B_StockInventory(Par Return AccountingAnalytics; EndFunction -Function GetAnalytics_DR_R2040B_TaxesIncoming_CR_R1021B_VendorsTransactions(Parameters) +Function GetAnalytics_DR_R1021B_VendorsTransactions_CR_R2040B_TaxesIncoming(Parameters) AccountingAnalytics = AccountingServer.GetAccountingAnalyticsResult(Parameters); AccountParameters = AccountingServer.GetAccountParameters(Parameters); - + // Debit - Debit = AccountingServer.GetT9013S_AccountsTax(AccountParameters, Parameters.RowData.TaxInfo); - AccountingAnalytics.Debit = Debit.IncomingAccount; - AccountingServer.SetDebitExtDimensions(Parameters, AccountingAnalytics, Parameters.RowData.TaxInfo); - - // Credit - Credit = AccountingServer.GetT9012S_AccountsPartner(AccountParameters, + Debit = AccountingServer.GetT9012S_AccountsPartner(AccountParameters, Parameters.ObjectData.Partner, Parameters.ObjectData.Agreement, Parameters.ObjectData.Currency); - AccountingAnalytics.Credit = Credit.AccountTransactionsVendor; + AccountingAnalytics.Debit = Debit.AccountTransactionsVendor; AdditionalAnalytics = New Structure(); AdditionalAnalytics.Insert("Partner", Parameters.ObjectData.Partner); - AccountingServer.SetCreditExtDimensions(Parameters, AccountingAnalytics); + AccountingServer.SetDebitExtDimensions(Parameters, AccountingAnalytics); + + // Credit + Credit = AccountingServer.GetT9013S_AccountsTax(AccountParameters, Parameters.RowData.TaxInfo); + AccountingAnalytics.Credit = Credit.IncomingAccountReturn; + AccountingServer.SetCreditExtDimensions(Parameters, AccountingAnalytics, Parameters.RowData.TaxInfo); Return AccountingAnalytics; EndFunction diff --git a/IRP/src/Documents/PurchaseReturn/PurchaseReturn.mdo b/IRP/src/Documents/PurchaseReturn/PurchaseReturn.mdo index b660f57a94..def25daa4c 100644 --- a/IRP/src/Documents/PurchaseReturn/PurchaseReturn.mdo +++ b/IRP/src/Documents/PurchaseReturn/PurchaseReturn.mdo @@ -165,7 +165,6 @@ AccumulationRegister.R4011B_FreeStocks AccumulationRegister.R4032B_GoodsInTransitOutgoing AccumulationRegister.R1031B_ReceiptInvoicing - AccumulationRegister.R1040B_TaxesOutgoing AccumulationRegister.R1012B_PurchaseOrdersInvoiceClosing InformationRegister.T6010S_BatchesInfo AccumulationRegister.TM1010T_RowIDMovements @@ -175,6 +174,7 @@ AccumulationRegister.R4014B_SerialLotNumber AccumulationRegister.R5020B_PartnersBalance AccumulationRegister.T1050T_AccountingQuantities + AccumulationRegister.R2040B_TaxesIncoming true true DontUse diff --git a/IRP/src/Documents/PurchaseReturnOrder/Forms/DocumentForm/Form.form b/IRP/src/Documents/PurchaseReturnOrder/Forms/DocumentForm/Form.form index a0bc3f596e..a451168343 100644 --- a/IRP/src/Documents/PurchaseReturnOrder/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/PurchaseReturnOrder/Forms/DocumentForm/Form.form @@ -386,6 +386,7 @@ true true true + DontUse diff --git a/IRP/src/Documents/SalesInvoice/Forms/DocumentForm/Form.form b/IRP/src/Documents/SalesInvoice/Forms/DocumentForm/Form.form index 076bff3138..a4928591fb 100644 --- a/IRP/src/Documents/SalesInvoice/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/SalesInvoice/Forms/DocumentForm/Form.form @@ -386,6 +386,7 @@ true true true + DontUse diff --git a/IRP/src/Documents/SalesInvoice/ManagerModule.bsl b/IRP/src/Documents/SalesInvoice/ManagerModule.bsl index ec85bc5dda..a4c007f689 100644 --- a/IRP/src/Documents/SalesInvoice/ManagerModule.bsl +++ b/IRP/src/Documents/SalesInvoice/ManagerModule.bsl @@ -721,15 +721,17 @@ Function R2040B_TaxesIncoming() | ItemList.Period, | ItemList.Company, | ItemList.Branch, + | ItemList.Currency, | &Vat AS Tax, | ItemList.VatRate AS TaxRate, - | ItemList.TaxAmount, - | ItemLIst.NetAmount AS TaxableAmount + | ItemList.TaxAmount AS Amount, + | VALUE(Enum.InvoiceType.Invoice) AS InvoiceType |INTO R2040B_TaxesIncoming |FROM | ItemList AS ItemList |WHERE - | ItemList.IsSales"; + | ItemList.IsSales + | AND ItemList.TaxAmount <> 0"; EndFunction Function R4010B_ActualStocks() @@ -1351,7 +1353,7 @@ Function T1040T_AccountingAmounts() | ItemList.Period, | ItemList.Key AS RowKey, | ItemList.Currency, - | ItemList.Amount AS Amount, + | ItemList.NetAmount AS Amount, | VALUE(Catalog.AccountingOperations.SalesInvoice_DR_R2021B_CustomersTransactions_CR_R5021T_Revenues) AS Operation, | UNDEFINED AS AdvancesClosing |INTO T1040T_AccountingAmounts @@ -1367,12 +1369,13 @@ Function T1040T_AccountingAmounts() | ItemList.Key AS RowKey, | ItemList.Currency, | ItemList.TaxAmount, - | VALUE(Catalog.AccountingOperations.SalesInvoice_DR_R5021T_Revenues_CR_R2040B_TaxesIncoming), + | VALUE(Catalog.AccountingOperations.SalesInvoice_DR_R2021B_CustomersTransactions_CR_R2040B_TaxesIncoming), | UNDEFINED |FROM | ItemList as ItemList |WHERE | ItemList.IsSales + | AND ItemList.TaxAmount <> 0 | |UNION ALL | @@ -1408,9 +1411,9 @@ Function GetAccountingAnalytics(Parameters) Export Return GetAnalytics_RevenueFromSales(Parameters); // Customer transactions - Revenues - ElsIf Parameters.Operation = Operations.SalesInvoice_DR_R5021T_Revenues_CR_R2040B_TaxesIncoming Then + ElsIf Parameters.Operation = Operations.SalesInvoice_DR_R2021B_CustomersTransactions_CR_R2040B_TaxesIncoming Then - Return GetAnalytics_VATIncoming(Parameters); // Revenues - Tax outgoing + Return GetAnalytics_VATIncoming(Parameters); // Customer transaction - Tax incoming ElsIf Parameters.Operation = Operations.SalesInvoice_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransactions Then @@ -1454,21 +1457,21 @@ Function GetAnalytics_RevenueFromSales(Parameters) Return AccountingAnalytics; EndFunction -// Revenues - Taxes outgoing +// Customer transactions - Taxes incoming Function GetAnalytics_VATIncoming(Parameters) AccountingAnalytics = AccountingServer.GetAccountingAnalyticsResult(Parameters); AccountParameters = AccountingServer.GetAccountParameters(Parameters); - + // Debit - Debit = AccountingServer.GetT9014S_AccountsExpenseRevenue(AccountParameters, - Parameters.RowData.RevenueType, - Parameters.RowData.ProfitLossCenter); - If Parameters.RowData.OtherPeriodRevenueType = Enums.OtherPeriodRevenueType.RevenueAccruals Then - AccountingAnalytics.Debit = Debit.AccountOtherPeriodsRevenue; - Else - AccountingAnalytics.Debit = Debit.AccountRevenue; - EndIf; - AccountingServer.SetDebitExtDimensions(Parameters, AccountingAnalytics); + Debit = AccountingServer.GetT9012S_AccountsPartner(AccountParameters, + Parameters.ObjectData.Partner, + Parameters.ObjectData.Agreement, + Parameters.ObjectData.Currency); + + AccountingAnalytics.Debit = Debit.AccountTransactionsCustomer; + AdditionalAnalytics = New Structure(); + AdditionalAnalytics.Insert("Partner", Parameters.ObjectData.Partner); + AccountingServer.SetDebitExtDimensions(Parameters, AccountingAnalytics, AdditionalAnalytics); // Credit Credit = AccountingServer.GetT9013S_AccountsTax(AccountParameters, Parameters.RowData.TaxInfo); diff --git a/IRP/src/Documents/SalesOrder/Forms/DocumentForm/Form.form b/IRP/src/Documents/SalesOrder/Forms/DocumentForm/Form.form index 86638ddcfa..5d13c85e36 100644 --- a/IRP/src/Documents/SalesOrder/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/SalesOrder/Forms/DocumentForm/Form.form @@ -595,6 +595,7 @@ true true true + DontUse diff --git a/IRP/src/Documents/SalesReportFromTradeAgent/ManagerModule.bsl b/IRP/src/Documents/SalesReportFromTradeAgent/ManagerModule.bsl index bb51f0202f..8d9f8ea0a8 100644 --- a/IRP/src/Documents/SalesReportFromTradeAgent/ManagerModule.bsl +++ b/IRP/src/Documents/SalesReportFromTradeAgent/ManagerModule.bsl @@ -432,15 +432,16 @@ Function R2040B_TaxesIncoming() | ItemList.Period, | ItemList.Company, | ItemList.Branch, + | ItemList.Currency, | &Vat AS Tax, | ItemList.VatRate AS TaxRate, - | ItemList.TaxAmount, - | ItemLIst.NetAmount AS TaxableAmount + | ItemList.TaxAmount AS Amount, + | VALUE(Enum.InvoiceType.Invoice) AS InvoiceType |INTO R2040B_TaxesIncoming |FROM | ItemList AS ItemList |WHERE - | TRUE"; + | ItemList.TaxAmount <> 0"; EndFunction Function R4050B_StockInventory() diff --git a/IRP/src/Documents/SalesReportToConsignor/ManagerModule.bsl b/IRP/src/Documents/SalesReportToConsignor/ManagerModule.bsl index 36356fb569..9b02808f6b 100644 --- a/IRP/src/Documents/SalesReportToConsignor/ManagerModule.bsl +++ b/IRP/src/Documents/SalesReportToConsignor/ManagerModule.bsl @@ -177,15 +177,16 @@ Function R1040B_TaxesOutgoing() | ItemList.Period, | ItemList.Company, | ItemList.Branch, + | ItemList.Currency, | &Vat AS Tax, | ItemList.VatRate AS TaxRate, - | -ItemList.NetAmount AS TaxableAmount, - | -ItemList.TaxAmount AS TaxAmount + | VALUE(Enum.InvoiceType.Invoice) AS InvoiceType, + | -ItemList.TaxAmount AS Amount |INTO R1040B_TaxesOutgoing |FROM | ItemList AS ItemLIst |WHERE - | TRUE"; + | ItemList.TaxAmount <> 0"; EndFunction Function R5010B_ReconciliationStatement() diff --git a/IRP/src/Documents/SalesReturn/Forms/DocumentForm/Form.form b/IRP/src/Documents/SalesReturn/Forms/DocumentForm/Form.form index 0f76240668..5670c81561 100644 --- a/IRP/src/Documents/SalesReturn/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/SalesReturn/Forms/DocumentForm/Form.form @@ -386,6 +386,7 @@ true true true + DontUse diff --git a/IRP/src/Documents/SalesReturn/ManagerModule.bsl b/IRP/src/Documents/SalesReturn/ManagerModule.bsl index aac1b3aeb6..ee6a85a1d5 100644 --- a/IRP/src/Documents/SalesReturn/ManagerModule.bsl +++ b/IRP/src/Documents/SalesReturn/ManagerModule.bsl @@ -510,7 +510,7 @@ Function GetQueryTextsMasterTables() QueryArray.Add(R2020B_AdvancesFromCustomers()); QueryArray.Add(R2021B_CustomersTransactions()); QueryArray.Add(R2031B_ShipmentInvoicing()); - QueryArray.Add(R2040B_TaxesIncoming()); + QueryArray.Add(R1040B_TaxesOutgoing()); QueryArray.Add(R4010B_ActualStocks()); QueryArray.Add(R4011B_FreeStocks()); QueryArray.Add(R4014B_SerialLotNumber()); @@ -890,22 +890,24 @@ Function R2031B_ShipmentInvoicing() | TRUE"; EndFunction -Function R2040B_TaxesIncoming() +Function R1040B_TaxesOutgoing() Return "SELECT | VALUE(AccumulationRecordType.Receipt) AS RecordType, | ItemList.Period, | ItemList.Company, | ItemList.Branch, + | ItemList.Currency, | &Vat AS Tax, | ItemList.VatRate AS TaxRate, - | ItemList.TaxAmount AS TaxAmount, - | ItemLIst.NetAmount AS TaxableAmount - |INTO R2040B_TaxesIncoming + | ItemList.TaxAmount AS Amount, + | VALUE(Enum.InvoiceType.Return) AS InvoiceType + |INTO R1040B_TaxesOutgoing |FROM | ItemList AS ItemList |WHERE - | ItemList.IsReturnFromCustomer"; + | ItemList.IsReturnFromCustomer + | AND ItemList.TaxAmount <> 0"; EndFunction #Region Stock @@ -1197,7 +1199,6 @@ Function T6020S_BatchKeysInfo() | END) AS Quantity, | 0, | 0, - //| UNDEFINED, | ISNULL(SourceOfOrigins.SerialLotNumber, VALUE(Catalog.SerialLotNumbers.EmptyRef)) AS SerialLotNumber, | ISNULL(SourceOfOrigins.SourceOfOrigin, VALUE(Catalog.SourceOfOrigins.EmptyRef)) AS SourceOfOrigin |FROM @@ -1278,7 +1279,7 @@ Function T1040T_AccountingAmounts() | ItemList.Period, | ItemList.Key AS RowKey, | ItemList.Currency, - | ItemList.Amount AS Amount, + | ItemList.NetAmount AS Amount, | VALUE(Catalog.AccountingOperations.SalesReturn_DR_R5021T_Revenues_CR_R2021B_CustomersTransactions) AS Operation, | UNDEFINED AS AdvancesClosing |INTO T1040T_AccountingAmounts @@ -1294,12 +1295,13 @@ Function T1040T_AccountingAmounts() | ItemList.Key AS RowKey, | ItemList.Currency, | ItemList.TaxAmount, - | VALUE(Catalog.AccountingOperations.SalesReturn_DR_R5021T_Revenues_CR_R1040B_TaxesOutgoing), + | VALUE(Catalog.AccountingOperations.SalesReturn_DR_R1040B_TaxesOutgoing_CR_R2021B_CustomersTransactions), | UNDEFINED |FROM | ItemList as ItemList |WHERE | ItemList.IsReturnFromCustomer + | AND ItemList.TaxAmount <> 0 | |UNION ALL | @@ -1335,8 +1337,8 @@ Function GetAccountingAnalytics(Parameters) Export Return GetAnalytics_DR_R2021B_CustomersTransactions_CR_R2020B_AdvancesFromCustomers(Parameters); ElsIf Parameters.Operation = AO.SalesReturn_DR_R5021T_Revenues_CR_R2021B_CustomersTransactions Then Return GetAnalytics_DR_R5021T_Revenues_CR_R2021B_CustomersTransactions(Parameters); - ElsIf Parameters.Operation = AO.SalesReturn_DR_R5021T_Revenues_CR_R1040B_TaxesOutgoing Then - Return GetAnalytics_DR_R5021T_Revenues_CR_R1040B_TaxesOutgoing(Parameters); + ElsIf Parameters.Operation = AO.SalesReturn_DR_R1040B_TaxesOutgoing_CR_R2021B_CustomersTransactions Then + Return GetAnalytics_DR_R1040B_TaxesOutgoing_CR_R2021B_CustomersTransactions(Parameters); ElsIf Parameters.Operation = AO.SalesReturn_DR_R5022T_Expenses_CR_R4050B_StockInventory Then Return GetAnalytics_DR_R5022T_Expenses_CR_R4050B_StockInventory(Parameters); EndIf; @@ -1395,21 +1397,25 @@ Function GetAnalytics_DR_R5021T_Revenues_CR_R2021B_CustomersTransactions(Paramet Return AccountingAnalytics; EndFunction -Function GetAnalytics_DR_R5021T_Revenues_CR_R1040B_TaxesOutgoing(Parameters) +Function GetAnalytics_DR_R1040B_TaxesOutgoing_CR_R2021B_CustomersTransactions(Parameters) AccountingAnalytics = AccountingServer.GetAccountingAnalyticsResult(Parameters); AccountParameters = AccountingServer.GetAccountParameters(Parameters); // Debit - Debit = AccountingServer.GetT9014S_AccountsExpenseRevenue(AccountParameters, - Parameters.RowData.RevenueType, - Parameters.RowData.ProfitLossCenter); - AccountingAnalytics.Debit = Debit.AccountRevenue; - AccountingServer.SetDebitExtDimensions(Parameters, AccountingAnalytics); + Debit = AccountingServer.GetT9013S_AccountsTax(AccountParameters, Parameters.RowData.TaxInfo); + AccountingAnalytics.Debit = Debit.OutgoingAccountReturn; + AccountingServer.SetDebitExtDimensions(Parameters, AccountingAnalytics, Parameters.RowData.TaxInfo); // Credit - Credit = AccountingServer.GetT9013S_AccountsTax(AccountParameters, Parameters.RowData.TaxInfo); - AccountingAnalytics.Credit = Credit.OutgoingAccount; - AccountingServer.SetCreditExtDimensions(Parameters, AccountingAnalytics, Parameters.RowData.TaxInfo); + Credit = AccountingServer.GetT9012S_AccountsPartner(AccountParameters, + Parameters.ObjectData.Partner, + Parameters.ObjectData.Agreement, + Parameters.ObjectData.Currency); + + AccountingAnalytics.Credit = Credit.AccountTransactionsCustomer; + AdditionalAnalytics = New Structure(); + AdditionalAnalytics.Insert("Partner", Parameters.ObjectData.Partner); + AccountingServer.SetCreditExtDimensions(Parameters, AccountingAnalytics, AdditionalAnalytics); Return AccountingAnalytics; EndFunction diff --git a/IRP/src/Documents/SalesReturn/SalesReturn.mdo b/IRP/src/Documents/SalesReturn/SalesReturn.mdo index 48f7af40ac..dd5497e956 100644 --- a/IRP/src/Documents/SalesReturn/SalesReturn.mdo +++ b/IRP/src/Documents/SalesReturn/SalesReturn.mdo @@ -167,7 +167,6 @@ AccumulationRegister.R5011B_CustomersAging AccumulationRegister.R2020B_AdvancesFromCustomers AccumulationRegister.R5021T_Revenues - AccumulationRegister.R2040B_TaxesIncoming AccumulationRegister.TM1010T_RowIDMovements AccumulationRegister.R6020B_BatchBalance AccumulationRegister.T1040T_AccountingAmounts @@ -176,6 +175,7 @@ AccumulationRegister.R2012B_SalesOrdersInvoiceClosing AccumulationRegister.R5020B_PartnersBalance AccumulationRegister.T1050T_AccountingQuantities + AccumulationRegister.R1040B_TaxesOutgoing true true DontUse diff --git a/IRP/src/Documents/SalesReturnOrder/Forms/DocumentForm/Form.form b/IRP/src/Documents/SalesReturnOrder/Forms/DocumentForm/Form.form index ead48aacd3..264006b43d 100644 --- a/IRP/src/Documents/SalesReturnOrder/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/SalesReturnOrder/Forms/DocumentForm/Form.form @@ -387,6 +387,7 @@ true true true + DontUse diff --git a/IRP/src/Documents/StockAdjustmentAsSurplus/Forms/DocumentForm/Form.form b/IRP/src/Documents/StockAdjustmentAsSurplus/Forms/DocumentForm/Form.form index b74186d60d..8c73df0294 100644 --- a/IRP/src/Documents/StockAdjustmentAsSurplus/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/StockAdjustmentAsSurplus/Forms/DocumentForm/Form.form @@ -1682,23 +1682,23 @@ - ItemListAmount - 419 + ItemListVatRate + 502 true true true - Object.ItemList.Amount + Object.ItemList.VatRate OnChange - ItemListAmountOnChange + ItemListVatRateOnChange - ItemListAmountExtendedTooltip - 421 + ItemListVatRateExtendedTooltip + 504 true true @@ -1712,8 +1712,8 @@ - ItemListAmountContextMenu - 420 + ItemListVatRateContextMenu + 503 true true @@ -1736,19 +1736,77 @@ - ItemListAmountTax - 430 + ItemListTaxAmount + 505 true true true - Object.ItemList.AmountTax + Object.ItemList.TaxAmount + + OnChange + ItemListTaxAmountOnChange + + + ItemListTaxAmountExtendedTooltip + 507 + true + true + + true + + Label + true + true + + Left + + + + ItemListTaxAmountContextMenu + 506 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + ItemListNetAmount + 508 + true + true + + true + + + Object.ItemList.NetAmount + + + OnChange + ItemListNetAmountOnChange + - ItemListAmountTaxExtendedTooltip - 432 + ItemListNetAmountExtendedTooltip + 510 true true @@ -1762,8 +1820,62 @@ - ItemListAmountTaxContextMenu - 431 + ItemListNetAmountContextMenu + 509 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + ItemListTotalAmount + 511 + true + true + + true + + + Object.ItemList.TotalAmount + + + OnChange + ItemListTotalAmountOnChange + + + ItemListTotalAmountExtendedTooltip + 513 + true + true + + true + + Label + true + true + + Left + + + + ItemListTotalAmountContextMenu + 512 true true @@ -2290,6 +2402,10 @@ Object.Date + + OnChange + DateOnChange + DateExtendedTooltip 6 diff --git a/IRP/src/Documents/StockAdjustmentAsSurplus/Forms/DocumentForm/Module.bsl b/IRP/src/Documents/StockAdjustmentAsSurplus/Forms/DocumentForm/Module.bsl index 5df71de2e5..5e0e26acb1 100644 --- a/IRP/src/Documents/StockAdjustmentAsSurplus/Forms/DocumentForm/Module.bsl +++ b/IRP/src/Documents/StockAdjustmentAsSurplus/Forms/DocumentForm/Module.bsl @@ -116,6 +116,14 @@ EndProcedure #EndRegion +#Region _DATE + &AtClient +Procedure DateOnChange(Item) + DocStockAdjustmentAsSurplusClient.DateOnChange(Object, ThisObject, Item); +EndProcedure + +#EndRegion + #Region STORE &AtClient @@ -267,14 +275,25 @@ EndProcedure #EndRegion -#Region AMOUNT +&AtClient +Procedure ItemListVatRateOnChange(Item) + ViewClient_V2.ItemListVatRateOnChange(Object, ThisObject); +EndProcedure + +&AtClient +Procedure ItemListTaxAmountOnChange(Item) + ViewClient_V2.ItemListTaxAmountOnChange(Object, ThisObject); +EndProcedure &AtClient -Procedure ItemListAmountOnChange(Item) - DocStockAdjustmentAsSurplusClient.ItemListAmountOnChange(Object, ThisObject); +Procedure ItemListNetAmountOnChange(Item) + ViewClient_V2.ItemListNetAmountOnChange(Object, ThisObject); EndProcedure -#EndRegion +&AtClient +Procedure ItemListTotalAmountOnChange(Item) + ViewClient_V2.ItemListTotalAmountOnChange(Object, ThisObject); +EndProcedure #EndRegion @@ -529,7 +548,7 @@ Procedure EditCurrencies(Command) If CurrentData = Undefined Then Return; EndIf; - FormParameters = CurrenciesClientServer.GetParameters_V5(Object, CurrentData); + FormParameters = CurrenciesClientServer.GetParameters_V14(Object, CurrentData); NotifyParameters = New Structure(); NotifyParameters.Insert("Object", Object); NotifyParameters.Insert("Form" , ThisObject); diff --git a/IRP/src/Documents/StockAdjustmentAsSurplus/ManagerModule.bsl b/IRP/src/Documents/StockAdjustmentAsSurplus/ManagerModule.bsl index 53e14e838f..f38463ad24 100644 --- a/IRP/src/Documents/StockAdjustmentAsSurplus/ManagerModule.bsl +++ b/IRP/src/Documents/StockAdjustmentAsSurplus/ManagerModule.bsl @@ -45,9 +45,9 @@ Function StockAdjustmentAsSurplusPrint(Ref, Param) | DocumentItemList.Quantity AS Quantity, | DocumentItemList.Unit.Description_en AS Unit, | DocumentItemList.Price AS Price, - | DocumentItemList.AmountTax AS TaxAmount, - | DocumentItemList.Amount AS TotalAmount, - | DocumentItemList.Amount AS NetAmount, + | DocumentItemList.TaxAmount AS TaxAmount, + | DocumentItemList.TotalAmount AS TotalAmount, + | DocumentItemList.NetAmount AS NetAmount, | DocumentItemList.Ref AS Ref, | DocumentItemList.Key AS Key |INTO Items @@ -292,8 +292,9 @@ Function ItemList() | ItemList.PhysicalInventory AS PhysicalInventory, | ItemList.Ref AS Basis, | ItemList.QuantityInBaseUnit AS Quantity, - | ItemList.Amount AS Amount, - | ItemList.AmountTax AS AmountTax, + | ItemList.NetAmount AS NetAmount, + | ItemList.TaxAmount AS TaxAmount, + | ItemList.TotalAmount AS TotalAmount, | ItemList.Key |INTO ItemList |FROM @@ -513,8 +514,8 @@ Function T6020S_BatchKeysInfo() | ItemList.Company.LandedCostCurrencyMovementType AS CurrencyMovementType, | ItemList.Company.LandedCostCurrencyMovementType.Currency AS Currency, | ItemList.Quantity AS TotalQuantity, - | ItemList.Amount AS InvoiceAmount, - | ItemList.AmountTax AS InvoiceTaxAmount, + | ItemList.TotalAmount AS InvoiceAmount, + | ItemList.TaxAmount AS InvoiceTaxAmount, | ItemList.Period, | VALUE(Enum.BatchDirection.Receipt) AS Direction |INTO BatchKeysInfo_1 @@ -600,7 +601,8 @@ Function R5021T_Revenues() | ItemList.RevenueType, | ItemList.ItemKey, | ItemList.Currency, - | ItemList.Amount, + | ItemList.NetAmount AS Amount, + | ItemList.TotalAmount AS AmountWithTaxes, | ItemList.Key |INTO R5021T_Revenues |FROM diff --git a/IRP/src/Documents/StockAdjustmentAsSurplus/ObjectModule.bsl b/IRP/src/Documents/StockAdjustmentAsSurplus/ObjectModule.bsl index ee55330b34..c1477e36a6 100644 --- a/IRP/src/Documents/StockAdjustmentAsSurplus/ObjectModule.bsl +++ b/IRP/src/Documents/StockAdjustmentAsSurplus/ObjectModule.bsl @@ -5,7 +5,7 @@ Procedure BeforeWrite(Cancel, WriteMode, PostingMode) CurrenciesClientServer.DeleteUnusedRowsFromCurrenciesTable(ThisObject.Currencies, ThisObject.ItemList); For Each Row In ThisObject.ItemList Do - Parameters = CurrenciesClientServer.GetParameters_V5(ThisObject, Row); + Parameters = CurrenciesClientServer.GetParameters_V14(ThisObject, Row); CurrenciesClientServer.DeleteRowsByKeyFromCurrenciesTable(ThisObject.Currencies, Row.Key); CurrenciesServer.UpdateCurrencyTable(Parameters, ThisObject.Currencies); EndDo; diff --git a/IRP/src/Documents/StockAdjustmentAsSurplus/StockAdjustmentAsSurplus.mdo b/IRP/src/Documents/StockAdjustmentAsSurplus/StockAdjustmentAsSurplus.mdo index 5aaaa9d39d..e15db2cdf0 100644 --- a/IRP/src/Documents/StockAdjustmentAsSurplus/StockAdjustmentAsSurplus.mdo +++ b/IRP/src/Documents/StockAdjustmentAsSurplus/StockAdjustmentAsSurplus.mdo @@ -485,18 +485,18 @@ Use - Amount + NetAmount en - Amount + Net amount ru - Сумма + Сумма без налогов tr - Tutar + Net tutar DefinedType.typeAmount @@ -507,10 +507,10 @@ Use - AmountTax + TaxAmount en - Amount tax + Tax amount ru @@ -593,6 +593,50 @@ Use Use + + TotalAmount + + en + Total amount + + + ru + Итого + + + tr + Toplam tutar + + + DefinedType.typeAmount + + + + Use + Use + + + VatRate + + en + VAT + + + ru + НДС + + + tr + KDV + + + CatalogRef.TaxRates + + + + Use + Use + diff --git a/IRP/src/Documents/TaxesOperation/Forms/ChoiceForm/Attributes/List/ExtInfo/ListSettings.dcss b/IRP/src/Documents/TaxesOperation/Forms/ChoiceForm/Attributes/List/ExtInfo/ListSettings.dcss new file mode 100644 index 0000000000..a1d859ec51 --- /dev/null +++ b/IRP/src/Documents/TaxesOperation/Forms/ChoiceForm/Attributes/List/ExtInfo/ListSettings.dcss @@ -0,0 +1,17 @@ + + + + Normal + abf47f0a-0dac-42ab-98b3-5870d3c6f01a + + + Normal + d6efe581-2b3f-4b97-9730-3e146c2ffce7 + + + Normal + b611724c-7808-42b9-8a90-88cf9f55b466 + + Normal + af963ced-6a92-4738-bb13-b97f6ba70bc3 + \ No newline at end of file diff --git a/IRP/src/Documents/TaxesOperation/Forms/ChoiceForm/Form.form b/IRP/src/Documents/TaxesOperation/Forms/ChoiceForm/Form.form new file mode 100644 index 0000000000..f6420f6f2e --- /dev/null +++ b/IRP/src/Documents/TaxesOperation/Forms/ChoiceForm/Form.form @@ -0,0 +1,624 @@ + + + + ListSettingsComposerUserSettings + 1 + true + true + + true + + + <key>en</key> + <value>User settings group</value> + + + <key>ru</key> + <value>Группа пользовательских настроек</value> + + + <key>tr</key> + <value>Kullanıcı ayarlar grubu</value> + + false + + ListSettingsComposerUserSettingsExtendedTooltip + 2 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + Vertical + Auto + WeakSeparation + true + true + Auto + Auto + + + + List + 3 + true + true + + true + + + List + + true + None + + Number + 19 + true + true + + true + + + List.Number + + + NumberExtendedTooltip + 21 + true + true + + true + + Label + true + true + + Left + + + + NumberContextMenu + 20 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + Date + 22 + true + true + + true + + + List.Date + + + DateExtendedTooltip + 24 + true + true + + true + + Label + true + true + + Left + + + + DateContextMenu + 23 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + Company + 25 + true + true + + true + + + List.Company + + + CompanyExtendedTooltip + 27 + true + true + + true + + Label + true + true + + Left + + + + CompanyContextMenu + 26 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + Currency + 28 + true + true + + true + + + List.Currency + + + CurrencyExtendedTooltip + 30 + true + true + + true + + Label + true + true + + Left + + + + CurrencyContextMenu + 29 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + TransactionType + 31 + true + true + + true + + + List.TransactionType + + + TransactionTypeExtendedTooltip + 33 + true + true + + true + + Label + true + true + + Left + + + + TransactionTypeContextMenu + 32 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + Branch + 34 + true + true + + true + + + List.Branch + + + BranchExtendedTooltip + 36 + true + true + + true + + Label + true + true + + Left + + + + BranchContextMenu + 35 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + Ref + 16 + true + true + + + List.Ref + + true + + RefExtendedTooltip + 18 + true + true + + true + + Label + true + true + + Left + + + + RefContextMenu + 17 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + None + + ListCommandBar + 5 + true + true + + true + + Left + + + true + true + + true + + ListSearchString + 7 + + ListSearchStringExtendedTooltip + 9 + true + true + + true + + Label + true + true + + Left + + + + ListSearchStringContextMenu + 8 + true + true + + true + + true + + ListSearchString + + true + + + + true + true + + true + + ListViewStatus + 10 + + ListViewStatusExtendedTooltip + 12 + true + true + + true + + Label + true + true + + Left + + + + ListViewStatusContextMenu + 11 + true + true + + true + + true + + ViewStatusAddition + ListViewStatus + + true + + + + true + true + + true + + ListSearchControl + 13 + + ListSearchControlExtendedTooltip + 15 + true + true + + true + + Label + true + true + + Left + + + + ListSearchControlContextMenu + 14 + true + true + + true + + true + + SearchControlAddition + ListSearchControl + + true + + + + ListExtendedTooltip + 6 + true + true + + true + + Label + true + true + + Left + + + + ListContextMenu + 4 + true + true + + true + + true + + true + true + true + true + true + true + MultiRow +
true
+ 1 + 1 + AutoUse + AutoUse + true + true + true + Auto + Auto + ExpandTopLevel + true + true + true + true + AsFileRef + + List.DefaultPicture + + + 60 + + 0001-01-01T00:00:00 + 0001-01-01T00:00:00 + + + true + true + ListSettingsComposerUserSettings + + + + FormCommandBar + -1 + true + true + + true + + Left + true + + + OnCreateAtServer + OnCreateAtServer + + LockOwnerWindow + true + true + Vertical + true + true + true + true + true + + List + 1 + + DynamicList + + + true + + + true + +
true
+ + Document.TaxesOperation + true + true + true + true + + + + + + + + \ No newline at end of file diff --git a/IRP/src/Documents/TaxesOperation/Forms/ChoiceForm/Module.bsl b/IRP/src/Documents/TaxesOperation/Forms/ChoiceForm/Module.bsl new file mode 100644 index 0000000000..074a9c54de --- /dev/null +++ b/IRP/src/Documents/TaxesOperation/Forms/ChoiceForm/Module.bsl @@ -0,0 +1,39 @@ +#Region FormEvents + +&AtServer +Procedure OnCreateAtServer(Cancel, StandardProcessing) + DocTaxesOperationServer.OnCreateAtServerChoiceForm(ThisObject, Cancel, StandardProcessing); +EndProcedure + +#EndRegion + +#Region COMMANDS + +&AtClient +Procedure InternalCommandAction(Command) Export + InternalCommandsClient.RunCommandAction(Command, ThisObject, List, Items.List.SelectedRows); +EndProcedure + +&AtClient +Procedure InternalCommandActionWithServerContext(Command) Export + InternalCommandActionWithServerContextAtServer(Command.Name); +EndProcedure + +&AtServer +Procedure InternalCommandActionWithServerContextAtServer(CommandName) + InternalCommandsServer.RunCommandAction(CommandName, ThisObject, List, Items.List.SelectedRows); +EndProcedure + +&AtClient +Procedure GeneratedFormCommandActionByName(Command) Export + SelectedRows = Items.List.SelectedRows; + ExternalCommandsClient.GeneratedListChoiceFormCommandActionByName(SelectedRows, ThisObject, Command.Name); + GeneratedFormCommandActionByNameServer(Command.Name, SelectedRows); +EndProcedure + +&AtServer +Procedure GeneratedFormCommandActionByNameServer(CommandName, SelectedRows) Export + ExternalCommandsServer.GeneratedListChoiceFormCommandActionByName(SelectedRows, ThisObject, CommandName); +EndProcedure + +#EndRegion \ No newline at end of file diff --git a/IRP/src/Documents/TaxesOperation/Forms/DocumentForm/ConditionalAppearance.dcssca b/IRP/src/Documents/TaxesOperation/Forms/DocumentForm/ConditionalAppearance.dcssca new file mode 100644 index 0000000000..438ff5a9c1 --- /dev/null +++ b/IRP/src/Documents/TaxesOperation/Forms/DocumentForm/ConditionalAppearance.dcssca @@ -0,0 +1,35 @@ + + + + + + CostListBasis + + + + + Object.CostList.Basis + NotFilled + + + + + Text + + + en + Current document + + + ru + Текущий документ + + + tr + Geçerli evrak + + + + + + \ No newline at end of file diff --git a/IRP/src/Documents/TaxesOperation/Forms/DocumentForm/Form.form b/IRP/src/Documents/TaxesOperation/Forms/DocumentForm/Form.form new file mode 100644 index 0000000000..6f1bf50a0c --- /dev/null +++ b/IRP/src/Documents/TaxesOperation/Forms/DocumentForm/Form.form @@ -0,0 +1,3542 @@ + + + + GroupTitle + 63 + + GroupTitleDecorations + 65 + + GroupTitleCollapsed + 67 + + DecorationGroupTitleCollapsedPicture + 69 + + <key>en</key> + <value>Decoration group title collapsed picture</value> + + + <key>ru</key> + <value>Группа декораций рисунок свернутой шапки</value> + + + <key>tr</key> + <value>Dekorasyon grubu başlık daraltılmış resmi</value> + + true + true + + true + + + DecorationGroupTitleCollapsedPictureExtendedTooltip + 71 + true + true + + true + + Label + true + true + + Left + + + + DecorationGroupTitleCollapsedPictureContextMenu + 70 + true + true + + true + + true + + true + true + + + Click + DecorationGroupTitleCollapsedPictureClick + + + StdPicture.MoveRight + + true + AsFileRef + + + + DecorationGroupTitleCollapsedLabel + 72 + + <key>en</key> + <value>Please, fill the document</value> + + + <key>ru</key> + <value>Пожалуйста, заполните документ</value> + + + <key>tr</key> + <value>Lütfen, evrakı doldurunuz</value> + + true + true + + true + + + DecorationGroupTitleCollapsedLabelExtendedTooltip + 74 + true + true + + true + + Label + true + true + + Left + + + + DecorationGroupTitleCollapsedLabelContextMenu + 73 + true + true + + true + + true + + Label + 100 + true + + + Click + DecorationGroupTitleCollapsedLabelClick + + true + Left + + + true + true + + true + + + GroupTitleCollapsedExtendedTooltip + 68 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + HorizontalIfPossible + true + true + Auto + Auto + + + + GroupTitleUncollapsed + 75 + + DecorationGroupTitleUncollapsedPicture + 77 + true + true + + true + + + DecorationGroupTitleUncollapsedPictureExtendedTooltip + 79 + true + true + + true + + Label + true + true + + Left + + + + DecorationGroupTitleUncollapsedPictureContextMenu + 78 + true + true + + true + + true + + true + true + + + Click + DecorationGroupTitleUncollapsedPictureClick + + + StdPicture.MoveDown + + true + AsFileRef + + + + DecorationGroupTitleUncollapsedLabel + 80 + + <key>en</key> + <value>Please, fill the document</value> + + + <key>ru</key> + <value>Пожалуйста, заполните документ</value> + + + <key>tr</key> + <value>Lütfen, evrakı doldurunuz</value> + + true + true + + true + + + DecorationGroupTitleUncollapsedLabelExtendedTooltip + 82 + true + true + + true + + Label + true + true + + Left + + + + DecorationGroupTitleUncollapsedLabelContextMenu + 81 + true + true + + true + + true + + Label + 100 + true + true + + + Click + DecorationGroupTitleUncollapsedLabelClick + + true + Left + + + true + true + + true + + + GroupTitleUncollapsedExtendedTooltip + 76 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + HorizontalIfPossible + true + true + Auto + Auto + + + true + true + + true + + + GroupTitleDecorationsExtendedTooltip + 66 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + Vertical + true + true + Auto + Auto + + + + GroupTitleItems + 83 + + GroupTitleLeft + 85 + + Partner + 223 + true + true + + true + + + Object.Partner + + + OnChange + PartnerOnChange + + + PartnerExtendedTooltip + 225 + true + true + + true + + Label + true + true + + Left + + + + PartnerContextMenu + 224 + true + true + + true + + true + + InputField + Enter + true + Left + true + + + StartChoice + PartnerStartChoice + + + EditTextChange + PartnerEditTextChange + + true + true + true + true + true + true + + + + LegalName + 226 + true + true + + true + + + Object.LegalName + + + OnChange + LegalNameOnChange + + + LegalNameExtendedTooltip + 228 + true + true + + true + + Label + true + true + + Left + + + + LegalNameContextMenu + 227 + true + true + + true + + true + + InputField + Enter + true + Left + true + + + StartChoice + LegalNameStartChoice + + + EditTextChange + LegalNameEditTextChange + + true + true + true + true + true + true + + + + Agreement + 229 + true + true + + true + + + Object.Agreement + + + OnChange + AgreementOnChange + + + AgreementExtendedTooltip + 231 + true + true + + true + + Label + true + true + + Left + + + + AgreementContextMenu + 230 + true + true + + true + + true + + InputField + Enter + true + Left + true + + + StartChoice + AgreementStartChoice + + + EditTextChange + AgreementEditTextChange + + true + true + true + true + true + true + + + + Description + 114 + true + true + + true + + + Description + + + DescriptionExtendedTooltip + 116 + true + true + + true + + Label + true + true + + Left + + + + DescriptionContextMenu + 115 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + + Click + DescriptionClick + + true + true + true + + + true + true + + true + + + <key>en</key> + <value>Group title left</value> + + + <key>ru</key> + <value>Заголовок группы слева</value> + + + <key>tr</key> + <value>Grup başlık sol</value> + + + GroupTitleLeftExtendedTooltip + 86 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + Vertical + true + true + Auto + Auto + + + + GroupTitleRight + 87 + + Company + 7 + true + true + + true + + + Object.Company + + + OnChange + CompanyOnChange + + + CompanyExtendedTooltip + 9 + true + true + + true + + Label + true + true + + Left + + + + CompanyContextMenu + 8 + true + true + + true + + true + + InputField + EnterOnInput + true + Left + true + + + EditTextChange + CompanyEditTextChange + + + StartChoice + CompanyStartChoice + + true + true + true + true + true + true + + + + TransactionType + 13 + true + true + + true + + + Object.TransactionType + + + OnChange + TransactionTypeOnChange + + + TransactionTypeExtendedTooltip + 15 + true + true + + true + + Label + true + true + + Left + + + + TransactionTypeContextMenu + 14 + true + true + + true + + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + LegalNameContract + 232 + true + true + + true + + + Object.LegalNameContract + + + OnChange + LegalNameContractOnChange + + + LegalNameContractExtendedTooltip + 234 + true + true + + true + + Label + true + true + + Left + + + + LegalNameContractContextMenu + 233 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + true + true + + true + + + GroupTitleRightExtendedTooltip + 88 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + Vertical + true + true + Auto + Auto + + + true + true + + true + + + GroupTitleItemsExtendedTooltip + 84 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + AlwaysHorizontal + true + true + Auto + Auto + + + true + true + + true + + + GroupTitleExtendedTooltip + 64 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + Vertical + true + true + Auto + Auto + + + + PagesMainPages + 89 + + GroupAddAttributes + 194 + true + true + + true + + + <key>en</key> + <value>Additional attributes</value> + + + <key>ru</key> + <value>Дополнительные реквизиты</value> + + + <key>tr</key> + <value>Ek özellikler</value> + + + GroupAddAttributesExtendedTooltip + 195 + true + true + + true + + Label + true + true + + Left + + + Page + + Vertical + true + + + + GroupTaxes + 235 + + GroupIncomingOutgoing + 378 + + GroupIncoming + 299 + + TaxesIncoming + 237 + true + true + + true + + + Object.TaxesIncoming + + None + + TaxesIncomingLineNumber + 250 + true + true + + true + + + Object.TaxesIncoming.LineNumber + + + TaxesIncomingLineNumberExtendedTooltip + 252 + true + true + + true + + Label + true + true + + Left + + + + TaxesIncomingLineNumberContextMenu + 251 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + TaxesIncomingKey + 253 + true + + true + + + Object.TaxesIncoming.Key + + + TaxesIncomingKeyExtendedTooltip + 255 + true + true + + true + + Label + true + true + + Left + + + + TaxesIncomingKeyContextMenu + 254 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + TaxesIncomingVatRate + 256 + true + true + + true + + + Object.TaxesIncoming.VatRate + + + TaxesIncomingVatRateExtendedTooltip + 258 + true + true + + true + + Label + true + true + + Left + + + + TaxesIncomingVatRateContextMenu + 257 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + true + + + + TaxesIncomingInvoiceType + 380 + true + true + + true + + + Object.TaxesIncoming.InvoiceType + + + TaxesIncomingInvoiceTypeExtendedTooltip + 382 + true + true + + true + + Label + true + true + + Left + + + + TaxesIncomingInvoiceTypeContextMenu + 381 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + TaxesIncomingAmount + 383 + true + true + + true + + + Object.TaxesIncoming.Amount + + + TaxesIncomingAmountExtendedTooltip + 385 + true + true + + true + + Label + true + true + + Left + + + + TaxesIncomingAmountContextMenu + 384 + true + true + + true + + true + + InputField + Enter + true + Left + true + + Object.TaxesIncoming.TotalAmount + + + 8.0 + true + + + true + true + true + true + true + true + + + + TaxesIncomingCommandBar + 238 + + TaxesIncomingFillTaxesIncoming + 307 + true + true + + true + + + TaxesIncomingFillTaxesIncomingExtendedTooltip + 308 + true + true + + true + + Label + true + true + + Left + + + Form.Command.FillTaxesIncoming + Auto + true + true + UserCmds + Auto + + true + true + + true + + Left + true + + + BeforeAddRow + TaxesIncomingBeforeAddRow + + + AfterDeleteRow + TaxesIncomingAfterDeleteRow + + + true + true + + true + + TaxesIncomingSearchString + 241 + + TaxesIncomingSearchStringExtendedTooltip + 243 + true + true + + true + + Label + true + true + + Left + + + + TaxesIncomingSearchStringContextMenu + 242 + true + true + + true + + true + + TaxesIncomingSearchString + + true + + + + true + true + + true + + TaxesIncomingViewStatus + 247 + + TaxesIncomingViewStatusExtendedTooltip + 249 + true + true + + true + + Label + true + true + + Left + + + + TaxesIncomingViewStatusContextMenu + 248 + true + true + + true + + true + + ViewStatusAddition + TaxesIncomingViewStatus + + true + + + + true + true + + true + + TaxesIncomingSearchControl + 244 + + TaxesIncomingSearchControlExtendedTooltip + 246 + true + true + + true + + Label + true + true + + Left + + + + TaxesIncomingSearchControlContextMenu + 245 + true + true + + true + + true + + SearchControlAddition + TaxesIncomingSearchControl + + true + + + + TaxesIncomingExtendedTooltip + 240 + true + true + + true + + Label + true + true + + Left + + + + TaxesIncomingContextMenu + 239 + true + true + + true + + true + + true + true + true + true + true + MultiRow +
true
+ 1 +
true
+ 1 + AutoUse + AutoUse + true + true + Auto + Auto + true + true + AsFileRef + + + true + true + + true + + + <key>en</key> + <value>Incoming</value> + + + <key>ru</key> + <value>Входящий</value> + + + <key>tr</key> + <value>Gelen</value> + + + GroupIncomingExtendedTooltip + 300 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + HorizontalIfPossible + Auto + WeakSeparation + true + true + true + Auto + Auto + + + + GroupOutgoing + 301 + + TaxesOutgoing + 268 + true + true + + true + + + Object.TaxesOutgoing + + None + + TaxesOutgoingLineNumber + 281 + true + true + + true + + + Object.TaxesOutgoing.LineNumber + + + TaxesOutgoingLineNumberExtendedTooltip + 283 + true + true + + true + + Label + true + true + + Left + + + + TaxesOutgoingLineNumberContextMenu + 282 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + TaxesOutgoingKey + 284 + true + + true + + + Object.TaxesOutgoing.Key + + + TaxesOutgoingKeyExtendedTooltip + 286 + true + true + + true + + Label + true + true + + Left + + + + TaxesOutgoingKeyContextMenu + 285 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + TaxesOutgoingVatRate + 287 + true + true + + true + + + Object.TaxesOutgoing.VatRate + + + TaxesOutgoingVatRateExtendedTooltip + 289 + true + true + + true + + Label + true + true + + Left + + + + TaxesOutgoingVatRateContextMenu + 288 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + true + + + + TaxesOutgoingInvoiceType + 386 + true + true + + true + + + Object.TaxesOutgoing.InvoiceType + + + TaxesOutgoingInvoiceTypeExtendedTooltip + 388 + true + true + + true + + Label + true + true + + Left + + + + TaxesOutgoingInvoiceTypeContextMenu + 387 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + TaxesOutgoingAmount + 389 + true + true + + true + + + Object.TaxesOutgoing.Amount + + + TaxesOutgoingAmountExtendedTooltip + 391 + true + true + + true + + Label + true + true + + Left + + + + TaxesOutgoingAmountContextMenu + 390 + true + true + + true + + true + + InputField + Enter + true + Left + true + + Object.TaxesOutgoing.TotalAmount + + + 8.0 + true + + + true + true + true + true + true + true + + + + TaxesOutgoingCommandBar + 269 + + TaxesOutgoingFillTaxesOutgoing + 309 + true + true + + true + + + TaxesOutgoingFillTaxesOutgoingExtendedTooltip + 310 + true + true + + true + + Label + true + true + + Left + + + Form.Command.FillTaxesOutgoing + Auto + true + true + UserCmds + Auto + + true + true + + true + + Left + true + + + BeforeAddRow + TaxesOutgoingBeforeAddRow + + + AfterDeleteRow + TaxesOutgoingAfterDeleteRow + + + true + true + + true + + TaxesOutgoingSearchString + 272 + + TaxesOutgoingSearchStringExtendedTooltip + 274 + true + true + + true + + Label + true + true + + Left + + + + TaxesOutgoingSearchStringContextMenu + 273 + true + true + + true + + true + + TaxesOutgoingSearchString + + true + + + + true + true + + true + + TaxesOutgoingViewStatus + 278 + + TaxesOutgoingViewStatusExtendedTooltip + 280 + true + true + + true + + Label + true + true + + Left + + + + TaxesOutgoingViewStatusContextMenu + 279 + true + true + + true + + true + + ViewStatusAddition + TaxesOutgoingViewStatus + + true + + + + true + true + + true + + TaxesOutgoingSearchControl + 275 + + TaxesOutgoingSearchControlExtendedTooltip + 277 + true + true + + true + + Label + true + true + + Left + + + + TaxesOutgoingSearchControlContextMenu + 276 + true + true + + true + + true + + SearchControlAddition + TaxesOutgoingSearchControl + + true + + + + TaxesOutgoingExtendedTooltip + 271 + true + true + + true + + Label + true + true + + Left + + + + TaxesOutgoingContextMenu + 270 + true + true + + true + + true + + true + true + true + true + true + MultiRow +
true
+ 1 +
true
+ 1 + AutoUse + AutoUse + true + true + Auto + Auto + true + true + AsFileRef + + + true + true + + true + + + <key>en</key> + <value>Outgoing</value> + + + <key>ru</key> + <value>Исходящие</value> + + + <key>tr</key> + <value>Çıkan</value> + + + GroupOutgoingExtendedTooltip + 302 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + HorizontalIfPossible + Auto + WeakSeparation + true + true + true + Auto + Auto + + + true + true + + true + + + <key>en</key> + <value>Group incoming outgoing</value> + + + <key>ru</key> + <value>Группировка входящих-исходящих</value> + + + <key>tr</key> + <value>Group incoming outgoing</value> + + + GroupIncomingOutgoingExtendedTooltip + 379 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + AlwaysHorizontal + Auto + true + true + Auto + Auto + + + + TaxesDifference + 344 + true + true + + true + + + Object.TaxesDifference + + None + + TaxesDifferenceLineNumber + 357 + true + true + + true + + + Object.TaxesDifference.LineNumber + + + TaxesDifferenceLineNumberExtendedTooltip + 359 + true + true + + true + + Label + true + true + + Left + + + + TaxesDifferenceLineNumberContextMenu + 358 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + TaxesDifferenceKey + 360 + true + + true + + + Object.TaxesDifference.Key + + + TaxesDifferenceKeyExtendedTooltip + 362 + true + true + + true + + Label + true + true + + Left + + + + TaxesDifferenceKeyContextMenu + 361 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + TaxesDifferenceIncomingVatRate + 392 + true + true + + true + + + Object.TaxesDifference.IncomingVatRate + + + TaxesDifferenceIncomingVatRateExtendedTooltip + 394 + true + true + + true + + Label + true + true + + Left + + + + TaxesDifferenceIncomingVatRateContextMenu + 393 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + TaxesDifferenceIncomingInvoiceType + 395 + true + true + + true + + + Object.TaxesDifference.IncomingInvoiceType + + + TaxesDifferenceIncomingInvoiceTypeExtendedTooltip + 397 + true + true + + true + + Label + true + true + + Left + + + + TaxesDifferenceIncomingInvoiceTypeContextMenu + 396 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + TaxesDifferenceOutgoingVatRate + 398 + true + true + + true + + + Object.TaxesDifference.OutgoingVatRate + + + TaxesDifferenceOutgoingVatRateExtendedTooltip + 400 + true + true + + true + + Label + true + true + + Left + + + + TaxesDifferenceOutgoingVatRateContextMenu + 399 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + TaxesDifferenceOutgoingInvoiceType + 401 + true + true + + true + + + Object.TaxesDifference.OutgoingInvoiceType + + + TaxesDifferenceOutgoingInvoiceTypeExtendedTooltip + 403 + true + true + + true + + Label + true + true + + Left + + + + TaxesDifferenceOutgoingInvoiceTypeContextMenu + 402 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + TaxesDifferenceAmount + 404 + true + true + + true + + + Object.TaxesDifference.Amount + + + TaxesDifferenceAmountExtendedTooltip + 406 + true + true + + true + + Label + true + true + + Left + + + + TaxesDifferenceAmountContextMenu + 405 + true + true + + true + + true + + InputField + Enter + true + Left + true + + Object.TaxesDifference.TotalAmount + + + 8.0 + true + + + true + true + true + true + true + true + + + + TaxesDifferenceCommandBar + 345 + + EditCurrencies + 303 + true + true + + true + + + EditCurrenciesExtendedTooltip + 304 + true + true + + true + + Label + true + true + + Left + + + Form.Command.EditCurrencies + Auto + true + true + UserCmds + Auto + + + EditAccounting + 305 + true + true + + true + + + EditAccountingExtendedTooltip + 306 + true + true + + true + + Label + true + true + + Left + + + Form.Command.EditAccounting + Auto + true + true + UserCmds + Auto + + true + true + + true + + Left + + + true + true + + true + + TaxesDifferenceSearchString + 348 + + TaxesDifferenceSearchStringExtendedTooltip + 350 + true + true + + true + + Label + true + true + + Left + + + + TaxesDifferenceSearchStringContextMenu + 349 + true + true + + true + + true + + TaxesDifferenceSearchString + + true + + + + true + true + + true + + TaxesDifferenceViewStatus + 354 + + TaxesDifferenceViewStatusExtendedTooltip + 356 + true + true + + true + + Label + true + true + + Left + + + + TaxesDifferenceViewStatusContextMenu + 355 + true + true + + true + + true + + ViewStatusAddition + TaxesDifferenceViewStatus + + true + + + + true + true + + true + + TaxesDifferenceSearchControl + 351 + + TaxesDifferenceSearchControlExtendedTooltip + 353 + true + true + + true + + Label + true + true + + Left + + + + TaxesDifferenceSearchControlContextMenu + 352 + true + true + + true + + true + + SearchControlAddition + TaxesDifferenceSearchControl + + true + + + + TaxesDifferenceExtendedTooltip + 347 + true + true + + true + + Label + true + true + + Left + + + + TaxesDifferenceContextMenu + 346 + true + true + + true + + + true + true + true + true + true + true + MultiRow +
true
+ 1 +
true
+ 1 + AutoUse + AutoUse + true + true + Auto + Auto + true + true + AsFileRef + + + true + true + + true + + + <key>en</key> + <value>Taxes</value> + + + <key>ru</key> + <value>Налоги</value> + + + <key>tr</key> + <value>Vergiler</value> + + + GroupTaxesExtendedTooltip + 236 + true + true + + true + + Label + true + true + + Left + + + Page + + Vertical + true + + + + GroupOther + 91 + + GroupMore + 93 + + Date + 4 + true + true + + true + + + Object.Date + + + OnChange + DateOnChange + + + DateExtendedTooltip + 6 + true + true + + true + + Label + true + true + + Left + + + + DateContextMenu + 5 + true + true + + true + + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + Number + 1 + true + true + + true + + + Object.Number + + + NumberExtendedTooltip + 3 + true + true + + true + + Label + true + true + + Left + + + + NumberContextMenu + 2 + true + true + + true + + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + Currency + 10 + true + true + + true + + + Object.Currency + + + OnChange + CurrencyOnChange + + + CurrencyExtendedTooltip + 12 + true + true + + true + + Label + true + true + + Left + + + + CurrencyContextMenu + 11 + true + true + + true + + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + true + true + + true + + + <key>en</key> + <value>More</value> + + + <key>ru</key> + <value>Дополнительно</value> + + + <key>tr</key> + <value>Ek olarak</value> + + + GroupMoreExtendedTooltip + 94 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + Vertical + Collapsible + WeakSeparation + true + true + true + Auto + Auto + + + + Branch + 16 + true + true + + true + + + Object.Branch + + + BranchExtendedTooltip + 18 + true + true + + true + + Label + true + true + + Left + + + + BranchContextMenu + 17 + true + true + + true + + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + Author + 111 + true + true + + true + + + Object.Author + + + AuthorExtendedTooltip + 113 + true + true + + true + + Label + true + true + + Left + + + + AuthorContextMenu + 112 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + true + true + + true + + + <key>en</key> + <value>Other</value> + + + <key>ru</key> + <value>Прочее</value> + + + <key>tr</key> + <value>Diğer</value> + + + GroupOtherExtendedTooltip + 92 + true + true + + true + + Label + true + true + + Left + + + Page + + Vertical + true + + + true + true + + true + + + en + Pages main pages + + + ru + Основные страницы + + + tr + Sayfalar ana sayfalar + + + PagesMainPagesExtendedTooltip + 90 + true + true + + true + + Label + true + true + + Left + + + Pages + + TabsOnTop + Auto + + + + GroupBottom + 107 + + GroupTotal + 196 + + GroupTotalAmount + 213 + true + true + + true + + + GroupTotalAmountExtendedTooltip + 214 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + HorizontalIfPossible + true + true + Auto + Auto + + + true + true + + true + + Right + + GroupTotalExtendedTooltip + 197 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + HorizontalIfPossible + true + true + + 242 + 242 + 242 + + Auto + Auto + + + true + true + + true + + true + + GroupBottomExtendedTooltip + 108 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + AlwaysHorizontal + true + true + Auto + Auto + + + + FormCommandBar + -1 + + FormShowRowKey + 175 + true + true + + true + + + FormShowRowKeyExtendedTooltip + 176 + true + true + + true + + Label + true + true + + Left + + + Form.Command.ShowRowKey + Auto + true + true + UserCmds + InAdditionalSubmenu + + + FormHowHiddenTables + 162 + true + true + + true + + + FormHowHiddenTablesExtendedTooltip + 163 + true + true + + true + + Label + true + true + + Left + + + Form.Command.ShowHiddenTables + Auto + true + true + UserCmds + InAdditionalSubmenu + + true + true + + true + + Left + true + + + NotificationProcessing + NotificationProcessing + + + OnOpen + OnOpen + + + OnCreateAtServer + OnCreateAtServer + + true + true + Vertical + true + true + true + true + true + + Object + 1 + + DocumentObject.TaxesOperation + + + true + + + true + + + Object.RegisterRecords + +
true
+ true + + + Description + + <key>en</key> + <value>Description</value> + + + <key>ru</key> + <value>Описание</value> + + + <key>tr</key> + <value>Tanım</value> + + 2 + + String + + + + true + + + true + + + + GroupItems + + <key>en</key> + <value>Group items</value> + + + <key>ru</key> + <value>Группа элементов</value> + + + <key>tr</key> + <value>Grup nesneler</value> + + 3 + + ValueList + + + true + + + true + + + + + + + AccountingExtDimensions + + <key>en</key> + <value>Accounting ext dimensions</value> + + + <key>ru</key> + <value>Бухгалтерские субконто</value> + + + <key>tr</key> + <value>Muhasebe kırılımları</value> + + 4 + + InformationRegisterRecordSet.T9051S_AccountingExtDimensions + + + true + + + true + + + + AccountingRowAnalytics + + <key>en</key> + <value>Accounting row analytics</value> + + + <key>ru</key> + <value>Аналитика строки бух. проводки</value> + + + <key>tr</key> + <value>Muhasebe satır analitikleri</value> + + 5 + + InformationRegisterRecordSet.T9050S_AccountingRowAnalytics + + + true + + + true + + + + ShowHiddenTables + + <key>en</key> + <value>Show hidden tables</value> + + + <key>ru</key> + <value>Показать скрытые таблицы</value> + + + <key>tr</key> + <value>Gizli tabloları göster</value> + + 3 + + true + + + StdPicture.ShowData + + + + ShowHiddenTables + + + Auto + + + EditCurrencies + + <key>en</key> + <value>Edit currencies</value> + + + <key>ru</key> + <value>Редактирование валют</value> + + + <key>tr</key> + <value>Dövizleri düzelt</value> + + 1 + + true + + + CommonPicture.EditCurrencies + + + + EditCurrencies + + + Auto + + + ShowRowKey + + <key>en</key> + <value>Show row key</value> + + + <key>ru</key> + <value>Показать row key</value> + + + <key>tr</key> + <value>Satır antahtarı göster</value> + + 2 + + true + + + StdPicture.GetURL + + + + ShowRowKey + + + Auto + + + EditAccounting + + <key>en</key> + <value>Edit accounting</value> + + + <key>ru</key> + <value>Изменить бух. проводки</value> + + + <key>tr</key> + <value>Muhasebe değiştir</value> + + 4 + + true + + + StdPicture.ChartOfAccounts + + + + EditAccounting + + + FunctionalOption.UseAccounting + Picture + Auto + + + FillTaxesIncoming + + <key>en</key> + <value>Fill taxes</value> + + + <key>ru</key> + <value>Заполнить налоги</value> + + + <key>tr</key> + <value>Fill taxes</value> + + 5 + + true + + + + FillTaxesIncoming + + + Auto + + + FillTaxesOutgoing + + <key>en</key> + <value>Fill taxes</value> + + + <key>ru</key> + <value>Заполнить налоги</value> + + + <key>tr</key> + <value>Fill taxes</value> + + 6 + + true + + + + FillTaxesOutgoing + + + Auto + + + + + + + + OnReadAtServer + OnReadAtServer + + + AfterWriteAtServer + AfterWriteAtServer + + + BeforeWriteAtServer + BeforeWriteAtServer + + + OnWriteAtServer + OnWriteAtServer + + + AfterWrite + AfterWrite + + true + + \ No newline at end of file diff --git a/IRP/src/Documents/TaxesOperation/Forms/DocumentForm/Module.bsl b/IRP/src/Documents/TaxesOperation/Forms/DocumentForm/Module.bsl new file mode 100644 index 0000000000..551e13925b --- /dev/null +++ b/IRP/src/Documents/TaxesOperation/Forms/DocumentForm/Module.bsl @@ -0,0 +1,404 @@ + +#Region FORM + +&AtClient +Var MainTables Export; + +&AtServer +Procedure OnReadAtServer(CurrentObject) + DocTaxesOperationServer.OnReadAtServer(Object, ThisObject, CurrentObject); + SetVisibilityAvailability(CurrentObject, ThisObject); +EndProcedure + +&AtServer +Procedure OnCreateAtServer(Cancel, StandardProcessing) + DocTaxesOperationServer.OnCreateAtServer(Object, ThisObject, Cancel, StandardProcessing); + If Parameters.Key.IsEmpty() Then + SetVisibilityAvailability(Object, ThisObject); + EndIf; +EndProcedure + +&AtServer +Procedure BeforeWriteAtServer(Cancel, CurrentObject, WriteParameters) + AddAttributesAndPropertiesServer.BeforeWriteAtServer(ThisObject, Cancel, CurrentObject, WriteParameters); + AccountingServer.BeforeWriteAtServer(Object, ThisObject, Cancel, CurrentObject, WriteParameters); +EndProcedure + +&AtServer +Procedure AfterWriteAtServer(CurrentObject, WriteParameters) + DocTaxesOperationServer.AfterWriteAtServer(Object, ThisObject, CurrentObject, WriteParameters); + SetVisibilityAvailability(CurrentObject, ThisObject); +EndProcedure + +&AtClient +Procedure OnOpen(Cancel) + DocTaxesOperationClient.OnOpen(Object, ThisObject, Cancel); +EndProcedure + +&AtClient +Procedure NotificationProcessing(EventName, Parameter, Source) + If EventName = "UpdateAddAttributeAndPropertySets" Then + AddAttributesCreateFormControl(); + EndIf; + + If Not Source = ThisObject Then + Return; + EndIf; +EndProcedure + +&AtServer +Procedure OnWriteAtServer(Cancel, CurrentObject, WriteParameters) + DocumentsServer.OnWriteAtServer(Object, ThisObject, Cancel, CurrentObject, WriteParameters); +EndProcedure + +&AtClient +Procedure AfterWrite(WriteParameters) + Return; +EndProcedure + +&AtClient +Procedure API_Callback(TableName, ArrayOfDataPaths) Export + API_CallbackAtServer(TableName, ArrayOfDataPaths); +EndProcedure + +&AtServer +Procedure API_CallbackAtServer(TableName, ArrayOfDataPaths) + ViewServer_V2.API_CallbackAtServer(Object, ThisObject, TableName, ArrayOfDataPaths); +EndProcedure + +&AtClient +Procedure FormSetVisibilityAvailability() Export + SetVisibilityAvailability(Object, ThisObject); +EndProcedure + +&AtClient +Procedure CalculateTaxesDifference() Export + Result = DocTaxesOperationServer.CalculateTaxDifference(Object); + Object.TaxesDifference.Clear(); + For Each Row In Result Do + FillPropertyValues(Object.TaxesDifference.Add(), Row); + EndDo; +EndProcedure + +&AtClientAtServerNoContext +Procedure SetVisibilityAvailability(Object, Form) + Form.Items.EditCurrencies.Enabled = Not Form.ReadOnly; + Form.Items.EditAccounting.Enabled = Not Form.ReadOnly; +EndProcedure + +&AtClient +Procedure _IdeHandler() + ViewClient_V2.ViewIdleHandler(ThisObject, Object); +EndProcedure + +&AtClient +Procedure _AttachIdleHandler() Export + AttachIdleHandler("_IdeHandler", 1); +EndProcedure + +&AtClient +Procedure _DetachIdleHandler() Export + DetachIdleHandler("_IdeHandler"); +EndProcedure + +#EndRegion + +#Region _DATE + +&AtClient +Procedure DateOnChange(Item) + DocTaxesOperationClient.DateOnChange(Object, ThisObject, Item); +EndProcedure + +#EndRegion + +#Region COMPANY + +&AtClient +Procedure CompanyOnChange(Item) + DocTaxesOperationClient.CompanyOnChange(Object, ThisObject, Item); +EndProcedure + +&AtClient +Procedure CompanyStartChoice(Item, ChoiceData, StandardProcessing) + DocTaxesOperationClient.CompanyStartChoice(Object, ThisObject, Item, ChoiceData, StandardProcessing); +EndProcedure + +&AtClient +Procedure CompanyEditTextChange(Item, Text, StandardProcessing) + DocTaxesOperationClient.CompanyEditTextChange(Object, ThisObject, Item, Text, StandardProcessing); +EndProcedure + +#EndRegion + +#Region CURRENCY + +&AtClient +Procedure CurrencyOnChange(Item) + DocTaxesOperationClient.CurrencyOnChange(Object, ThisObject, Item); +EndProcedure + +#EndRegion + +#Region TRANSACTION_TYPE + +&AtClient +Procedure TransactionTypeOnChange(Item) + DocTaxesOperationClient.TransactionTypeOnChange(Object, ThisObject, Item); + CalculateTaxesDifference(); +EndProcedure + +#EndRegion + +#Region PARTNER + +&AtClient +Procedure PartnerOnChange(Item) + DocTaxesOperationClient.PartnerOnChange(Object, ThisObject, Item); +EndProcedure + +&AtClient +Procedure PartnerStartChoice(Item, ChoiceData, StandardProcessing) + DocTaxesOperationClient.PartnerStartChoice(Object, ThisObject, Item, ChoiceData, StandardProcessing); +EndProcedure + +&AtClient +Procedure PartnerEditTextChange(Item, Text, StandardProcessing) + DocTaxesOperationClient.PartnerTextChange(Object, ThisObject, Item, Text, StandardProcessing); +EndProcedure + +#EndRegion + +#Region LEGAL_NAME + +&AtClient +Procedure LegalNameOnChange(Item) + DocTaxesOperationClient.LegalNameOnChange(Object, ThisObject, Item); +EndProcedure + +&AtClient +Procedure LegalNameStartChoice(Item, ChoiceData, StandardProcessing) + DocTaxesOperationClient.LegalNameStartChoice(Object, ThisObject, Item, ChoiceData, StandardProcessing); +EndProcedure + +&AtClient +Procedure LegalNameEditTextChange(Item, Text, StandardProcessing) + DocTaxesOperationClient.LegalNameTextChange(Object, ThisObject, Item, Text, StandardProcessing); +EndProcedure + +#EndRegion + +#Region AGREEMENT + +&AtClient +Procedure AgreementOnChange(Item) + DocTaxesOperationClient.AgreementOnChange(Object, ThisObject, Item); +EndProcedure + +&AtClient +Procedure AgreementStartChoice(Item, ChoiceData, StandardProcessing) + DocTaxesOperationClient.AgreementStartChoice(Object, ThisObject, Item, ChoiceData, StandardProcessing); +EndProcedure + +&AtClient +Procedure AgreementEditTextChange(Item, Text, StandardProcessing) + DocTaxesOperationClient.AgreementTextChange(Object, ThisObject, Item, Text, StandardProcessing); +EndProcedure + +#EndRegion + +#Region LEGAL_NAME_CONTRACT + +&AtClient +Procedure LegalNameContractOnChange(Item) + DocTaxesOperationClient.LegalNameContractOnChange(Object, ThisObject, Item); +EndProcedure + +#EndRegion + +#Region TAXES_INCOMING + +&AtClient +Procedure TaxesIncomingBeforeAddRow(Item, Cancel, Clone, Parent, IsFolder, Parameter) + DocTaxesOperationClient.TaxesIncomingBeforeAddRow(Object, ThisObject, Item, Cancel, Clone, Parent, IsFolder, Parameter); +EndProcedure + +&AtClient +Procedure TaxesIncomingAfterDeleteRow(Item) + DocTaxesOperationClient.TaxesIncomingAfterDeleteRow(Object, ThisObject, Item); +EndProcedure + +#EndRegion + +#Region TAXES_OUTGOING + +&AtClient +Procedure TaxesOutgoingBeforeAddRow(Item, Cancel, Clone, Parent, IsFolder, Parameter) + DocTaxesOperationClient.TaxesOutgoingBeforeAddRow(Object, ThisObject, Item, Cancel, Clone, Parent, IsFolder, Parameter); +EndProcedure + +&AtClient +Procedure TaxesOutgoingAfterDeleteRow(Item) + DocTaxesOperationClient.TaxesOutgoingAfterDeleteRow(Object, ThisObject, Item); +EndProcedure + +#EndRegion + +#Region SERVICE + +&AtClient +Function GetProcessingModule() Export + Str = New Structure; + Str.Insert("Client", DocTaxesOperationClient); + Str.Insert("Server", DocTaxesOperationServer); + Return Str; +EndFunction + +#Region DESCRIPTION + +&AtClient +Procedure DescriptionClick(Item, StandardProcessing) + CommonFormActions.EditMultilineText(ThisObject, Item, StandardProcessing); +EndProcedure + +#EndRegion + +#Region TITLE_DECORATIONS + +&AtClient +Procedure DecorationGroupTitleCollapsedPictureClick(Item) + DocumentsClientServer.ChangeTitleCollapse(Object, ThisObject, True); +EndProcedure + +&AtClient +Procedure DecorationGroupTitleCollapsedLabelClick(Item) + DocumentsClientServer.ChangeTitleCollapse(Object, ThisObject, True); +EndProcedure + +&AtClient +Procedure DecorationGroupTitleUncollapsedPictureClick(Item) + DocumentsClientServer.ChangeTitleCollapse(Object, ThisObject, False); +EndProcedure + +&AtClient +Procedure DecorationGroupTitleUncollapsedLabelClick(Item) + DocumentsClientServer.ChangeTitleCollapse(Object, ThisObject, False); +EndProcedure + +#EndRegion + +#Region ADD_ATTRIBUTES + +&AtClient +Procedure AddAttributeStartChoice(Item, ChoiceData, StandardProcessing) Export + AddAttributesAndPropertiesClient.AddAttributeStartChoice(ThisObject, Item, StandardProcessing); +EndProcedure + +&AtServer +Procedure AddAttributesCreateFormControl() + AddAttributesAndPropertiesServer.CreateFormControls(ThisObject, "GroupOther"); +EndProcedure + +&AtClient +Procedure AddAttributeButtonClick(Item) Export + AddAttributesAndPropertiesClient.AddAttributeButtonClick(ThisObject, Item); +EndProcedure + +#EndRegion + +#Region EXTERNAL_COMMANDS + +&AtClient +Procedure GeneratedFormCommandActionByName(Command) Export + ExternalCommandsClient.GeneratedFormCommandActionByName(Object, ThisObject, Command.Name); + GeneratedFormCommandActionByNameServer(Command.Name); +EndProcedure + +&AtServer +Procedure GeneratedFormCommandActionByNameServer(CommandName) Export + ExternalCommandsServer.GeneratedFormCommandActionByName(Object, ThisObject, CommandName); +EndProcedure + +#EndRegion + +#Region COMMANDS + +&AtClient +Procedure InternalCommandAction(Command) Export + InternalCommandsClient.RunCommandAction(Command, ThisObject, Object, Object.Ref); +EndProcedure + +&AtClient +Procedure InternalCommandActionWithServerContext(Command) Export + InternalCommandActionWithServerContextAtServer(Command.Name); +EndProcedure + +&AtServer +Procedure InternalCommandActionWithServerContextAtServer(CommandName) + InternalCommandsServer.RunCommandAction(CommandName, ThisObject, Object, Object.Ref); +EndProcedure + +#EndRegion + +&AtClient +Procedure ShowRowKey(Command) + DocumentsClient.ShowRowKey(ThisObject); +EndProcedure + +&AtClient +Procedure ShowHiddenTables(Command) + DocumentsClient.ShowHiddenTables(Object, ThisObject); +EndProcedure + +&AtClient +Procedure EditCurrencies(Command) + FormParameters = CurrenciesClientServer.GetParameters_V13(Object); + NotifyParameters = New Structure(); + NotifyParameters.Insert("Object", Object); + NotifyParameters.Insert("Form", ThisObject); + Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters); + OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow); +EndProcedure + +&AtClient +Procedure EditAccounting(Command) + CurrentData = ThisObject.Items.TaxesDifference.CurrentData; + If CurrentData = Undefined Then + Return; + EndIf; + UpdateAccountingData(); + AccountingClient.OpenFormEditAccounting(Object, ThisObject, CurrentData, "TaxesDifference"); +EndProcedure + +&AtServer +Procedure UpdateAccountingData() + _AccountingRowAnalytics = ThisObject.AccountingRowAnalytics.Unload(); + _AccountingExtDimensions = ThisObject.AccountingExtDimensions.Unload(); + AccountingClientServer.UpdateAccountingTables(Object, + _AccountingRowAnalytics, + _AccountingExtDimensions, "TaxesDifference"); + ThisObject.AccountingRowAnalytics.Load(_AccountingRowAnalytics); + ThisObject.AccountingExtDimensions.Load(_AccountingExtDimensions); +EndProcedure + +&AtClient +Procedure FillTaxesIncoming(Command) + Object.TaxesIncoming.Clear(); + DocTaxesOperationClient.FillTaxesIncomingOutgoing(Object, + ThisObject, Object.Ref, Object.Date, Object.Company, Object.Branch, Object.Currency, + "R2040B_TaxesIncoming", "TaxesIncoming"); + CalculateTaxesDifference(); +EndProcedure + +&AtClient +Procedure FillTaxesOutgoing(Command) + Object.TaxesOutgoing.Clear(); + DocTaxesOperationClient.FillTaxesIncomingOutgoing(Object, + ThisObject, Object.Ref, Object.Date, Object.Company, Object.Branch, Object.Currency, + "R1040B_TaxesOutgoing", "TaxesOutgoing"); + CalculateTaxesDifference(); +EndProcedure + +#EndRegion + +MainTables = "TaxesIncoming, TaxesOutgoing"; diff --git a/IRP/src/Documents/TaxesOperation/Forms/ListForm/Attributes/List/ExtInfo/ListSettings.dcss b/IRP/src/Documents/TaxesOperation/Forms/ListForm/Attributes/List/ExtInfo/ListSettings.dcss new file mode 100644 index 0000000000..89c3cab34b --- /dev/null +++ b/IRP/src/Documents/TaxesOperation/Forms/ListForm/Attributes/List/ExtInfo/ListSettings.dcss @@ -0,0 +1,17 @@ + + + + Normal + 9be2fac9-c00f-4af0-8740-8256ec196ce2 + + + Normal + f18d3116-e898-4afc-a513-e46b7be76a89 + + + Normal + 6061ea39-8662-4443-a6ff-ee3df334e09f + + Normal + 14f19c85-d9a3-4a6c-8b2a-93565548b801 + \ No newline at end of file diff --git a/IRP/src/Documents/TaxesOperation/Forms/ListForm/Form.form b/IRP/src/Documents/TaxesOperation/Forms/ListForm/Form.form new file mode 100644 index 0000000000..4cbf0ad9d1 --- /dev/null +++ b/IRP/src/Documents/TaxesOperation/Forms/ListForm/Form.form @@ -0,0 +1,778 @@ + + + + ListSettingsComposerUserSettings + 1 + true + true + + true + + + <key>en</key> + <value>User settings group</value> + + + <key>ru</key> + <value>Группа пользовательских настроек</value> + + + <key>tr</key> + <value>Kullanıcı ayarlar grubu</value> + + false + + ListSettingsComposerUserSettingsExtendedTooltip + 2 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + Vertical + Auto + WeakSeparation + true + true + Auto + Auto + + + + List + 3 + true + true + + true + + + List + + true + None + + IsHaveJE + 34 + true + true + + true + + + List.IsHaveJE + + None + + IsHaveJEExtendedTooltip + 36 + true + true + + true + + Label + true + true + + Left + + + + IsHaveJEContextMenu + 35 + true + true + + true + + true + + PictureField + Enter + true + Left + true + + true + true + true + true + + StdPicture.DebitCredit + + AsFileRef + + + + Number + 25 + true + true + + true + + + List.Number + + + NumberExtendedTooltip + 27 + true + true + + true + + Label + true + true + + Left + + + + NumberContextMenu + 26 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + Date + 28 + true + true + + true + + + List.Date + + + DateExtendedTooltip + 30 + true + true + + true + + Label + true + true + + Left + + + + DateContextMenu + 29 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + Company + 16 + true + true + + true + + + List.Company + + + CompanyExtendedTooltip + 18 + true + true + + true + + Label + true + true + + Left + + + + CompanyContextMenu + 17 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + Branch + 19 + true + true + + true + + + List.Branch + + + BranchExtendedTooltip + 21 + true + true + + true + + Label + true + true + + Left + + + + BranchContextMenu + 20 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + Author + 22 + true + true + + true + + + List.Author + + + AuthorExtendedTooltip + 24 + true + true + + true + + Label + true + true + + Left + + + + AuthorContextMenu + 23 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + Ref + 31 + true + true + + + List.Ref + + + RefExtendedTooltip + 33 + true + true + + true + + Label + true + true + + Left + + + + RefContextMenu + 32 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + None + + ListCommandBar + 5 + true + true + + true + + Left + + + true + true + + true + + ListSearchString + 7 + + ListSearchStringExtendedTooltip + 9 + true + true + + true + + Label + true + true + + Left + + + + ListSearchStringContextMenu + 8 + true + true + + true + + true + + ListSearchString + + true + + + + true + true + + true + + ListViewStatus + 10 + + ListViewStatusExtendedTooltip + 12 + true + true + + true + + Label + true + true + + Left + + + + ListViewStatusContextMenu + 11 + true + true + + true + + true + + ViewStatusAddition + ListViewStatus + + true + + + + true + true + + true + + ListSearchControl + 13 + + ListSearchControlExtendedTooltip + 15 + true + true + + true + + Label + true + true + + Left + + + + ListSearchControlContextMenu + 14 + true + true + + true + + true + + SearchControlAddition + ListSearchControl + + true + + + + ListExtendedTooltip + 6 + true + true + + true + + Label + true + true + + Left + + + + ListContextMenu + 4 + true + true + + true + + true + + true + true + true + true + true + MultiRow +
true
+ 1 + 1 + AutoUse + AutoUse + true + true + true + Auto + Auto + ExpandTopLevel + true + true + true + true + AsFileRef + + List.DefaultPicture + + + 60 + + 0001-01-01T00:00:00 + 0001-01-01T00:00:00 + + + true + true + ListSettingsComposerUserSettings + + + + FormCommandBar + -1 + true + true + + true + + Left + true + + + OnCreateAtServer + OnCreateAtServer + + true + true + Vertical + true + true + true + true + true + + List + 1 + + DynamicList + + + true + + + true + +
true
+ + SELECT + Doc.Ref, + Doc.DeletionMark, + Doc.Number, + Doc.Date, + Doc.Company, + Doc.TransactionType, + Doc.Currency, + Doc.Branch, + Doc.Author, + Doc.Description, + MAX(JE.LedgerType) AS LedgerType, + MAX(CASE + WHEN NOT JE.Ref IS NULL + THEN 0 + ELSE 1 + END) AS IsHaveJE +FROM + Document.TaxesOperation AS Doc + LEFT JOIN Document.JournalEntry AS JE + ON Doc.Ref = CAST(JE.Basis AS Document.TaxesOperation) + AND NOT JE.DeletionMark +GROUP BY + Doc.Ref, + Doc.DeletionMark, + Doc.Number, + Doc.Date, + Doc.Company, + Doc.TransactionType, + Doc.Currency, + Doc.Branch, + Doc.Author, + Doc.Description + Document.TaxesOperation + true + true + true + true + true + + LedgerType + LedgerType + + + IsHaveJE + IsHaveJE + + <localValue> + <content> + <key>en</key> + <value>Is have JE</value> + </content> + <content> + <key>ru</key> + <value>Есть БО</value> + </content> + <content> + <key>tr</key> + <value>MF mevcut</value> + </content> + </localValue> + + + + Ref + Ref + + + DeletionMark + DeletionMark + + + Number + Number + + + Date + Date + + + Company + Company + + + TransactionType + TransactionType + + + Currency + Currency + + + Partner + Partner + + + LegalName + LegalName + + + Agreement + Agreement + + + LegalNameContract + LegalNameContract + + + AddAttributes + AddAttributes + + + Currencies + Currencies + + + TaxesIncoming + TaxesIncoming + + + TaxesOutgoing + TaxesOutgoing + + + PointInTime + PointInTime + + + Posted + Posted + + + + + + + + + \ No newline at end of file diff --git a/IRP/src/Documents/TaxesOperation/Forms/ListForm/Module.bsl b/IRP/src/Documents/TaxesOperation/Forms/ListForm/Module.bsl new file mode 100644 index 0000000000..7ee3a61fea --- /dev/null +++ b/IRP/src/Documents/TaxesOperation/Forms/ListForm/Module.bsl @@ -0,0 +1,40 @@ + +#Region FormEvents + +&AtServer +Procedure OnCreateAtServer(Cancel, StandardProcessing) + DocTaxesOperationServer.OnCreateAtServerListForm(ThisObject, Cancel, StandardProcessing); +EndProcedure + +#EndRegion + +#Region COMMANDS + +&AtClient +Procedure InternalCommandAction(Command) Export + InternalCommandsClient.RunCommandAction(Command, ThisObject, List, Items.List.SelectedRows); +EndProcedure + +&AtClient +Procedure InternalCommandActionWithServerContext(Command) Export + InternalCommandActionWithServerContextAtServer(Command.Name); +EndProcedure + +&AtServer +Procedure InternalCommandActionWithServerContextAtServer(CommandName) + InternalCommandsServer.RunCommandAction(CommandName, ThisObject, List, Items.List.SelectedRows); +EndProcedure + +&AtClient +Procedure GeneratedFormCommandActionByName(Command) Export + SelectedRows = Items.List.SelectedRows; + ExternalCommandsClient.GeneratedListChoiceFormCommandActionByName(SelectedRows, ThisObject, Command.Name); + GeneratedFormCommandActionByNameServer(Command.Name, SelectedRows); +EndProcedure + +&AtServer +Procedure GeneratedFormCommandActionByNameServer(CommandName, SelectedRows) Export + ExternalCommandsServer.GeneratedListChoiceFormCommandActionByName(SelectedRows, ThisObject, CommandName); +EndProcedure + +#EndRegion \ No newline at end of file diff --git a/IRP/src/Documents/TaxesOperation/ManagerModule.bsl b/IRP/src/Documents/TaxesOperation/ManagerModule.bsl new file mode 100644 index 0000000000..8067a6fc5c --- /dev/null +++ b/IRP/src/Documents/TaxesOperation/ManagerModule.bsl @@ -0,0 +1,514 @@ +#Region PrintForm + +Function GetPrintForm(Ref, PrintFormName, AddInfo = Undefined) Export + Return Undefined; +EndFunction + +#EndRegion + +#Region Posting + +Function PostingGetDocumentDataTables(Ref, Cancel, PostingMode, Parameters, AddInfo = Undefined) Export + Tables = New Structure; + QueryArray = GetQueryTextsSecondaryTables(); + Parameters.Insert("QueryParameters", GetAdditionalQueryParameters(Ref)); + PostingServer.ExecuteQuery(Ref, QueryArray, Parameters); + Parameters.IsReposting = False; + + AccountingServer.CreateAccountingDataTables(Ref, Cancel, PostingMode, Parameters, AddInfo); + + Return Tables; +EndFunction + +Function PostingGetLockDataSource(Ref, Cancel, PostingMode, Parameters, AddInfo = Undefined) Export + DataMapWithLockFields = New Map(); + Return DataMapWithLockFields; +EndFunction + +Procedure PostingCheckBeforeWrite(Ref, Cancel, PostingMode, Parameters, AddInfo = Undefined) Export + Tables = Parameters.DocumentDataTables; + QueryArray = GetQueryTextsMasterTables(); + PostingServer.SetRegisters(Tables, Ref); + PostingServer.FillPostingTables(Tables, Ref, QueryArray, Parameters); +EndProcedure + +Function PostingGetPostingDataTables(Ref, Cancel, PostingMode, Parameters, AddInfo = Undefined) Export + PostingDataTables = New Map(); + PostingServer.SetPostingDataTables(PostingDataTables, Parameters); + Return PostingDataTables; +EndFunction + +Procedure PostingCheckAfterWrite(Ref, Cancel, PostingMode, Parameters, AddInfo = Undefined) Export + Return; +EndProcedure + +#EndRegion + +#Region Undoposting + +Function UndopostingGetDocumentDataTables(Ref, Cancel, Parameters, AddInfo = Undefined) Export + Return Undefined; +EndFunction + +Function UndopostingGetLockDataSource(Ref, Cancel, Parameters, AddInfo = Undefined) Export + Return Undefined; +EndFunction + +Procedure UndopostingCheckBeforeWrite(Ref, Cancel, Parameters, AddInfo = Undefined) Export + Return; +EndProcedure + +Procedure UndopostingCheckAfterWrite(Ref, Cancel, Parameters, AddInfo = Undefined) Export + Return; +EndProcedure + +#EndRegion + +#Region Posting_Info + +Function GetInformationAboutMovements(Ref) Export + Str = New Structure; + Str.Insert("QueryParameters", GetAdditionalQueryParameters(Ref)); + Str.Insert("QueryTextsMasterTables", New Array); + Str.Insert("QueryTextsSecondaryTables", New Array); + Return Str; +EndFunction + +Function GetAdditionalQueryParameters(Ref) + StrParams = New Structure; + StrParams.Insert("Ref", Ref); + StrParams.Insert("Vat", TaxesServer.GetVatRef()); + Return StrParams; +EndFunction + +Function GetQueryTextsSecondaryTables() + QueryArray = New Array(); + QueryArray.Add(TaxesDifference()); + Return QueryArray; +EndFunction + +Function GetQueryTextsMasterTables() + QueryArray = New Array(); + QueryArray.Add(R1040B_TaxesOutgoing()); + QueryArray.Add(R2040B_TaxesIncoming()); + QueryArray.Add(R5010B_ReconciliationStatement()); + QueryArray.Add(R5015B_OtherPartnersTransactions()); + QueryArray.Add(T1040T_AccountingAmounts()); + QueryArray.Add(R5020B_PartnersBalance()); + Return QueryArray; +EndFunction + +#EndRegion + +#Region Posting_SourceTable + +Function TaxesDifference() + Return + "SELECT + | TaxesDifference.Ref.Date AS Period, + | TaxesDifference.Key AS Key, + | TaxesDifference.Ref.Company AS Company, + | TaxesDifference.Ref.Branch AS Branch, + | &Vat AS Tax, + | TaxesDifference.Ref.Currency AS Currency, + | TaxesDifference.IncomingVatRate, + | TaxesDifference.IncomingInvoiceType, + | TaxesDifference.OutgoingVatRate, + | TaxesDifference.OutgoingInvoiceType, + | TaxesDifference.Ref.Partner AS Partner, + | TaxesDifference.Ref.LegalName AS LegalName, + | TaxesDifference.Ref.LegalNameContract AS LegalNameContract, + | TaxesDifference.Ref.Agreement AS Agreement, + | CASE + | WHEN TaxesDifference.Ref.Agreement.ApArPostingDetail = VALUE(Enum.ApArPostingDetail.ByDocuments) + | THEN TaxesDifference.Ref + | ELSE UNDEFINED + | END AS Basis, + | TaxesDifference.Amount AS Amount, + | TaxesDifference.Ref.TransactionType = VALUE(Enum.TaxesOperationTransactionType.TaxOffset) AS IsTaxOffset, + | TaxesDifference.Ref.TransactionType = VALUE(Enum.TaxesOperationTransactionType.TaxOffsetAndPayment) AS IsTaxOffsetAndPayment, + | TaxesDifference.Ref.TransactionType = VALUE(Enum.TaxesOperationTransactionType.TaxPayment) AS IsTaxPayment + |INTO TaxesDifference + |FROM + | Document.TaxesOperation.TaxesDifference AS TaxesDifference + |WHERE + | TaxesDifference.Ref = &Ref"; +EndFunction + +#EndRegion + +#Region Posting_MainTables + +Function R1040B_TaxesOutgoing() + Return + "SELECT + | VALUE(AccumulationRecordType.Expense) AS RecordType, + | TaxesDifference.Period, + | TaxesDifference.Company, + | TaxesDifference.Branch, + | TaxesDifference.Tax, + | TaxesDifference.Currency, + | TaxesDifference.OutgoingVatRate AS TaxRate, + | TaxesDifference.OutgoingInvoiceType AS InvoiceType, + | TaxesDifference.Amount + |INTO R1040B_TaxesOutgoing + |FROM + | TaxesDifference as TaxesDifference + |WHERE + | NOT TaxesDifference.OutgoingVatRate.Ref IS NULL "; +EndFunction + +Function R2040B_TaxesIncoming() + Return + "SELECT + | VALUE(AccumulationRecordType.Expense) AS RecordType, + | TaxesDifference.Period, + | TaxesDifference.Company, + | TaxesDifference.Branch, + | TaxesDifference.Tax, + | TaxesDifference.Currency, + | TaxesDifference.IncomingVatRate AS TaxRate, + | TaxesDifference.IncomingInvoiceType AS InvoiceType, + | TaxesDifference.Amount + |INTO R2040B_TaxesIncoming + |FROM + | TaxesDifference as TaxesDifference + |WHERE + | NOT TaxesDifference.IncomingVatRate.Ref IS NULL"; +EndFunction + +Function R5015B_OtherPartnersTransactions() + Return + "SELECT + | VALUE(AccumulationRecordType.Expense) AS RecordType, + | TaxesDifference.Period, + | TaxesDifference.Company, + | TaxesDifference.Branch, + | TaxesDifference.Currency, + | TaxesDifference.LegalName, + | TaxesDifference.Partner, + | TaxesDifference.Agreement, + | TaxesDifference.Basis, + | TaxesDifference.Amount AS Amount + |INTO R5015B_OtherPartnersTransactions + |FROM + | TaxesDifference AS TaxesDifference + |WHERE + | NOT TaxesDifference.IncomingVatRate.Ref IS NULL + | AND TaxesDifference.OutgoingVatRate.Ref IS NULL + | + |UNION ALL + | + |SELECT + | VALUE(AccumulationRecordType.Receipt) AS RecordType, + | TaxesDifference.Period, + | TaxesDifference.Company, + | TaxesDifference.Branch, + | TaxesDifference.Currency, + | TaxesDifference.LegalName, + | TaxesDifference.Partner, + | TaxesDifference.Agreement, + | TaxesDifference.Basis, + | TaxesDifference.Amount AS Amount + |FROM + | TaxesDifference AS TaxesDifference + |WHERE + | NOT TaxesDifference.OutgoingVatRate.Ref IS NULL + | AND TaxesDifference.IncomingVatRate.Ref IS NULL"; +EndFunction + +Function R5010B_ReconciliationStatement() + Return + "SELECT + | VALUE(AccumulationRecordType.Expense) AS RecordType, + | TaxesDifference.Period, + | TaxesDifference.Company, + | TaxesDifference.Branch, + | TaxesDifference.Currency, + | TaxesDifference.LegalName, + | TaxesDifference.LegalNameContract, + | TaxesDifference.Amount AS Amount + |INTO R5010B_ReconciliationStatement + |FROM + | TaxesDifference AS TaxesDifference + |WHERE + | NOT TaxesDifference.IncomingVatRate.Ref IS NULL + | AND TaxesDifference.OutgoingVatRate.Ref IS NULL + | + |UNION ALL + | + |SELECT + | VALUE(AccumulationRecordType.Receipt) AS RecordType, + | TaxesDifference.Period, + | TaxesDifference.Company, + | TaxesDifference.Branch, + | TaxesDifference.Currency, + | TaxesDifference.LegalName, + | TaxesDifference.LegalNameContract, + | TaxesDifference.Amount AS Amount + |FROM + | TaxesDifference AS TaxesDifference + |WHERE + | NOT TaxesDifference.OutgoingVatRate.Ref IS NULL + | AND TaxesDifference.IncomingVatRate.Ref IS NULL"; +EndFunction + +Function R5020B_PartnersBalance() + Return AccumulationRegisters.R5020B_PartnersBalance.R5020B_PartnersBalance_TaxesOperation(); +EndFunction + +#EndRegion + +#Region AccessObject + + +// Get access key. +// +// Parameters: +// Obj - DocumentRef.ExpenseAccruals +// +// Returns: +// Map - Map: +// *Company - CatalogRef.Companies +// *Branch - CatalogRef.BusinessUnits +Function GetAccessKey(Obj) Export + AccessKeyMap = New Map; + AccessKeyMap.Insert("Company", Obj.Company); + //@skip-check property-return-type + //@skip-check invocation-parameter-type-intersect + //@skip-check unknown-method-property + AccessKeyMap.Insert("Branch", Obj.Branch); + Return AccessKeyMap; +EndFunction + +#EndRegion + +#Region Accounting + +Function T1040T_AccountingAmounts() + Return + "SELECT + | TaxesDifference.Period, + | TaxesDifference.Key AS RowKey, + | TaxesDifference.Currency, + | TaxesDifference.Amount AS Amount, + | VALUE(Catalog.AccountingOperations.TaxesOperation_DR_R2040B_TaxesIncoming_CR_R1040B_TaxesOutgoing) AS Operation, + | UNDEFINED AS AdvancesClosing + |INTO T1040T_AccountingAmounts + |FROM + | TaxesDifference AS TaxesDifference + |WHERE + | NOT TaxesDifference.IncomingVatRate.Ref IS NULL + | AND NOT TaxesDifference.OutgoingVatRate.Ref IS NULL + | AND TaxesDifference.Amount <> 0 + | + |UNION ALL + | + |SELECT + | TaxesDifference.Period, + | TaxesDifference.Key AS RowKey, + | TaxesDifference.Currency, + | TaxesDifference.Amount AS Amount, + | VALUE(Catalog.AccountingOperations.TaxesOperation_DR_R2040B_TaxesIncoming_CR_R5015B_OtherPartnersTransactions) AS Operation, + | UNDEFINED AS AdvancesClosing + | + |FROM + | TaxesDifference AS TaxesDifference + |WHERE + | NOT TaxesDifference.IncomingVatRate.Ref IS NULL + | AND TaxesDifference.OutgoingVatRate.Ref IS NULL + | AND TaxesDifference.Amount <> 0 + | + |UNION ALL + | + |SELECT + | TaxesDifference.Period, + | TaxesDifference.Key AS RowKey, + | TaxesDifference.Currency, + | TaxesDifference.Amount Amount, + | VALUE(Catalog.AccountingOperations.TaxesOperation_DR_R5015B_OtherPartnersTransactions_CR_R1040B_TaxesOutgoing) AS Operation, + | UNDEFINED AS AdvancesClosing + | + |FROM + | TaxesDifference AS TaxesDifference + |WHERE + | TaxesDifference.IncomingVatRate.Ref IS NULL + | AND NOT TaxesDifference.OutgoingVatRate.Ref IS NULL + | AND TaxesDifference.Amount <> 0"; + +EndFunction + +Function GetAccountingAnalytics(Parameters) Export + AO = Catalogs.AccountingOperations; + If Parameters.Operation = AO.TaxesOperation_DR_R2040B_TaxesIncoming_CR_R1040B_TaxesOutgoing Then + Return GetAnalytics_DR_R2040B_TaxesIncoming_CR_R1040B_TaxesOutgoing(Parameters); + ElsIf Parameters.Operation = AO.TaxesOperation_DR_R2040B_TaxesIncoming_CR_R5015B_OtherPartnersTransactions Then + Return GetAnalytics_DR_R2040B_TaxesIncoming_CR_R5015B_OtherPartnersTransactions(Parameters); + ElsIf Parameters.Operation = AO.TaxesOperation_DR_R5015B_OtherPartnersTransactions_CR_R1040B_TaxesOutgoing Then + Return GetAnalytics_DR_R5015B_OtherPartnersTransactions_CR_R1040B_TaxesOutgoing(Parameters); + EndIf; + Return Undefined; +EndFunction + +#Region Accounting_Analytics + +Function GetAnalytics_DR_R2040B_TaxesIncoming_CR_R1040B_TaxesOutgoing(Parameters) + AccountingAnalytics = AccountingServer.GetAccountingAnalyticsResult(Parameters); + AccountParameters = AccountingServer.GetAccountParameters(Parameters); + + TaxVat = TaxesServer.GetVatRef(); + + IncomingTaxInfo = New Structure(); + IncomingTaxInfo.Insert("Tax", TaxVat); + IncomingTaxInfo.Insert("VatRate", Parameters.RowData.IncomingVatRate); + + OutgoingTaxInfo = New Structure(); + OutgoingTaxInfo.Insert("Tax", TaxVat); + OutgoingTaxInfo.Insert("VatRate", Parameters.RowData.OutgoingVatRate); + + // Debit + Debit = AccountingServer.GetT9013S_AccountsTax(AccountParameters, IncomingTaxInfo); + If Parameters.RowData.IncomingInvoiceType = Enums.InvoiceType.Invoice Then + AccountingAnalytics.Debit = Debit.IncomingAccount; + Else + AccountingAnalytics.Debit = Debit.IncomingAccountReturn; + EndIf; + AccountingServer.SetDebitExtDimensions(Parameters, AccountingAnalytics, IncomingTaxInfo); + + // Credit + Credit = AccountingServer.GetT9013S_AccountsTax(AccountParameters, OutgoingTaxInfo); + If Parameters.RowData.OutgoingInvoiceType = Enums.InvoiceType.Invoice Then + AccountingAnalytics.Credit = Credit.OutgoingAccount; + Else + AccountingAnalytics.Credit = Credit.OutgoingAccountReturn; + EndIf; + AccountingServer.SetCreditExtDimensions(Parameters, AccountingAnalytics, OutgoingTaxInfo); + + Return AccountingAnalytics; +EndFunction + +Function GetAnalytics_DR_R2040B_TaxesIncoming_CR_R5015B_OtherPartnersTransactions(Parameters) + AccountingAnalytics = AccountingServer.GetAccountingAnalyticsResult(Parameters); + AccountParameters = AccountingServer.GetAccountParameters(Parameters); + + TaxVat = TaxesServer.GetVatRef(); + + IncomingTaxInfo = New Structure(); + IncomingTaxInfo.Insert("Tax", TaxVat); + IncomingTaxInfo.Insert("VatRate", Parameters.RowData.IncomingVatRate); + + // Debit + Debit = AccountingServer.GetT9013S_AccountsTax(AccountParameters, IncomingTaxInfo); + If Parameters.RowData.IncomingInvoiceType = Enums.InvoiceType.Invoice Then + AccountingAnalytics.Debit = Debit.IncomingAccount; + Else + AccountingAnalytics.Debit = Debit.IncomingAccountReturn; + EndIf; + AccountingServer.SetDebitExtDimensions(Parameters, AccountingAnalytics, IncomingTaxInfo); + + // Credit + Credit = AccountingServer.GetT9012S_AccountsPartner(AccountParameters, + Parameters.ObjectData.Partner, + Parameters.ObjectData.Agreement, + Parameters.ObjectData.Currency); + + AccountingAnalytics.Credit = Credit.AccountTransactionsOther; + AdditionalAnalytics = New Structure(); + AdditionalAnalytics.Insert("Partner", Parameters.ObjectData.Partner); + AccountingServer.SetCreditExtDimensions(Parameters, AccountingAnalytics, AdditionalAnalytics); + + Return AccountingAnalytics; +EndFunction + +Function GetAnalytics_DR_R5015B_OtherPartnersTransactions_CR_R1040B_TaxesOutgoing(Parameters) + AccountingAnalytics = AccountingServer.GetAccountingAnalyticsResult(Parameters); + AccountParameters = AccountingServer.GetAccountParameters(Parameters); + + TaxVat = TaxesServer.GetVatRef(); + + OutgoingTaxInfo = New Structure(); + OutgoingTaxInfo.Insert("Tax", TaxVat); + OutgoingTaxInfo.Insert("VatRate", Parameters.RowData.OutgoingVatRate); + + // Debit + Debit = AccountingServer.GetT9012S_AccountsPartner(AccountParameters, + Parameters.ObjectData.Partner, + Parameters.ObjectData.Agreement, + Parameters.ObjectData.Currency); + + AccountingAnalytics.Debit = Debit.AccountTransactionsOther; + AdditionalAnalytics = New Structure(); + AdditionalAnalytics.Insert("Partner", Parameters.ObjectData.Partner); + AccountingServer.SetDebitExtDimensions(Parameters, AccountingAnalytics, AdditionalAnalytics); + + // Credit + Credit = AccountingServer.GetT9013S_AccountsTax(AccountParameters, OutgoingTaxInfo); + If Parameters.RowData.OutgoingInvoiceType = Enums.InvoiceType.Invoice Then + AccountingAnalytics.Credit = Credit.OutgoingAccount; + Else + AccountingAnalytics.Credit = Credit.OutgoingAccountReturn; + EndIf; + AccountingServer.SetCreditExtDimensions(Parameters, AccountingAnalytics, OutgoingTaxInfo); + + Return AccountingAnalytics; +EndFunction + +//// Expense - Other period expense +//Function GetAnalytics_DR_R5022T_Expenses_CR_R6070T_OtherPeriodsExpenses(Parameters) +// AccountingAnalytics = AccountingServer.GetAccountingAnalyticsResult(Parameters); +// AccountParameters = AccountingServer.GetAccountParameters(Parameters); +// +// // Debit +// Debit = AccountingServer.GetT9014S_AccountsExpenseRevenue(AccountParameters, +// Parameters.RowData.ExpenseType, +// Parameters.RowData.ProfitLossCenter); +// +// AccountingAnalytics.Debit = Debit.AccountExpense; +// AccountingServer.SetDebitExtDimensions(Parameters, AccountingAnalytics); +// +// // Credit +// Credit = AccountingServer.GetT9014S_AccountsExpenseRevenue(AccountParameters, +// Parameters.RowData.ExpenseType, +// Parameters.RowData.ProfitLossCenter); +// +// AccountingAnalytics.Credit = Credit.AccountOtherPeriodsExpense; +// AccountingServer.SetCreditExtDimensions(Parameters, AccountingAnalytics); +// +// Return AccountingAnalytics; +//EndFunction +// +//// Other period expense - Expense (reverse) +//Function GetAnalytics_DR_R6070T_OtherPeriodsExpenses_CR_R5022T_Expenses(Parameters) +// AccountingAnalytics = AccountingServer.GetAccountingAnalyticsResult(Parameters); +// AccountParameters = AccountingServer.GetAccountParameters(Parameters); +// +// // Debit +// Debit = AccountingServer.GetT9014S_AccountsExpenseRevenue(AccountParameters, +// Parameters.RowData.ExpenseType, +// Parameters.RowData.ProfitLossCenter); +// +// AccountingAnalytics.Debit = Debit.AccountOtherPeriodsExpense; +// AccountingServer.SetDebitExtDimensions(Parameters, AccountingAnalytics); +// +// // Credit +// Credit = AccountingServer.GetT9014S_AccountsExpenseRevenue(AccountParameters, +// Parameters.RowData.ExpenseType, +// Parameters.RowData.ProfitLossCenter); +// +// AccountingAnalytics.Credit = Credit.AccountExpense; +// AccountingServer.SetCreditExtDimensions(Parameters, AccountingAnalytics); +// +// Return AccountingAnalytics; +//EndFunction +// +Function GetHintDebitExtDimension(Parameters, ExtDimensionType, Value) Export + Return Value; +EndFunction + +Function GetHintCreditExtDimension(Parameters, ExtDimensionType, Value) Export + Return Value; +EndFunction + +#EndRegion + +#EndRegion diff --git a/IRP/src/Documents/TaxesOperation/ObjectModule.bsl b/IRP/src/Documents/TaxesOperation/ObjectModule.bsl new file mode 100644 index 0000000000..f459329e07 --- /dev/null +++ b/IRP/src/Documents/TaxesOperation/ObjectModule.bsl @@ -0,0 +1,48 @@ + +Procedure BeforeWrite(Cancel, WriteMode, PostingMode) + If DataExchange.Load Then + Return; + EndIf; + + Parameters = CurrenciesClientServer.GetParameters_V13(ThisObject); + Parameters.Insert("DocObject", ThisObject); + CurrenciesClientServer.DeleteRowsByKeyFromCurrenciesTable(ThisObject.Currencies); + CurrenciesServer.UpdateCurrencyTable(Parameters, ThisObject.Currencies); + + Result = DocTaxesOperationServer.CalculateTaxDifference(ThisObject); + ThisObject.TaxesDifference.Clear(); + For Each Row In Result Do + FillPropertyValues(ThisObject.TaxesDifference.Add(), Row); + EndDo; + + ThisObject.AdditionalProperties.Insert("WriteMode", WriteMode); +EndProcedure + +Procedure OnWrite(Cancel) + If DataExchange.Load Then + Return; + EndIf; + + WriteMode = CommonFunctionsClientServer.GetFromAddInfo(ThisObject.AdditionalProperties, "WriteMode"); + If FOServer.IsUseAccounting() And WriteMode = DocumentWriteMode.Posting Then + AccountingServer.OnWrite(ThisObject, Cancel, "TaxesDifference"); + EndIf; +EndProcedure + +Procedure BeforeDelete(Cancel) + If DataExchange.Load Then + Return; + EndIf; +EndProcedure + +Procedure Posting(Cancel, PostingMode) + PostingServer.Post(ThisObject, Cancel, PostingMode, ThisObject.AdditionalProperties); +EndProcedure + +Procedure UndoPosting(Cancel) + UndopostingServer.Undopost(ThisObject, Cancel, ThisObject.AdditionalProperties); +EndProcedure + +Procedure FillCheckProcessing(Cancel, CheckedAttributes) + Return; +EndProcedure diff --git a/IRP/src/Documents/TaxesOperation/TaxesOperation.mdo b/IRP/src/Documents/TaxesOperation/TaxesOperation.mdo new file mode 100644 index 0000000000..3ad3dd2a6c --- /dev/null +++ b/IRP/src/Documents/TaxesOperation/TaxesOperation.mdo @@ -0,0 +1,981 @@ + + + + + + + + + + TaxesOperation + + en + Taxes operation + + + ru + Операция налогообложения + + + tr + Taxes operation + + true + Document.TaxesOperation.StandardAttribute.Number + DontUse + + Catalog.AddAttributeAndPropertySets.TabularSection.Properties + Catalog.AddAttributeAndPropertySets.TabularSection.Properties.Attribute.Property + Catalog.AddAttributeAndPropertySets.TabularSection.Properties.StandardAttribute.Ref + + Catalog.AddAttributeAndPropertySets.Document_TaxesOperation + + Catalog.AddAttributeAndPropertySets.TabularSection.Properties.StandardAttribute.Ref + 0 + InformationRegister.AddProperties + InformationRegister.AddProperties.Dimension.Object + InformationRegister.AddProperties.Dimension.Property + InformationRegister.AddProperties.Resource.Value + 0 + 0 + + + Catalog.AddAttributeAndPropertySets.TabularSection.Attributes + Catalog.AddAttributeAndPropertySets.TabularSection.Attributes.Attribute.Attribute + Catalog.AddAttributeAndPropertySets.TabularSection.Attributes.StandardAttribute.Ref + + Catalog.AddAttributeAndPropertySets.Document_TaxesOperation + + Catalog.AddAttributeAndPropertySets.TabularSection.Attributes.StandardAttribute.Ref + 0 + Document.TaxesOperation.TabularSection.AddAttributes + Document.TaxesOperation.TabularSection.AddAttributes.StandardAttribute.Ref + Document.TaxesOperation.TabularSection.AddAttributes.Attribute.Property + Document.TaxesOperation.TabularSection.AddAttributes.Attribute.Value + 0 + 0 + + Use + Managed + Use + + en + Taxes operation + + + ru + Операция налогообложения + + + tr + Taxes operation + + + en + Taxes operations + + + ru + Операции налогообложения + + + tr + Taxes operations + + 12 + Variable + true + true + Document.TaxesOperation.Form.DocumentForm + Document.TaxesOperation.Form.ListForm + Document.TaxesOperation.Form.ChoiceForm + Deny + AccumulationRegister.T1040T_AccountingAmounts + AccumulationRegister.R1040B_TaxesOutgoing + AccumulationRegister.R2040B_TaxesIncoming + AccumulationRegister.R5015B_OtherPartnersTransactions + AccumulationRegister.R5010B_ReconciliationStatement + AccumulationRegister.R5020B_PartnersBalance + true + true + + Company + + en + Company + + + ru + Организация + + + tr + Şirket + + + CatalogRef.Companies + + + + ShowError + true + + Use + Use + + + Currency + + en + Currency + + + ru + Валюта + + + tr + Döviz + + + CatalogRef.Currencies + + + + ShowError + + Use + Use + + + TransactionType + + en + Transaction type + + + ru + Вид операции + + + tr + İşlem tipi + + + EnumRef.TaxesOperationTransactionType + + + + ShowError + + Use + Use + + + Partner + + en + Partner + + + ru + Партнер + + + tr + Cari hesap + + + CatalogRef.Partners + + + + ShowError + + Use + Use + + + LegalName + + en + Legal name + + + ru + Контрагент + + + tr + Fatura hesabı + + + CatalogRef.Companies + + + + ShowError + + Use + Use + + + Agreement + + en + Partner term + + + ru + Соглашение + + + tr + Sözleşme + + + CatalogRef.Agreements + + + + ShowError + + Use + Use + + + LegalNameContract + + en + Legal name contract + + + ru + Договор контрагента + + + tr + Fatura hesap kontratı + + + CatalogRef.LegalNameContracts + + + + + Filter.LegalName + Document.TaxesOperation.Attribute.LegalName + + + Filter.Company + Document.TaxesOperation.Attribute.Company + + + Use + Use + + + DocumentForm + + en + Document form + + + ru + Форма документа + + + tr + Evrak formu + + PersonalComputer + MobileDevice + + + ListForm + + en + List form + + + ru + Форма списка + + + tr + Liste formu + + PersonalComputer + MobileDevice + + + ChoiceForm + + en + Choice form + + + ru + Форма выбора + + + tr + Seçim formu + + PersonalComputer + MobileDevice + + + + + + + AddAttributes + + en + Additional attributes + + + ru + Дополнительные реквизиты + + + tr + Ek özellikler + + + Property + + en + Property + + + ru + Свойство + + + tr + Özellik + + + ChartOfCharacteristicTypesRef.AddAttributeAndProperty + + + + Use + + + Value + + en + Value + + + ru + Значение + + + tr + Değer + + + Characteristic.AddAttributeAndProperty + + + + + Filter.Owner + Document.TaxesOperation.TabularSection.AddAttributes.Attribute.Property + + Use + + + + + + + + Currencies + + en + Currencies + + + ru + Валюты + + + tr + Dövizler + + + Key + + en + Key + + + ru + Ключ + + + tr + Anahtar + + + DefinedType.typeRowID + + + + Use + Use + + + CurrencyFrom + + en + Currency from + + + ru + С валюты + + + tr + Dövizden + + + CatalogRef.Currencies + + + + Use + Use + + + Rate + + en + Rate + + + ru + Ставка + + + tr + Oran + + + DefinedType.typeCurrencyRate + + + + Use + Use + + + ReverseRate + + en + Reverse rate + + + ru + Обратный курс + + + tr + Ters kur + + + DefinedType.typeCurrencyRate + + + + Use + Use + + + ShowReverseRate + + en + Show reverse rate + + + ru + Показать обратный курс + + + tr + Ters kur göster + + + Boolean + + + + Use + Use + + + Multiplicity + + en + Multiplicity + + + ru + Кратность + + + tr + Çarpan + + + Number + + 10 + + + + + Use + Use + + + MovementType + + en + Movement type + + + ru + Вид движения + + + tr + Hareket tipi + + + ChartOfCharacteristicTypesRef.CurrencyMovementType + + + + Use + Use + + + Amount + + en + Amount + + + ru + Сумма + + + tr + Tutar + + + DefinedType.typeAmount + + + + Use + Use + + + IsFixed + + en + Is fixed + + + ru + Фиксированный + + + tr + Sabittir + + + Boolean + + + + Use + Use + + + + + + + + TaxesIncoming + + en + Taxes incoming + + + ru + Входящие налоги + + + tr + Taxes incoming + + + Key + + en + Key + + + ru + Ключ + + + tr + Anahtar + + + DefinedType.typeRowID + + + + Use + Use + + + VatRate + + en + VAT + + + ru + НДС + + + tr + KDV + + + CatalogRef.TaxRates + + + + ShowError + Use + Use + + + InvoiceType + + en + Invoice type + + + ru + Тип инвойса + + + tr + Invoice type + + + EnumRef.InvoiceType + + + + ShowError + Use + Use + + + Amount + + en + Amount + + + ru + Сумма + + + tr + Tutar + + + DefinedType.typeAmount + + + + ShowError + Use + + + + + + + + TaxesOutgoing + + en + Taxes outgoing + + + ru + Исходящие налоги + + + tr + Taxes outgoing + + + Key + + en + Key + + + ru + Ключ + + + tr + Anahtar + + + DefinedType.typeRowID + + + + Use + Use + + + VatRate + + en + VAT + + + ru + НДС + + + tr + KDV + + + CatalogRef.TaxRates + + + + ShowError + Use + Use + + + InvoiceType + + en + Invoice type + + + ru + Тип инвойса + + + tr + Invoice type + + + EnumRef.InvoiceType + + + + ShowError + Use + Use + + + Amount + + en + Amount + + + ru + Сумма + + + tr + Tutar + + + DefinedType.typeAmount + + + + ShowError + Use + + + + + + + + TaxesDifference + + en + Taxes difference + + + ru + Разница налогов + + + tr + Taxes difference + + + Key + + en + Key + + + ru + Ключ + + + tr + Anahtar + + + DefinedType.typeRowID + + + + Use + Use + + + IncomingVatRate + + en + VAT (Incoming) + + + ru + НДС (входящий) + + + tr + VAT (Incoming) + + + CatalogRef.TaxRates + + + + Use + Use + + + IncomingInvoiceType + + en + Invoice type (incoming) + + + ru + Тип инвойса (входящий) + + + tr + Invoice type (incoming) + + + EnumRef.InvoiceType + + + + Use + Use + + + OutgoingVatRate + + en + VAT (outgoing) + + + ru + НДС (исходящий) + + + tr + VAT (outgoing) + + + CatalogRef.TaxRates + + + + Use + Use + + + OutgoingInvoiceType + + en + Invoice type (outgoing) + + + ru + Тип инвойса (исходящий) + + + tr + Invoice type (outgoing) + + + EnumRef.InvoiceType + + + + Use + Use + + + Amount + + en + Amount + + + ru + Сумма + + + tr + Tutar + + + DefinedType.typeAmount + + + + Use + + + \ No newline at end of file diff --git a/IRP/src/Documents/TimeSheet/Forms/DocumentForm/Module.bsl b/IRP/src/Documents/TimeSheet/Forms/DocumentForm/Module.bsl index 92d31ef135..57c42054dc 100644 --- a/IRP/src/Documents/TimeSheet/Forms/DocumentForm/Module.bsl +++ b/IRP/src/Documents/TimeSheet/Forms/DocumentForm/Module.bsl @@ -28,7 +28,7 @@ EndProcedure &AtServer Procedure AfterWriteAtServer(CurrentObject, WriteParameters) - DocPayrollServer.AfterWriteAtServer(Object, ThisObject, CurrentObject, WriteParameters); + DocTimeSheetServer.AfterWriteAtServer(Object, ThisObject, CurrentObject, WriteParameters); SetVisibilityAvailability(CurrentObject, ThisObject); EndProcedure diff --git a/IRP/src/Enums/IncomingPaymentTransactionType/IncomingPaymentTransactionType.mdo b/IRP/src/Enums/IncomingPaymentTransactionType/IncomingPaymentTransactionType.mdo index 794be481fd..5ab95e24d6 100644 --- a/IRP/src/Enums/IncomingPaymentTransactionType/IncomingPaymentTransactionType.mdo +++ b/IRP/src/Enums/IncomingPaymentTransactionType/IncomingPaymentTransactionType.mdo @@ -163,7 +163,7 @@ ru - Подотчет сотрудника + Авансовый отчет сотрудника tr diff --git a/IRP/src/Enums/InvoiceType/InvoiceType.mdo b/IRP/src/Enums/InvoiceType/InvoiceType.mdo new file mode 100644 index 0000000000..e6ade255f9 --- /dev/null +++ b/IRP/src/Enums/InvoiceType/InvoiceType.mdo @@ -0,0 +1,53 @@ + + + + + + + + InvoiceType + + en + Invoice type + + + ru + Тип инвойса + + + tr + Invoice type + + true + BothWays + + Invoice + + en + Invoice + + + ru + Инвойс + + + tr + Fatura + + + + Return + + en + Return + + + ru + Возврат + + + tr + İade + + + \ No newline at end of file diff --git a/IRP/src/Enums/OutgoingPaymentTransactionTypes/OutgoingPaymentTransactionTypes.mdo b/IRP/src/Enums/OutgoingPaymentTransactionTypes/OutgoingPaymentTransactionTypes.mdo index a3307ab2ec..7ce1d98102 100644 --- a/IRP/src/Enums/OutgoingPaymentTransactionTypes/OutgoingPaymentTransactionTypes.mdo +++ b/IRP/src/Enums/OutgoingPaymentTransactionTypes/OutgoingPaymentTransactionTypes.mdo @@ -133,7 +133,7 @@ ru - Подотчет сотрудника + Авансовый отчет сотрудника tr diff --git a/IRP/src/Enums/TaxesOperationTransactionType/TaxesOperationTransactionType.mdo b/IRP/src/Enums/TaxesOperationTransactionType/TaxesOperationTransactionType.mdo new file mode 100644 index 0000000000..a6291923cd --- /dev/null +++ b/IRP/src/Enums/TaxesOperationTransactionType/TaxesOperationTransactionType.mdo @@ -0,0 +1,68 @@ + + + + + + + + TaxesOperationTransactionType + + en + Taxes operation transaction type + + + ru + Тип операции с налогами + + + tr + Taxes operation transaction type + + true + BothWays + + TaxOffset + + en + Tax оffset + + + ru + Налоговый вычет + + + tr + Tax оffset + + + + TaxOffsetAndPayment + + en + Tax offset and payment + + + ru + Налоговый вычет и платеж + + + tr + Tax offset and payment + + + + TaxPayment + + en + Tax Payment + + + ru + Налоговый платеж + + + tr + Tax Payment + + + \ No newline at end of file diff --git a/IRP/src/ExchangePlans/FullExchange/FullExchange.mdo b/IRP/src/ExchangePlans/FullExchange/FullExchange.mdo index 1fb96938c9..591758cb00 100644 --- a/IRP/src/ExchangePlans/FullExchange/FullExchange.mdo +++ b/IRP/src/ExchangePlans/FullExchange/FullExchange.mdo @@ -897,9 +897,6 @@ Constant.DefaultFilesStorageVolume - - AccumulationRegister.R5041B_TaxesPayable - AccumulationRegister.R2040B_TaxesIncoming diff --git a/IRP/src/FunctionalOptions/UseSalary/UseSalary.mdo b/IRP/src/FunctionalOptions/UseSalary/UseSalary.mdo index 1a57745425..5787fbae81 100644 --- a/IRP/src/FunctionalOptions/UseSalary/UseSalary.mdo +++ b/IRP/src/FunctionalOptions/UseSalary/UseSalary.mdo @@ -37,4 +37,7 @@ AccumulationRegister.R9560T_AdditionalAccrual AccumulationRegister.R9570T_AdditionalDeduction Catalog.SalaryCalculationType + AccumulationRegister.R9541T_VacationUsage + InformationRegister.T9545S_VacationDaysLimits + Document.CalculationDeservedVacations \ No newline at end of file diff --git a/IRP/src/InformationRegisters/T2014S_AdvancesInfo/ManagerModule.bsl b/IRP/src/InformationRegisters/T2014S_AdvancesInfo/ManagerModule.bsl index f1f13810f7..b0a3f72cfb 100644 --- a/IRP/src/InformationRegisters/T2014S_AdvancesInfo/ManagerModule.bsl +++ b/IRP/src/InformationRegisters/T2014S_AdvancesInfo/ManagerModule.bsl @@ -164,7 +164,8 @@ Function T2014S_AdvancesInfo_DebitCreditNote() Export | Doc.SendOrderSettlements AS Order, | Doc.SendIsCustomerAdvance AS IsCustomerAdvance, | Doc.SendIsVendorAdvance AS IsVendorAdvance, - | Doc.Amount + | Doc.Amount, + | Doc.Key |INTO T2014S_AdvancesInfo |FROM | SendAdvances AS Doc @@ -216,7 +217,8 @@ Function T2014S_AdvancesInfo_DebitCreditNote() Export | Doc.ReceiveOrderSettlements, | Doc.ReceiveIsCustomerAdvance AS IsCustomerAdvance, | Doc.ReceiveIsVendorAdvance AS IsVendorAdvance, - | Doc.Amount + | Doc.Amount, + | Doc.Key |FROM | ReceiveAdvances AS Doc"; EndFunction diff --git a/IRP/src/InformationRegisters/T2015S_TransactionsInfo/ManagerModule.bsl b/IRP/src/InformationRegisters/T2015S_TransactionsInfo/ManagerModule.bsl index 46d30f7af9..8c02b6673c 100644 --- a/IRP/src/InformationRegisters/T2015S_TransactionsInfo/ManagerModule.bsl +++ b/IRP/src/InformationRegisters/T2015S_TransactionsInfo/ManagerModule.bsl @@ -345,7 +345,8 @@ Function T2015S_TransactionsInfo_DebitCreditNote() Export | end | end | end AS IsPaid, - | Doc.Amount + | Doc.Amount, + | Doc.Key |INTO T2015S_TransactionsInfo |FROM | SendTransactions AS Doc @@ -427,7 +428,8 @@ Function T2015S_TransactionsInfo_DebitCreditNote() Export | end | end | end AS IsPaid, - | Doc.Amount + | Doc.Amount, + | Doc.Key |FROM | ReceiveTransactions AS Doc"; EndFunction diff --git a/IRP/src/InformationRegisters/T9013S_AccountsTax/Forms/RecordForm/Form.form b/IRP/src/InformationRegisters/T9013S_AccountsTax/Forms/RecordForm/Form.form index 1a75e6fea5..f2220c013d 100644 --- a/IRP/src/InformationRegisters/T9013S_AccountsTax/Forms/RecordForm/Form.form +++ b/IRP/src/InformationRegisters/T9013S_AccountsTax/Forms/RecordForm/Form.form @@ -358,6 +358,56 @@ true + + IncomingAccountReturn + 25 + true + true + + true + + + Record.IncomingAccountReturn + + + IncomingAccountReturnExtendedTooltip + 27 + true + true + + true + + Label + true + true + + Left + + + + IncomingAccountReturnContextMenu + 26 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + OutgoingAccount 19 @@ -408,6 +458,56 @@ true + + OutgoingAccountReturn + 28 + true + true + + true + + + Record.OutgoingAccountReturn + + + OutgoingAccountReturnExtendedTooltip + 30 + true + true + + true + + Label + true + true + + Left + + + + OutgoingAccountReturnContextMenu + 29 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + FormCommandBar -1 diff --git a/IRP/src/InformationRegisters/T9013S_AccountsTax/RecordSetModule.bsl b/IRP/src/InformationRegisters/T9013S_AccountsTax/RecordSetModule.bsl index e9021a3716..98af1d8aeb 100644 --- a/IRP/src/InformationRegisters/T9013S_AccountsTax/RecordSetModule.bsl +++ b/IRP/src/InformationRegisters/T9013S_AccountsTax/RecordSetModule.bsl @@ -13,9 +13,19 @@ Procedure FillCheckProcessing(Cancel, CheckedAttributes) CommonFunctionsClientServer.ShowUsersMessage(StrTemplate(R().AccountingError_01, Record.IncomingAccount.Code), "IncomingAccount", ThisObject); EndIf; + If ValueIsFilled(Record.IncomingAccountReturn) And Record.IncomingAccountReturn.NotUsedForRecords Then + Cancel = True; + CommonFunctionsClientServer.ShowUsersMessage(StrTemplate(R().AccountingError_01, Record.IncomingAccountReturn.Code), "IncomingAccountReturn", ThisObject); + EndIf; + If ValueIsFilled(Record.OutgoingAccount) And Record.OutgoingAccount.NotUsedForRecords Then Cancel = True; CommonFunctionsClientServer.ShowUsersMessage(StrTemplate(R().AccountingError_01, Record.OutgoingAccount.Code), "OutgoingAccount", ThisObject); EndIf; + + If ValueIsFilled(Record.OutgoingAccountReturn) And Record.OutgoingAccountReturn.NotUsedForRecords Then + Cancel = True; + CommonFunctionsClientServer.ShowUsersMessage(StrTemplate(R().AccountingError_01, Record.OutgoingAccountReturn.Code), "OutgoingAccountReturn", ThisObject); + EndIf; EndDo; EndProcedure diff --git a/IRP/src/InformationRegisters/T9013S_AccountsTax/T9013S_AccountsTax.mdo b/IRP/src/InformationRegisters/T9013S_AccountsTax/T9013S_AccountsTax.mdo index 83b05c8740..3eeefa3aac 100644 --- a/IRP/src/InformationRegisters/T9013S_AccountsTax/T9013S_AccountsTax.mdo +++ b/IRP/src/InformationRegisters/T9013S_AccountsTax/T9013S_AccountsTax.mdo @@ -93,6 +93,60 @@ Use + + IncomingAccountReturn + + en + Incoming account (return) + + + ru + Входящий счет (возврат) + + + tr + Incoming account (return) + + + ChartOfAccountsRef.Basic + + + + + Filter.LedgerTypeVariant + InformationRegister.T9013S_AccountsTax.Dimension.LedgerTypeVariant + + Use + Use + + + + OutgoingAccountReturn + + en + Outgoing account (return) + + + ru + Исходящий счет (возврат) + + + tr + Outgoing account (return) + + + ChartOfAccountsRef.Basic + + + + + Filter.LedgerTypeVariant + InformationRegister.T9013S_AccountsTax.Dimension.LedgerTypeVariant + + Use + Use + + Company diff --git a/IRP/src/InformationRegisters/T9545S_VacationDaysLimits/Forms/RecordForm/Form.form b/IRP/src/InformationRegisters/T9545S_VacationDaysLimits/Forms/RecordForm/Form.form new file mode 100644 index 0000000000..5105344d95 --- /dev/null +++ b/IRP/src/InformationRegisters/T9545S_VacationDaysLimits/Forms/RecordForm/Form.form @@ -0,0 +1,243 @@ + + + + Period + 1 + true + true + + true + + + Record.Period + + + PeriodExtendedTooltip + 3 + true + true + + true + + Label + true + true + + Left + + + + PeriodContextMenu + 2 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + Company + 4 + true + true + + true + + + Record.Company + + + CompanyExtendedTooltip + 6 + true + true + + true + + Label + true + true + + Left + + + + CompanyContextMenu + 5 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + Employee + 7 + true + true + + true + + + Record.Employee + + + EmployeeExtendedTooltip + 9 + true + true + + true + + Label + true + true + + Left + + + + EmployeeContextMenu + 8 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + DayLimit + 10 + true + true + + true + + + Record.DayLimit + + + DayLimitExtendedTooltip + 12 + true + true + + true + + Label + true + true + + Left + + + + DayLimitContextMenu + 11 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + FormCommandBar + -1 + true + true + + true + + Left + true + + LockOwnerWindow + true + true + Vertical + true + true + true + true + true + + Record + 1 + + InformationRegisterRecordManager.T9545S_VacationDaysLimits + + + true + + + true + +
true
+ true + + + + + + + diff --git a/IRP/src/InformationRegisters/T9545S_VacationDaysLimits/ManagerModule.bsl b/IRP/src/InformationRegisters/T9545S_VacationDaysLimits/ManagerModule.bsl new file mode 100644 index 0000000000..1c8442f09c --- /dev/null +++ b/IRP/src/InformationRegisters/T9545S_VacationDaysLimits/ManagerModule.bsl @@ -0,0 +1,72 @@ +#Region AccessObject + +// Get access key. +// See Role.TemplateInformationRegisters +// +// Returns: +// Structure - Get access key: +// * Company - CatalogRef.Companies - +// * Branch - CatalogRef.BusinessUnits - +Function GetAccessKey() Export + AccessKeyStructure = New Structure; + Return AccessKeyStructure; +EndFunction + +#EndRegion + +Function GetLimit(Date, Company, Employee = Undefined) Export + + Query = New Query; + Query.Text = + "SELECT + | T9545S_VacationDaysLimitsSliceLast.DayLimit, + | 1 AS Priority + |FROM + | InformationRegister.T9545S_VacationDaysLimits.SliceLast(&Date, Company = &Company + | AND Employee = &Employee) AS T9545S_VacationDaysLimitsSliceLast + | + |UNION ALL + | + |SELECT + | T9545S_VacationDaysLimitsSliceLast.DayLimit, + | 2 + |FROM + | InformationRegister.T9545S_VacationDaysLimits.SliceLast(&Date, Company = &EmptyCompany + | AND Employee = &Employee) AS T9545S_VacationDaysLimitsSliceLast + | + |UNION ALL + | + |SELECT + | T9545S_VacationDaysLimitsSliceLast.DayLimit, + | 3 + |FROM + | InformationRegister.T9545S_VacationDaysLimits.SliceLast(&Date, Company = &Company + | AND Employee = &EmptyEmployee) AS T9545S_VacationDaysLimitsSliceLast + | + |UNION ALL + | + |SELECT + | T9545S_VacationDaysLimitsSliceLast.DayLimit, + | 4 + |FROM + | InformationRegister.T9545S_VacationDaysLimits.SliceLast(&Date, Company = &EmptyCompany + | AND Employee = &EmptyEmployee) AS T9545S_VacationDaysLimitsSliceLast + | + |ORDER BY + | Priority"; + + Query.SetParameter("Date", Date); + Query.SetParameter("Company", Company); + Query.SetParameter("Employee", Employee); + Query.SetParameter("EmptyCompany", Catalogs.Companies.EmptyRef()); + Query.SetParameter("EmptyEmployee", Catalogs.Partners.EmptyRef()); + + QuerySelection = Query.Execute().Select(); + + If QuerySelection.Next() Then + Return QuerySelection.DayLimit; + EndIf; + + Return 0; + +EndFunction \ No newline at end of file diff --git a/IRP/src/InformationRegisters/T9545S_VacationDaysLimits/T9545S_VacationDaysLimits.mdo b/IRP/src/InformationRegisters/T9545S_VacationDaysLimits/T9545S_VacationDaysLimits.mdo new file mode 100644 index 0000000000..d652590dc0 --- /dev/null +++ b/IRP/src/InformationRegisters/T9545S_VacationDaysLimits/T9545S_VacationDaysLimits.mdo @@ -0,0 +1,146 @@ + + + + + + + + + + + + T9545S_VacationDaysLimits + + en + T9545 Vacation days limits + + + ru + T9545 Лимиты дней отпуска + + + tr + T9545 Vacation days limits + + true + InDialog + InformationRegister.T9545S_VacationDaysLimits.Form.RecordForm + Year + Managed + + DayLimit + + en + Day limit + + + ru + Лимит дней + + + tr + Day limit + + + Number + + 3 + true + + + + + Use + Use + + + + Document + + en + Document + + + ru + Документ + + + tr + Evrak + + + DocumentRef.EmployeeHiring + + + + Use + Use + + + + Company + + en + Company + + + ru + Организация + + + tr + Şirket + + + CatalogRef.Companies + + + + Use + Use + true + + true + + + Employee + + en + Employee + + + ru + Сотрудник + + + tr + Personel + + + CatalogRef.Partners + + + + Use + Use + + true + + + RecordForm + + en + Record form + + + ru + Форма записи + + + tr + Kayıt formu + + PersonalComputer + MobileDevice + + \ No newline at end of file diff --git a/IRP/src/Reports/D0013_DocumentRegistrationsReport/D0013_DocumentRegistrationsReport.mdo b/IRP/src/Reports/D0013_DocumentRegistrationsReport/D0013_DocumentRegistrationsReport.mdo index 10beb4544a..4872cfcf4f 100644 --- a/IRP/src/Reports/D0013_DocumentRegistrationsReport/D0013_DocumentRegistrationsReport.mdo +++ b/IRP/src/Reports/D0013_DocumentRegistrationsReport/D0013_DocumentRegistrationsReport.mdo @@ -148,6 +148,8 @@ DocumentRef.ProductionPlanningClosing DocumentRef.RetailGoodsReceipt DocumentRef.CashExpense + DocumentRef.CalculationDeservedVacations + DocumentRef.TaxesOperation Auto diff --git a/IRP/src/Reports/D0013_DocumentRegistrationsReport/Forms/ReportForm/Form.form b/IRP/src/Reports/D0013_DocumentRegistrationsReport/Forms/ReportForm/Form.form index c8ac165c8a..616c89e4ae 100644 --- a/IRP/src/Reports/D0013_DocumentRegistrationsReport/Forms/ReportForm/Form.form +++ b/IRP/src/Reports/D0013_DocumentRegistrationsReport/Forms/ReportForm/Form.form @@ -918,9 +918,6 @@ Role.AccumulationRegisters_R5022T_Expenses - - Role.AccumulationRegisters_R5041B_TaxesPayable - Role.AccumulationRegisters_R6010B_BatchWiseBalance diff --git a/IRP/src/Reports/D4010_ActualStocks/Commands/D4010_ActualStocks/CommandModule.bsl b/IRP/src/Reports/D4010_ActualStocks/Commands/D4010_ActualStocks/CommandModule.bsl new file mode 100644 index 0000000000..8a59817b3e --- /dev/null +++ b/IRP/src/Reports/D4010_ActualStocks/Commands/D4010_ActualStocks/CommandModule.bsl @@ -0,0 +1,7 @@ + +&AtClient +Procedure CommandProcessing(CommandParameter, CommandExecuteParameters) + FilterParameters = New Structure("Item", CommandParameter); + FormParameters = New Structure("Filter, GenerateOnOpen", FilterParameters, True); + OpenForm("Report.D4010_ActualStocks.Form", FormParameters, CommandExecuteParameters.Source, CommandExecuteParameters.Uniqueness, CommandExecuteParameters.Window, CommandExecuteParameters.URL); +EndProcedure diff --git a/IRP/src/Reports/D4010_ActualStocks/D4010_ActualStocks.mdo b/IRP/src/Reports/D4010_ActualStocks/D4010_ActualStocks.mdo index 7d4783ce33..a72f9b3f40 100644 --- a/IRP/src/Reports/D4010_ActualStocks/D4010_ActualStocks.mdo +++ b/IRP/src/Reports/D4010_ActualStocks/D4010_ActualStocks.mdo @@ -35,4 +35,25 @@ DataCompositionSchema + + D4010_ActualStocks + + en + Actual stocks + + + ru + Фактические запасы + + + tr + Actual stocks + + CommandGroup.Service + + CatalogRef.Items + + Multiple + Auto + \ No newline at end of file diff --git a/IRP/src/Reports/R1100_CustomersAging/Templates/MainDataCompositionSchema/Template.dcs b/IRP/src/Reports/R1100_CustomersAging/Templates/MainDataCompositionSchema/Template.dcs index 1bcd600bc2..f4c48723be 100644 --- a/IRP/src/Reports/R1100_CustomersAging/Templates/MainDataCompositionSchema/Template.dcs +++ b/IRP/src/Reports/R1100_CustomersAging/Templates/MainDataCompositionSchema/Template.dcs @@ -375,7 +375,7 @@ tr - Son Kullanma Tarihi + Son kullanım tarihi diff --git a/IRP/src/Reports/R1200_VendorsAging/Templates/MainDataCompositionSchema/Template.dcs b/IRP/src/Reports/R1200_VendorsAging/Templates/MainDataCompositionSchema/Template.dcs index a293a4e830..64d01c30f5 100644 --- a/IRP/src/Reports/R1200_VendorsAging/Templates/MainDataCompositionSchema/Template.dcs +++ b/IRP/src/Reports/R1200_VendorsAging/Templates/MainDataCompositionSchema/Template.dcs @@ -375,7 +375,7 @@ tr - Son Kullanma Tarihi + Son kullanım tarihi diff --git a/IRP/src/Reports/R6020_BatchBalance/Templates/MainDataCompositionSchema/Template.dcs b/IRP/src/Reports/R6020_BatchBalance/Templates/MainDataCompositionSchema/Template.dcs index 7a70708ef3..e39074e111 100644 --- a/IRP/src/Reports/R6020_BatchBalance/Templates/MainDataCompositionSchema/Template.dcs +++ b/IRP/src/Reports/R6020_BatchBalance/Templates/MainDataCompositionSchema/Template.dcs @@ -3386,7 +3386,7 @@ DataSource1 - SELECT + SELECT ALLOWED R6020B_BatchBalanceBalanceAndTurnovers.Company, R6020B_BatchBalanceBalanceAndTurnovers.Store, R6020B_BatchBalanceBalanceAndTurnovers.ItemKey, @@ -3398,68 +3398,68 @@ R6020B_BatchBalanceBalanceAndTurnovers.Partner, R6020B_BatchBalanceBalanceAndTurnovers.Agreement, R6020B_BatchBalanceBalanceAndTurnovers.LegalName, - // Quantity - R6020B_BatchBalanceBalanceAndTurnovers.QuantityOpeningBalance, +// Quantity + R6020B_BatchBalanceBalanceAndTurnovers.QuantityOpeningBalance, R6020B_BatchBalanceBalanceAndTurnovers.QuantityReceipt, R6020B_BatchBalanceBalanceAndTurnovers.QuantityExpense, R6020B_BatchBalanceBalanceAndTurnovers.QuantityClosingBalance, - // InvoiceAmount - R6020B_BatchBalanceBalanceAndTurnovers.InvoiceAmountOpeningBalance, +// InvoiceAmount + R6020B_BatchBalanceBalanceAndTurnovers.InvoiceAmountOpeningBalance, R6020B_BatchBalanceBalanceAndTurnovers.InvoiceAmountReceipt, R6020B_BatchBalanceBalanceAndTurnovers.InvoiceAmountExpense, R6020B_BatchBalanceBalanceAndTurnovers.InvoiceAmountClosingBalance, - // InvoiceTaxAmount - R6020B_BatchBalanceBalanceAndTurnovers.InvoiceTaxAmountOpeningBalance, +// InvoiceTaxAmount + R6020B_BatchBalanceBalanceAndTurnovers.InvoiceTaxAmountOpeningBalance, R6020B_BatchBalanceBalanceAndTurnovers.InvoiceTaxAmountReceipt, R6020B_BatchBalanceBalanceAndTurnovers.InvoiceTaxAmountExpense, R6020B_BatchBalanceBalanceAndTurnovers.InvoiceTaxAmountClosingBalance, - // IndirectCostAmount - R6020B_BatchBalanceBalanceAndTurnovers.IndirectCostAmountOpeningBalance, +// IndirectCostAmount + R6020B_BatchBalanceBalanceAndTurnovers.IndirectCostAmountOpeningBalance, R6020B_BatchBalanceBalanceAndTurnovers.IndirectCostAmountReceipt, R6020B_BatchBalanceBalanceAndTurnovers.IndirectCostAmountExpense, R6020B_BatchBalanceBalanceAndTurnovers.IndirectCostAmountClosingBalance, - // IndirectCostTaxAmount - R6020B_BatchBalanceBalanceAndTurnovers.IndirectCostTaxAmountOpeningBalance, +// IndirectCostTaxAmount + R6020B_BatchBalanceBalanceAndTurnovers.IndirectCostTaxAmountOpeningBalance, R6020B_BatchBalanceBalanceAndTurnovers.IndirectCostTaxAmountReceipt, R6020B_BatchBalanceBalanceAndTurnovers.IndirectCostTaxAmountExpense, R6020B_BatchBalanceBalanceAndTurnovers.IndirectCostTaxAmountClosingBalance, - // ExtraCostAmountByRatio - R6020B_BatchBalanceBalanceAndTurnovers.ExtraCostAmountByRatioOpeningBalance, +// ExtraCostAmountByRatio + R6020B_BatchBalanceBalanceAndTurnovers.ExtraCostAmountByRatioOpeningBalance, R6020B_BatchBalanceBalanceAndTurnovers.ExtraCostAmountByRatioReceipt, R6020B_BatchBalanceBalanceAndTurnovers.ExtraCostAmountByRatioExpense, R6020B_BatchBalanceBalanceAndTurnovers.ExtraCostAmountByRatioClosingBalance, - // ExtraCostTaxAmountByRatio - R6020B_BatchBalanceBalanceAndTurnovers.ExtraCostTaxAmountByRatioOpeningBalance, +// ExtraCostTaxAmountByRatio + R6020B_BatchBalanceBalanceAndTurnovers.ExtraCostTaxAmountByRatioOpeningBalance, R6020B_BatchBalanceBalanceAndTurnovers.ExtraCostTaxAmountByRatioReceipt, R6020B_BatchBalanceBalanceAndTurnovers.ExtraCostTaxAmountByRatioExpense, R6020B_BatchBalanceBalanceAndTurnovers.ExtraCostTaxAmountByRatioClosingBalance, - // ExtraDirectCostAmount - R6020B_BatchBalanceBalanceAndTurnovers.ExtraDirectCostAmountOpeningBalance, +// ExtraDirectCostAmount + R6020B_BatchBalanceBalanceAndTurnovers.ExtraDirectCostAmountOpeningBalance, R6020B_BatchBalanceBalanceAndTurnovers.ExtraDirectCostAmountReceipt, R6020B_BatchBalanceBalanceAndTurnovers.ExtraDirectCostAmountExpense, R6020B_BatchBalanceBalanceAndTurnovers.ExtraDirectCostAmountClosingBalance, - // ExtraDirectCostTaxAmount - R6020B_BatchBalanceBalanceAndTurnovers.ExtraDirectCostTaxAmountOpeningBalance, +// ExtraDirectCostTaxAmount + R6020B_BatchBalanceBalanceAndTurnovers.ExtraDirectCostTaxAmountOpeningBalance, R6020B_BatchBalanceBalanceAndTurnovers.ExtraDirectCostTaxAmountReceipt, R6020B_BatchBalanceBalanceAndTurnovers.ExtraDirectCostTaxAmountExpense, R6020B_BatchBalanceBalanceAndTurnovers.ExtraDirectCostTaxAmountClosingBalance, - // AllocatedCostAmount - R6020B_BatchBalanceBalanceAndTurnovers.AllocatedCostAmountOpeningBalance, +// AllocatedCostAmount + R6020B_BatchBalanceBalanceAndTurnovers.AllocatedCostAmountOpeningBalance, R6020B_BatchBalanceBalanceAndTurnovers.AllocatedCostAmountReceipt, R6020B_BatchBalanceBalanceAndTurnovers.AllocatedCostAmountExpense, R6020B_BatchBalanceBalanceAndTurnovers.AllocatedCostAmountClosingBalance, - // AllocatedCostTaxAmount - R6020B_BatchBalanceBalanceAndTurnovers.AllocatedCostTaxAmountOpeningBalance, +// AllocatedCostTaxAmount + R6020B_BatchBalanceBalanceAndTurnovers.AllocatedCostTaxAmountOpeningBalance, R6020B_BatchBalanceBalanceAndTurnovers.AllocatedCostTaxAmountReceipt, R6020B_BatchBalanceBalanceAndTurnovers.AllocatedCostTaxAmountExpense, R6020B_BatchBalanceBalanceAndTurnovers.AllocatedCostTaxAmountClosingBalance, - // AllocatedRevenueAmount - R6020B_BatchBalanceBalanceAndTurnovers.AllocatedRevenueAmountOpeningBalance, +// AllocatedRevenueAmount + R6020B_BatchBalanceBalanceAndTurnovers.AllocatedRevenueAmountOpeningBalance, R6020B_BatchBalanceBalanceAndTurnovers.AllocatedRevenueAmountReceipt, R6020B_BatchBalanceBalanceAndTurnovers.AllocatedRevenueAmountExpense, R6020B_BatchBalanceBalanceAndTurnovers.AllocatedRevenueAmountClosingBalance, - // AllocatedRevenueTaxAmount - R6020B_BatchBalanceBalanceAndTurnovers.AllocatedRevenueTaxAmountOpeningBalance, +// AllocatedRevenueTaxAmount + R6020B_BatchBalanceBalanceAndTurnovers.AllocatedRevenueTaxAmountOpeningBalance, R6020B_BatchBalanceBalanceAndTurnovers.AllocatedRevenueTaxAmountReceipt, R6020B_BatchBalanceBalanceAndTurnovers.AllocatedRevenueTaxAmountExpense, R6020B_BatchBalanceBalanceAndTurnovers.AllocatedRevenueTaxAmountClosingBalance, @@ -3627,7 +3627,7 @@ ORDER BY DataSource1 - SELECT + SELECT ALLOWED T6020S_BatchKeysInfo.Company AS Company, T6020S_BatchKeysInfo.Store AS Store, T6020S_BatchKeysInfo.ItemKey AS ItemKey, diff --git a/IRP/src/Reports/R6021_BatchBalanceSimple/Templates/MainDataCompositionSchema/Template.dcs b/IRP/src/Reports/R6021_BatchBalanceSimple/Templates/MainDataCompositionSchema/Template.dcs index 0f198a05b9..22004ed913 100644 --- a/IRP/src/Reports/R6021_BatchBalanceSimple/Templates/MainDataCompositionSchema/Template.dcs +++ b/IRP/src/Reports/R6021_BatchBalanceSimple/Templates/MainDataCompositionSchema/Template.dcs @@ -1558,7 +1558,7 @@ DataSource1 - SELECT + SELECT ALLOWED R6020B_BatchBalanceBalanceAndTurnovers.Company, R6020B_BatchBalanceBalanceAndTurnovers.Store, R6020B_BatchBalanceBalanceAndTurnovers.ItemKey, diff --git a/IRP/src/Roles/AccumulationRegisters_R5041B_TaxesPayable/AccumulationRegisters_R5041B_TaxesPayable.mdo b/IRP/src/Roles/AccumulationRegisters_R5041B_TaxesPayable/AccumulationRegisters_R5041B_TaxesPayable.mdo deleted file mode 100644 index d16579271d..0000000000 --- a/IRP/src/Roles/AccumulationRegisters_R5041B_TaxesPayable/AccumulationRegisters_R5041B_TaxesPayable.mdo +++ /dev/null @@ -1,16 +0,0 @@ - - - AccumulationRegisters_R5041B_TaxesPayable - - en - AccumulationRegisters R5041B TaxesPayable - - - ru - РегистрыНакопления R5041B НалогиКУплате - - - tr - BirikimKayıtları R5041B ÖdenecekVergiler - - \ No newline at end of file diff --git a/IRP/src/Roles/AccumulationRegisters_R5041B_TaxesPayable/Rights.rights b/IRP/src/Roles/AccumulationRegisters_R5041B_TaxesPayable/Rights.rights deleted file mode 100644 index c638fd6f19..0000000000 --- a/IRP/src/Roles/AccumulationRegisters_R5041B_TaxesPayable/Rights.rights +++ /dev/null @@ -1,52 +0,0 @@ - - - false - true - false - - AccumulationRegister.R5041B_TaxesPayable - - Read - true - - #AccessRegisters("Company", "Branch", "", "", "", "") - - - - View - true - - - - AccessRegisters(D1, D2, D3, D4, D5, CompareRule) - -#If Not &UseObjectAccess #Then - // Access restiction not using. Set UseObjectAccess functional option TRUE - WHERE TRUE - -#ElseIf "#D1" = "" AND "#D2" = "" AND "#D3" = "" AND "#D4" = "" AND "#D5" = "" AND "#CompareRule" = "" #Then - WHERE TRUE -#Else -Table -WHERE TRUE IN -( - SELECT TOP 1 - TRUE - FROM - InformationRegister.T9101A_ObjectAccessRegisters AS OAR - WHERE OAR.AccessGroup IN (&CurrentUserAccessGroupList) - AND #CurrentTableName = OAR.TableName - - #If "#CompareRule" = "" #Then - #If Not "#D1" = "" #Then AND (OAR.DoNotControl1 OR OAR.Value1 = Table.#D1) #EndIf - #If Not "#D2" = "" #Then AND (OAR.DoNotControl2 OR OAR.Value2 = Table.#D2) #EndIf - #If Not "#D3" = "" #Then AND (OAR.DoNotControl3 OR OAR.Value3 = Table.#D3) #EndIf - #If Not "#D4" = "" #Then AND (OAR.DoNotControl4 OR OAR.Value4 = Table.#D4) #EndIf - #If Not "#D5" = "" #Then AND (OAR.DoNotControl5 OR OAR.Value5 = Table.#D5) #EndIf - #Else - AND (#CompareRule) - #EndIf -) -#EndIf - - diff --git a/IRP/src/Roles/AttachedFilesDelete/AttachedFilesDelete.mdo b/IRP/src/Roles/AttachedFilesDelete/AttachedFilesDelete.mdo new file mode 100644 index 0000000000..a77302fdd8 --- /dev/null +++ b/IRP/src/Roles/AttachedFilesDelete/AttachedFilesDelete.mdo @@ -0,0 +1,16 @@ + + + AttachedFilesDelete + + en + Attached files delete + + + ru + Удаление прикрепленных файлов + + + tr + Attached files delete + + \ No newline at end of file diff --git a/IRP/src/Roles/AttachedFilesDelete/Rights.rights b/IRP/src/Roles/AttachedFilesDelete/Rights.rights new file mode 100644 index 0000000000..0752ac5064 --- /dev/null +++ b/IRP/src/Roles/AttachedFilesDelete/Rights.rights @@ -0,0 +1,25 @@ + + + false + true + false + + InformationRegister.AttachedFiles + + Read + true + + + Update + true + + + View + true + + + Edit + true + + + diff --git a/IRP/src/Roles/Document_TaxesOperation/Document_TaxesOperation.mdo b/IRP/src/Roles/Document_TaxesOperation/Document_TaxesOperation.mdo new file mode 100644 index 0000000000..78e1824e30 --- /dev/null +++ b/IRP/src/Roles/Document_TaxesOperation/Document_TaxesOperation.mdo @@ -0,0 +1,16 @@ + + + Document_TaxesOperation + + en + Document "Taxes operation" + + + ru + Документ "Операции с налогами" + + + tr + Document "Taxes operation" + + \ No newline at end of file diff --git a/IRP/src/Roles/Document_TaxesOperation/Rights.rights b/IRP/src/Roles/Document_TaxesOperation/Rights.rights new file mode 100644 index 0000000000..63d64dbe02 --- /dev/null +++ b/IRP/src/Roles/Document_TaxesOperation/Rights.rights @@ -0,0 +1,147 @@ + + + false + true + false + + Document.TaxesOperation + + SwitchToDataHistoryVersion + true + + + View + true + + + InteractiveInsert + true + + + Read + true + + #CheckDocumentAccess() + + + + Edit + true + + + UndoPosting + true + + + Posting + true + + + InteractiveChangeOfPosted + true + + + InteractivePostingRegular + true + + + InteractiveClearDeletionMark + true + + + UpdateDataHistoryOfMissingData + true + + + EditDataHistoryVersionComment + true + + + InteractivePosting + true + + + InteractiveUndoPosting + true + + + InputByString + true + + + UpdateDataHistorySettings + true + + + ViewDataHistory + true + + + ReadDataHistoryOfMissingData + true + + + UpdateDataHistory + true + + + UpdateDataHistoryVersionComment + true + + + InteractiveSetDeletionMark + true + + + Update + true + + #CheckDocumentAccess() + + + + Insert + true + + #CheckDocumentAccess() + + + + ReadDataHistory + true + + + + CheckDocumentAccess + +#If Not &UseObjectAccess #Then + // Access restiction not using. Set UseObjectAccess functional option TRUE + WHERE TRUE +#Else +Table +WHERE NOT (FALSE) IN ( + SELECT + MIN((ObjectAccessKeysFilterDataList.Key = "" OR NOT AG.Key IS NULL)) + + FROM InformationRegister.T9100A_ObjectAccessMap AS T9100A_ObjectAccessMap + LEFT JOIN Catalog.ObjectAccessKeys.FilterDataList AS ObjectAccessKeysFilterDataList + LEFT JOIN Catalog.AccessGroups.ObjectAccess AS AG + ON AG.Ref IN (&CurrentUserAccessGroupList) + AND NOT AG.Ref.OnlyRegisters + AND AG.Key = ObjectAccessKeysFilterDataList.Key + AND (AG.ValueRef = ObjectAccessKeysFilterDataList.ValueRef1 + OR AG.ValueRef = ObjectAccessKeysFilterDataList.ValueRef2 + OR AG.ValueRef = ObjectAccessKeysFilterDataList.ValueRef3 + OR AG.ValueRef = ObjectAccessKeysFilterDataList.ValueRef4 + OR AG.ValueRef = ObjectAccessKeysFilterDataList.ValueRef5 + OR AG.DoNotControl) + #If #CurrentAccessRightName = "Insert" OR #CurrentAccessRightName = "Update" #Then + AND (AG.Modify) + #EndIf + ON ObjectAccessKeysFilterDataList.Ref = T9100A_ObjectAccessMap.ObjectAccessKeys + + WHERE + T9100A_ObjectAccessMap.ObjectRef = Table.Ref +)#EndIf + + diff --git a/IRP/src/Roles/FilterForUserSettings/Rights.rights b/IRP/src/Roles/FilterForUserSettings/Rights.rights index 56797a7bd3..f9eb128007 100644 --- a/IRP/src/Roles/FilterForUserSettings/Rights.rights +++ b/IRP/src/Roles/FilterForUserSettings/Rights.rights @@ -2461,4 +2461,50 @@ true + + Document.TaxesOperation + + Read + true + + + View + true + + + + Document.TaxesOperation.Attribute.Company + + View + true + + + + Document.TaxesOperation.Attribute.Partner + + View + true + + + + Document.TaxesOperation.Attribute.LegalName + + View + true + + + + Document.TaxesOperation.Attribute.Agreement + + View + true + + + + Document.TaxesOperation.Attribute.LegalNameContract + + View + true + + diff --git a/IRP/src/Roles/FullAccessOnlyRead/Rights.rights b/IRP/src/Roles/FullAccessOnlyRead/Rights.rights index e1723df413..91ea833cd1 100644 --- a/IRP/src/Roles/FullAccessOnlyRead/Rights.rights +++ b/IRP/src/Roles/FullAccessOnlyRead/Rights.rights @@ -11342,17 +11342,6 @@ false - - AccumulationRegister.R5041B_TaxesPayable - - Read - true - - - View - true - - InformationRegister.T6010S_BatchesInfo.Dimension.Document diff --git a/IRP/src/Roles/TemplateAccumulationRegisters/Rights.rights b/IRP/src/Roles/TemplateAccumulationRegisters/Rights.rights index eb9bf47d2c..b53a805a84 100644 --- a/IRP/src/Roles/TemplateAccumulationRegisters/Rights.rights +++ b/IRP/src/Roles/TemplateAccumulationRegisters/Rights.rights @@ -381,6 +381,20 @@ false + + AccumulationRegister.R9541T_VacationUsage + + Read + true + + #AccessRegisters("Company", "", "", "", "", "") + + + + View + true + + AccumulationRegister.R2050T_RetailSales.Dimension.SalesPerson @@ -1465,20 +1479,6 @@ false - - AccumulationRegister.R5041B_TaxesPayable - - Read - true - - #AccessRegisters("Company", "", "", "", "", "") - - - - View - true - - AccumulationRegister.R2040B_TaxesIncoming diff --git a/IRP/src/Roles/TemplateDocument/Rights.rights b/IRP/src/Roles/TemplateDocument/Rights.rights index cedb7909d6..4b79367d72 100644 --- a/IRP/src/Roles/TemplateDocument/Rights.rights +++ b/IRP/src/Roles/TemplateDocument/Rights.rights @@ -1456,6 +1456,114 @@ true + + Document.CalculationDeservedVacations + + Read + true + + #CheckDocumentAccess() + + + + Insert + true + + #CheckDocumentAccess() + + + + Update + true + + #CheckDocumentAccess() + + + + Posting + true + + + UndoPosting + true + + + View + true + + + InteractiveInsert + true + + + Edit + true + + + InteractiveSetDeletionMark + true + + + InteractiveClearDeletionMark + true + + + InteractivePosting + true + + + InteractivePostingRegular + true + + + InteractiveUndoPosting + true + + + InteractiveChangeOfPosted + true + + + InputByString + true + + + ReadDataHistory + true + + + ReadDataHistoryOfMissingData + true + + + UpdateDataHistory + true + + + UpdateDataHistoryOfMissingData + true + + + UpdateDataHistorySettings + true + + + UpdateDataHistoryVersionComment + true + + + ViewDataHistory + true + + + EditDataHistoryVersionComment + true + + + SwitchToDataHistoryVersion + true + + Document.CashReceipt.Command.PrintCashIn @@ -1686,6 +1794,114 @@ true + + Document.ExpenseAccruals + + Read + true + + #CheckDocumentAccess() + + + + Insert + true + + #CheckDocumentAccess() + + + + Update + true + + #CheckDocumentAccess() + + + + Posting + true + + + UndoPosting + true + + + View + true + + + InteractiveInsert + true + + + Edit + true + + + InteractiveSetDeletionMark + true + + + InteractiveClearDeletionMark + true + + + InteractivePosting + true + + + InteractivePostingRegular + true + + + InteractiveUndoPosting + true + + + InteractiveChangeOfPosted + true + + + InputByString + true + + + ReadDataHistory + true + + + ReadDataHistoryOfMissingData + true + + + UpdateDataHistory + true + + + UpdateDataHistoryOfMissingData + true + + + UpdateDataHistorySettings + true + + + UpdateDataHistoryVersionComment + true + + + ViewDataHistory + true + + + EditDataHistoryVersionComment + true + + + SwitchToDataHistoryVersion + true + + Document.SalesReturn @@ -2923,6 +3139,114 @@ true + + Document.TaxesOperation + + Read + true + + #CheckDocumentAccess() + + + + Insert + true + + #CheckDocumentAccess() + + + + Update + true + + #CheckDocumentAccess() + + + + Posting + true + + + UndoPosting + true + + + View + true + + + InteractiveInsert + true + + + Edit + true + + + InteractiveSetDeletionMark + true + + + InteractiveClearDeletionMark + true + + + InteractivePosting + true + + + InteractivePostingRegular + true + + + InteractiveUndoPosting + true + + + InteractiveChangeOfPosted + true + + + InputByString + true + + + ReadDataHistory + true + + + ReadDataHistoryOfMissingData + true + + + UpdateDataHistory + true + + + UpdateDataHistoryOfMissingData + true + + + UpdateDataHistorySettings + true + + + UpdateDataHistoryVersionComment + true + + + ViewDataHistory + true + + + EditDataHistoryVersionComment + true + + + SwitchToDataHistoryVersion + true + + Document.EmployeeTransfer @@ -5593,7 +5917,115 @@ - Document.ProductionPlanningClosing + Document.ProductionPlanningClosing + + Read + true + + #CheckDocumentAccess() + + + + Insert + true + + #CheckDocumentAccess() + + + + Update + true + + #CheckDocumentAccess() + + + + Posting + true + + + UndoPosting + true + + + View + true + + + InteractiveInsert + true + + + Edit + true + + + InteractiveSetDeletionMark + true + + + InteractiveClearDeletionMark + true + + + InteractivePosting + true + + + InteractivePostingRegular + true + + + InteractiveUndoPosting + true + + + InteractiveChangeOfPosted + true + + + InputByString + true + + + ReadDataHistory + true + + + ReadDataHistoryOfMissingData + true + + + UpdateDataHistory + true + + + UpdateDataHistoryOfMissingData + true + + + UpdateDataHistorySettings + true + + + UpdateDataHistoryVersionComment + true + + + ViewDataHistory + true + + + EditDataHistoryVersionComment + true + + + SwitchToDataHistoryVersion + true + + + + Document.Bundling Read true @@ -5701,7 +6133,14 @@ - Document.Bundling + Document.SalesOrderClosing.Command.Generate + + View + true + + + + Document.PurchaseOrderClosing Read true @@ -5809,14 +6248,7 @@ - Document.SalesOrderClosing.Command.Generate - - View - true - - - - Document.PurchaseOrderClosing + Document.ModernizationOfFixedAsset Read true @@ -5924,7 +6356,14 @@ - Document.ModernizationOfFixedAsset + Document.StockAdjustmentAsWriteOff.Command.Generate + + View + true + + + + Document.OutgoingPaymentOrder Read true @@ -6032,14 +6471,7 @@ - Document.StockAdjustmentAsWriteOff.Command.Generate - - View - true - - - - Document.OutgoingPaymentOrder + Document.SalesOrderClosing Read true @@ -6147,7 +6579,7 @@ - Document.SalesOrderClosing + Document.RevenueAccruals Read true @@ -9520,222 +9952,6 @@ true - - Document.ExpenseAccruals - - Insert - true - - #CheckDocumentAccess() - - - - UpdateDataHistory - true - - - ReadDataHistoryOfMissingData - true - - - InteractiveUndoPosting - true - - - View - true - - - EditDataHistoryVersionComment - true - - - InteractiveClearDeletionMark - true - - - ViewDataHistory - true - - - InteractiveChangeOfPosted - true - - - InteractivePostingRegular - true - - - SwitchToDataHistoryVersion - true - - - InteractivePosting - true - - - InputByString - true - - - Posting - true - - - UndoPosting - true - - - UpdateDataHistoryOfMissingData - true - - - Update - true - - #CheckDocumentAccess() - - - - InteractiveSetDeletionMark - true - - - ReadDataHistory - true - - - UpdateDataHistorySettings - true - - - UpdateDataHistoryVersionComment - true - - - Edit - true - - - InteractiveInsert - true - - - Read - true - - #CheckDocumentAccess() - - - - - Document.RevenueAccruals - - Insert - true - - #CheckDocumentAccess() - - - - UpdateDataHistory - true - - - ReadDataHistoryOfMissingData - true - - - InteractiveUndoPosting - true - - - View - true - - - EditDataHistoryVersionComment - true - - - InteractiveClearDeletionMark - true - - - ViewDataHistory - true - - - InteractiveChangeOfPosted - true - - - InteractivePostingRegular - true - - - SwitchToDataHistoryVersion - true - - - InteractivePosting - true - - - InputByString - true - - - Posting - true - - - UndoPosting - true - - - UpdateDataHistoryOfMissingData - true - - - Update - true - - #CheckDocumentAccess() - - - - InteractiveSetDeletionMark - true - - - ReadDataHistory - true - - - UpdateDataHistorySettings - true - - - UpdateDataHistoryVersionComment - true - - - Edit - true - - - InteractiveInsert - true - - - Read - true - - #CheckDocumentAccess() - - - CheckDocumentAccess diff --git a/IRP/src/Roles/TemplateInformationRegisters/Rights.rights b/IRP/src/Roles/TemplateInformationRegisters/Rights.rights index a9b3244aaa..6b570ca547 100644 --- a/IRP/src/Roles/TemplateInformationRegisters/Rights.rights +++ b/IRP/src/Roles/TemplateInformationRegisters/Rights.rights @@ -1528,6 +1528,17 @@ + + InformationRegister.T9545S_VacationDaysLimits + + Read + true + + + View + true + + AccessRegisters(D1, D2, D3, D4, D5, CompareRule) diff --git a/IRP/src/Subsystems/Salary/Salary.mdo b/IRP/src/Subsystems/Salary/Salary.mdo index a23a4d5529..da7112d7e6 100644 --- a/IRP/src/Subsystems/Salary/Salary.mdo +++ b/IRP/src/Subsystems/Salary/Salary.mdo @@ -23,6 +23,8 @@ CommonCommand.OpenPartnersEmployee Document.AdditionalAccrual Document.AdditionalDeduction + AccumulationRegister.R9541T_VacationUsage + Document.CalculationDeservedVacations Settings Catalogs PersonnelRecords diff --git a/IRP/src/Subsystems/Salary/Subsystems/Settings/Settings.mdo b/IRP/src/Subsystems/Salary/Subsystems/Settings/Settings.mdo index 80dbe2a1c8..d444eb64a0 100644 --- a/IRP/src/Subsystems/Salary/Subsystems/Settings/Settings.mdo +++ b/IRP/src/Subsystems/Salary/Subsystems/Settings/Settings.mdo @@ -18,5 +18,6 @@ InformationRegister.T9500S_AccrualAndDeductionValues InformationRegister.T9510S_Staffing InformationRegister.T9530S_WorkDays + InformationRegister.T9545S_VacationDaysLimits Subsystem.Salary \ No newline at end of file diff --git a/IRP/src/Subsystems/Treasury/Subsystems/CashTransactions/CashTransactions.mdo b/IRP/src/Subsystems/Treasury/Subsystems/CashTransactions/CashTransactions.mdo index 80a90ce211..9cabde9f85 100644 --- a/IRP/src/Subsystems/Treasury/Subsystems/CashTransactions/CashTransactions.mdo +++ b/IRP/src/Subsystems/Treasury/Subsystems/CashTransactions/CashTransactions.mdo @@ -25,5 +25,6 @@ Document.EmployeeCashAdvance Document.ForeignCurrencyRevaluation Document.DebitCreditNote + Document.TaxesOperation Subsystem.Treasury \ No newline at end of file diff --git a/Unit/src/CommonModules/Unit_AddAttributeAndPropertySets/Module.bsl b/Unit/src/CommonModules/Unit_AddAttributeAndPropertySets/Module.bsl index 69a3a45290..a5d13f1b49 100644 --- a/Unit/src/CommonModules/Unit_AddAttributeAndPropertySets/Module.bsl +++ b/Unit/src/CommonModules/Unit_AddAttributeAndPropertySets/Module.bsl @@ -81,6 +81,7 @@ Function GetExclude_AddAttributes() ArrayOfExcluded.Add("Document.WorkOrderClosing"); ArrayOfExcluded.Add("Document.ForeignCurrencyRevaluation"); ArrayOfExcluded.Add("Document.DepreciationCalculation"); + ArrayOfExcluded.Add("Document.CalculationDeservedVacations"); Return ArrayOfExcluded; EndFunction @@ -125,6 +126,7 @@ Function GetExclude_Properties() ArrayOfExcluded.Add("Document.WorkOrderClosing"); ArrayOfExcluded.Add("Document.ForeignCurrencyRevaluation"); ArrayOfExcluded.Add("Document.DepreciationCalculation"); + ArrayOfExcluded.Add("Document.CalculationDeservedVacations"); Return ArrayOfExcluded; EndFunction diff --git a/Unit/src/CommonModules/Unit_DocumentRegistration/Module.bsl b/Unit/src/CommonModules/Unit_DocumentRegistration/Module.bsl index a56445de50..8707c4342e 100644 --- a/Unit/src/CommonModules/Unit_DocumentRegistration/Module.bsl +++ b/Unit/src/CommonModules/Unit_DocumentRegistration/Module.bsl @@ -165,10 +165,15 @@ Function GetIgnored_Fields() // technical dimensions Array.Add("*.*.CurrencyMovementType"); Array.Add("*.*.TransactionCurrency"); + Array.Add("*.*.RevaluatedCurrency"); Array.Add("*.T2014S_AdvancesInfo.Key"); Array.Add("*.T2014S_AdvancesInfo.UniqueID"); Array.Add("*.T2015S_TransactionsInfo.UniqueID"); Array.Add("*.T3010S_RowIDInfo.UniqueID"); + Array.Add("*.T1040T_AccountingAmounts.DrCurrency"); + Array.Add("*.T1040T_AccountingAmounts.CrCurrency"); + Array.Add("*.T1040T_AccountingAmounts.DrCurrencyAmount"); + Array.Add("*.T1040T_AccountingAmounts.CrCurrencyAmount"); // technical registers Array.Add("*.T6020S_BatchKeysInfo.*"); @@ -252,7 +257,6 @@ Function GetIgnored_Fields() Array.Add("ShipmentConfirmation.R4032B_GoodsInTransitOutgoing.*"); Array.Add("ShipmentConfirmation.R4034B_GoodsShipmentSchedule.*"); - //Array.Add("CommissioningOfFixedAsset.R4011B_FreeStocks.*"); Array.Add("CommissioningOfFixedAsset.R4014B_SerialLotNumber.Store"); Array.Add("DecommissioningOfFixedAsset.R4011B_FreeStocks.*"); @@ -390,36 +394,15 @@ Function GetIgnored_Fields() Array.Add("ChequeBondTransactionItem.R2020B_AdvancesFromCustomers.Project"); Array.Add("ChequeBondTransactionItem.R2021B_CustomersTransactions.Project"); - //Array.Add("CreditNote.R1020B_AdvancesToVendors.Order"); - //Array.Add("CreditNote.R1021B_VendorsTransactions.Order"); - //Array.Add("CreditNote.R2020B_AdvancesFromCustomers.Order"); - //Array.Add("CreditNote.R2021B_CustomersTransactions.Order"); - //Array.Add("CreditNote.T2014S_AdvancesInfo.Order"); - //Array.Add("CreditNote.T2014S_AdvancesInfo.IsVendorAdvance"); - //Array.Add("CreditNote.T2015S_TransactionsInfo.Order"); - //Array.Add("CreditNote.T2015S_TransactionsInfo.IsCustomerTransaction"); - //Array.Add("CreditNote.R5015B_OtherPartnersTransactions.Basis"); - - //Array.Add("DebitNote.R1020B_AdvancesToVendors.Order"); - //Array.Add("DebitNote.R2020B_AdvancesFromCustomers.Order"); - //Array.Add("DebitNote.R2021B_CustomersTransactions.Order"); - //Array.Add("DebitNote.T2014S_AdvancesInfo.Order"); - //Array.Add("DebitNote.T2014S_AdvancesInfo.IsCustomerAdvance"); - //Array.Add("DebitNote.T2015S_TransactionsInfo.Order"); - //Array.Add("DebitNote.T2015S_TransactionsInfo.IsVendorTransaction"); - //Array.Add("DebitNote.R5015B_OtherPartnersTransactions.Basis"); - Array.Add("DebitCreditNote.R1020B_AdvancesToVendors.Order"); Array.Add("DebitCreditNote.R2020B_AdvancesFromCustomers.Order"); Array.Add("DebitCreditNote.T2015S_TransactionsInfo.Key"); - Array.Add("PurchaseInvoice.R1040B_TaxesOutgoing.TaxMovementType"); Array.Add("PurchaseInvoice.T2015S_TransactionsInfo.Key"); Array.Add("PurchaseInvoice.T2015S_TransactionsInfo.IsCustomerTransaction"); Array.Add("PurchaseOrderClosing.T2014S_AdvancesInfo.IsCustomerAdvance"); - Array.Add("PurchaseReturn.R1040B_TaxesOutgoing.TaxMovementType"); Array.Add("PurchaseReturn.R1021B_VendorsTransactions.Order"); Array.Add("PurchaseReturn.T2015S_TransactionsInfo.Order"); Array.Add("PurchaseReturn.T2015S_TransactionsInfo.Key"); @@ -442,7 +425,6 @@ Function GetIgnored_Fields() Array.Add("RetailSalesReceipt.T2015S_TransactionsInfo.Project"); Array.Add("RetailReturnReceipt.R5015B_OtherPartnersTransactions.Basis"); - Array.Add("SalesInvoice.R2040B_TaxesIncoming.TaxMovementType"); Array.Add("SalesInvoice.T2015S_TransactionsInfo.Key"); Array.Add("SalesInvoice.T2015S_TransactionsInfo.IsVendorTransaction"); @@ -450,7 +432,6 @@ Function GetIgnored_Fields() Array.Add("SalesOrderClosing.T2014S_AdvancesInfo.IsVendorAdvance"); Array.Add("SalesReportFromTradeAgent.R2001T_Sales.SalesPerson"); - Array.Add("SalesReportFromTradeAgent.R2040B_TaxesIncoming.TaxMovementType"); Array.Add("SalesReportFromTradeAgent.T2015S_TransactionsInfo.Key"); Array.Add("SalesReportFromTradeAgent.T2015S_TransactionsInfo.IsVendorTransaction"); @@ -459,12 +440,10 @@ Function GetIgnored_Fields() Array.Add("WorkSheet.R5022T_Expenses.AdditionalAnalytic"); Array.Add("SalesReturn.R2021B_CustomersTransactions.Order"); - Array.Add("SalesReturn.R2040B_TaxesIncoming.TaxMovementType"); Array.Add("SalesReturn.T2015S_TransactionsInfo.Order"); Array.Add("SalesReturn.T2015S_TransactionsInfo.Key"); Array.Add("SalesReturn.T2015S_TransactionsInfo.IsVendorTransaction"); - Array.Add("SalesReportToConsignor.R1040B_TaxesOutgoing.TaxMovementType"); Array.Add("SalesReportToConsignor.T2015S_TransactionsInfo.Key"); Array.Add("SalesReportToConsignor.T2015S_TransactionsInfo.IsCustomerTransaction"); @@ -669,7 +648,6 @@ Function GetIgnored_Fields() Array.Add("OpeningEntry.T2014S_AdvancesInfo.Order"); Array.Add("OpeningEntry.T2014S_AdvancesInfo.IsPurchaseOrderClose"); Array.Add("OpeningEntry.T2014S_AdvancesInfo.IsSalesOrderClose"); - //Array.Add("OpeningEntry.T2014S_AdvancesInfo.RecordType"); Array.Add("OpeningEntry.T2015S_TransactionsInfo.Order"); Array.Add("OpeningEntry.T2015S_TransactionsInfo.IsPaid"); Array.Add("OpeningEntry.R5015B_OtherPartnersTransactions.Basis"); diff --git a/Unit/src/Configuration/Configuration.mdo b/Unit/src/Configuration/Configuration.mdo index 688864abd4..213175231b 100644 --- a/Unit/src/Configuration/Configuration.mdo +++ b/Unit/src/Configuration/Configuration.mdo @@ -120,6 +120,7 @@ Document.BatchReallocateIncoming Document.BatchReallocateOutgoing Document.Bundling + Document.CalculationDeservedVacations Document.CalculationMovementCosts Document.CashExpense Document.CashPayment diff --git a/Unit/src/Documents/CalculationDeservedVacations/CalculationDeservedVacations.mdo b/Unit/src/Documents/CalculationDeservedVacations/CalculationDeservedVacations.mdo new file mode 100644 index 0000000000..317238f5de --- /dev/null +++ b/Unit/src/Documents/CalculationDeservedVacations/CalculationDeservedVacations.mdo @@ -0,0 +1,16 @@ + + + + + + + + + + CalculationDeservedVacations + Adopted + + Checked + + true + diff --git a/Unit/src/Reports/D0009_DocumentRegistrationsReport/D0009_DocumentRegistrationsReport.mdo b/Unit/src/Reports/D0009_DocumentRegistrationsReport/D0009_DocumentRegistrationsReport.mdo index c3ebd7a7d3..76a19fe268 100644 --- a/Unit/src/Reports/D0009_DocumentRegistrationsReport/D0009_DocumentRegistrationsReport.mdo +++ b/Unit/src/Reports/D0009_DocumentRegistrationsReport/D0009_DocumentRegistrationsReport.mdo @@ -120,6 +120,7 @@ DocumentRef.WorkOrder DocumentRef.WorkOrderClosing DocumentRef.WorkSheet + DocumentRef.CalculationDeservedVacations Auto diff --git a/features/External/ImportData.feature b/features/External/ImportData.feature index df6ba42923..61b5cffde6 100644 --- a/features/External/ImportData.feature +++ b/features/External/ImportData.feature @@ -484,6 +484,11 @@ Scenario: Create catalog Partners objects (Employee for salary) | 'e1cib/data/Catalog.Partners?ref=b7b18e1cb2a9e83611ee92afd0d50032' | 'False' | '' | 'False' | 'False' | 'True' | 'False' | 'Employee 8 (several vacation + several sick leave)' | | 'e1cib/data/Catalog.Partners?ref=b7b18e1cb2a9e83611ee92afd0d50033' | 'False' | '' | 'False' | 'False' | 'True' | 'False' | 'Employee 9 (hours shedule + several sick leave)' | +Scenario: Create information register T9545S_VacationDaysLimits records + + And I check or create information register "T9545S_VacationDaysLimits" records: + | 'Period' | 'Company' | 'Employee' | 'DayLimit' | 'Document' | + | '01.01.2022 00:00:00' | '' | '' | 24 | '' | Scenario: Create catalog BankTerms objects (for Shop 02) @@ -1572,6 +1577,7 @@ Scenario: Create catalog Taxes objects | 'e1cib/data/Catalog.Taxes?ref=aa78120ed92fbced11eaf116b32709c4' | 'SalesReportToConsignor' | | 'e1cib/data/Catalog.Taxes?ref=aa78120ed92fbced11eaf116b32709c4' | 'SalesReportFromTradeAgent' | | 'e1cib/data/Catalog.Taxes?ref=aa78120ed92fbced11eaf116b32709c4' | 'RetailReceiptCorrection' | + | 'e1cib/data/Catalog.Taxes?ref=aa78120ed92fbced11eaf116b32709c4' | 'StockAdjustmentAsSurplus' | Scenario: Create catalog Taxes objects (with transaction type) @@ -1654,6 +1660,29 @@ Scenario: Create catalog Taxes objects (for work order) | 'e1cib/data/Catalog.Taxes?ref=aa78120ed92fbced11eaf116b32709c4' | 'PurchaseOrderClosing' | | 'e1cib/data/Catalog.Taxes?ref=aa78120ed92fbced11eaf116b32709c4' | 'WorkOrder' | +Scenario: Create catalog Taxes objects (for debit and credit note) + + And I refill object tabular section "UseDocuments": + | 'Ref' | 'DocumentName' | + | 'e1cib/data/Catalog.Taxes?ref=aa78120ed92fbced11eaf116b32709c4' | 'SalesOrder' | + | 'e1cib/data/Catalog.Taxes?ref=aa78120ed92fbced11eaf116b32709c4' | 'SalesInvoice' | + | 'e1cib/data/Catalog.Taxes?ref=aa78120ed92fbced11eaf116b32709c4' | 'PurchaseOrder' | + | 'e1cib/data/Catalog.Taxes?ref=aa78120ed92fbced11eaf116b32709c4' | 'PurchaseInvoice' | + | 'e1cib/data/Catalog.Taxes?ref=aa78120ed92fbced11eaf116b32709c4' | 'CashExpense' | + | 'e1cib/data/Catalog.Taxes?ref=aa78120ed92fbced11eaf116b32709c4' | 'CashRevenue' | + | 'e1cib/data/Catalog.Taxes?ref=aa78120ed92fbced11eaf116b32709c4' | 'CashRevenue' | + | 'e1cib/data/Catalog.Taxes?ref=aa78120ed92fbced11eaf116b32709c4' | 'PurchaseReturn' | + | 'e1cib/data/Catalog.Taxes?ref=aa78120ed92fbced11eaf116b32709c4' | 'PurchaseReturnOrder' | + | 'e1cib/data/Catalog.Taxes?ref=aa78120ed92fbced11eaf116b32709c4' | 'SalesReturnOrder' | + | 'e1cib/data/Catalog.Taxes?ref=aa78120ed92fbced11eaf116b32709c4' | 'SalesReturn' | + | 'e1cib/data/Catalog.Taxes?ref=aa78120ed92fbced11eaf116b32709c4' | 'RetailSalesReceipt' | + | 'e1cib/data/Catalog.Taxes?ref=aa78120ed92fbced11eaf116b32709c4' | 'RetailReturnReceipt' | + | 'e1cib/data/Catalog.Taxes?ref=aa78120ed92fbced11eaf116b32709c4' | 'SalesOrderClosing' | + | 'e1cib/data/Catalog.Taxes?ref=aa78120ed92fbced11eaf116b32709c4' | 'PurchaseOrderClosing' | + | 'e1cib/data/Catalog.Taxes?ref=aa78120ed92fbced11eaf116b32709c4' | 'StockAdjustmentAsSurplus' | + | 'e1cib/data/Catalog.Taxes?ref=aa78120ed92fbced11eaf116b32709c4' | 'WorkOrder' | + | 'e1cib/data/Catalog.Taxes?ref=aa78120ed92fbced11eaf116b32709c4' | 'CreditNote' | + | 'e1cib/data/Catalog.Taxes?ref=aa78120ed92fbced11eaf116b32709c4' | 'DebitNote' | Scenario: Create catalog Taxes objects (for commission trade) @@ -2413,6 +2442,13 @@ Scenario: Create catalog Workstations objects (Test) | 'Ref' | 'DeletionMark' | 'Description' | 'CashAccount' | 'UniqueID' | | 'e1cib/data/Catalog.Workstations?ref=aa7d120ed92fbced11eb096728fa8eee' | 'False' | 'Test' | '' | '' | +Scenario: Create catalog AddAttributeAndProperty (boolean) + + And I check or create chart of characteristic types "AddAttributeAndProperty" objects: + | 'Ref' | 'DeletionMark' | 'Parent' | 'IsFolder' | 'Icon' | 'isIconSet' | 'isURL' | 'Description_en' | 'Description_hash' | 'Description_ru' | 'Description_tr' | 'UniqueID' | 'ValueType' | + | 'e1cib/data/ChartOfCharacteristicTypes.AddAttributeAndProperty?ref=b7a0d8de1a1c04c611ee1b0a09bcb8a8' | 'False' | '' | 'False' | 'ValueStorage:AQEIAAAAAAAAAO+7v3siVSJ9' | 'False' | 'False' | 'Add attribute (boolean)' | '' | '' | '' | '_e19e213c0a1647deb8835dab2a35089f' | 'xs:boolean' | + + Scenario: Create catalog AddAttributeAndProperty (hyperlink) And I check or create chart of characteristic types "AddAttributeAndProperty" objects: @@ -3287,12 +3323,12 @@ Scenario: test data for payroll calculation (position and salary change in the m // Document.EmployeeVacation And I check or create document "EmployeeVacation" objects: - | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'Author' | 'Branch' | 'Description' | - | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec61' | 'False' | 3 | '13.11.2023 11:11:00' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf128cde918b4' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | + | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'Author' | 'Branch' | 'Description' | 'UniqueID' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | 'ManualMovementsEdit' | + | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec61' | 'False' | 3 | '13.11.2023 11:11:00' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf128cde918b4' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '13.06.2024 11:44:51' | '13.06.2024 11:48:56' | 'False' | And I refill object tabular section "EmployeeList": - | 'Ref' | 'Employee' | 'BeginDate' | 'EndDate' | - | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec61' | 'e1cib/data/Catalog.Partners?ref=b7b18e1cb2a9e83611ee92afd0d5002b' | '13.11.2023 00:00:00' | '18.11.2023 00:00:00' | + | 'Ref' | 'Employee' | 'BeginDate' | 'EndDate' | 'PaidDays' | + | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec61' | 'e1cib/data/Catalog.Partners?ref=b7b18e1cb2a9e83611ee92afd0d5002b' | '13.11.2023 00:00:00' | '18.11.2023 00:00:00' | 4 | Scenario: test data for check of payroll calculation (work schedule change (days) + vacation + sick leave) @@ -3322,12 +3358,12 @@ Scenario: test data for check of payroll calculation (work schedule change (days // Document.EmployeeVacation And I check or create document "EmployeeVacation" objects: - | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'Author' | 'Branch' | 'Description' | - | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec67' | 'False' | 4 | '20.11.2023 11:57:45' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf128cde918b4' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | + | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'Author' | 'Branch' | 'Description' | 'UniqueID' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | 'ManualMovementsEdit' | + | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec67' | 'False' | 4 | '20.11.2023 11:57:45' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf128cde918b4' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '13.06.2024 11:50:20' | '13.06.2024 11:53:17' | 'False' | And I refill object tabular section "EmployeeList": - | 'Ref' | 'Employee' | 'BeginDate' | 'EndDate' | - | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec67' | 'e1cib/data/Catalog.Partners?ref=b7b18e1cb2a9e83611ee92afd0d5002c' | '23.11.2023 00:00:00' | '26.11.2023 00:00:00' | + | 'Ref' | 'Employee' | 'BeginDate' | 'EndDate' | 'PaidDays' | + | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec67' | 'e1cib/data/Catalog.Partners?ref=b7b18e1cb2a9e83611ee92afd0d5002c' | '23.11.2023 00:00:00' | '26.11.2023 00:00:00' | 4 | Scenario: test data for check of payroll calculation (vacation + truancy) @@ -3340,12 +3376,12 @@ Scenario: test data for check of payroll calculation (vacation + truancy) // Document.EmployeeVacation And I check or create document "EmployeeVacation" objects: - | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'Author' | 'Branch' | 'Description' | - | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec69' | 'False' | 5 | '09.11.2023 12:00:00' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf128cde918b4' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | + | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'Author' | 'Branch' | 'Description' | 'UniqueID' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | 'ManualMovementsEdit' | + | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec69' | 'False' | 5 | '09.11.2023 12:00:00' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf128cde918b4' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '13.06.2024 11:53:44' | '13.06.2024 11:55:42' | 'False' | And I refill object tabular section "EmployeeList": - | 'Ref' | 'Employee' | 'BeginDate' | 'EndDate' | - | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec69' | 'e1cib/data/Catalog.Partners?ref=b7b18e1cb2a9e83611ee92afd0d5002d' | '09.11.2023 00:00:00' | '10.11.2023 00:00:00' | + | 'Ref' | 'Employee' | 'BeginDate' | 'EndDate' | 'PaidDays' | + | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec69' | 'e1cib/data/Catalog.Partners?ref=b7b18e1cb2a9e83611ee92afd0d5002d' | '09.11.2023 00:00:00' | '10.11.2023 00:00:00' | 2 | Scenario: test data for check of payroll calculation (change of work schedule (from hours to days) + sick leave) @@ -3382,14 +3418,15 @@ Scenario: test data for check of payroll calculation (several vacations) // Document.EmployeeVacation And I check or create document "EmployeeVacation" objects: - | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'Author' | 'Branch' | 'Description' | - | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec6e' | 'False' | 6 | '09.11.2023 12:00:01' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf128cde918b4' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | - | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec6f' | 'False' | 7 | '15.11.2023 12:00:00' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf128cde918b4' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | + | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'Author' | 'Branch' | 'Description' | 'UniqueID' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | 'ManualMovementsEdit' | + | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec6e' | 'False' | 6 | '09.11.2023 12:00:01' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf128cde918b4' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '13.06.2024 11:56:05' | '13.06.2024 11:57:22' | 'False' | + | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec6f' | 'False' | 7 | '15.11.2023 12:00:00' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf128cde918b4' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '13.06.2024 11:56:05' | '13.06.2024 11:58:33' | 'False' | And I refill object tabular section "EmployeeList": - | 'Ref' | 'Employee' | 'BeginDate' | 'EndDate' | - | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec6e' | 'e1cib/data/Catalog.Partners?ref=b7b18e1cb2a9e83611ee92afd0d5002f' | '09.11.2023 00:00:00' | '10.11.2023 00:00:00' | - | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec6f' | 'e1cib/data/Catalog.Partners?ref=b7b18e1cb2a9e83611ee92afd0d5002f' | '15.11.2023 00:00:00' | '17.11.2023 00:00:00' | + | 'Ref' | 'Employee' | 'BeginDate' | 'EndDate' | 'PaidDays' | + | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec6e' | 'e1cib/data/Catalog.Partners?ref=b7b18e1cb2a9e83611ee92afd0d5002f' | '09.11.2023 00:00:00' | '10.11.2023 00:00:00' | 2 | + | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec6f' | 'e1cib/data/Catalog.Partners?ref=b7b18e1cb2a9e83611ee92afd0d5002f' | '15.11.2023 00:00:00' | '17.11.2023 00:00:00' | 2 | + Scenario: test data for check of payroll calculation (hours shedule + truancy) @@ -3435,14 +3472,14 @@ Scenario: test data for check of payroll calculation (several vacation and sick // Document.EmployeeVacation And I check or create document "EmployeeVacation" objects: - | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'Author' | 'Branch' | 'Description' | - | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec77' | 'False' | 8 | '05.12.2023 14:54:03' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf128cde918b4' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | - | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec78' | 'False' | 9 | '25.11.2023 12:00:00' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf128cde918b4' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | + | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'Author' | 'Branch' | 'Description' | 'UniqueID' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | 'ManualMovementsEdit' | + | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec77' | 'False' | 8 | '05.12.2023 14:54:03' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf128cde918b4' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '13.06.2024 11:59:08' | '13.06.2024 11:59:35' | 'False' | + | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec78' | 'False' | 9 | '25.11.2023 12:00:00' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf128cde918b4' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '13.06.2024 11:59:08' | '13.06.2024 12:00:15' | 'False' | And I refill object tabular section "EmployeeList": - | 'Ref' | 'Employee' | 'BeginDate' | 'EndDate' | - | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec77' | 'e1cib/data/Catalog.Partners?ref=b7b18e1cb2a9e83611ee92afd0d50032' | '21.11.2023 00:00:00' | '22.11.2023 00:00:00' | - | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec78' | 'e1cib/data/Catalog.Partners?ref=b7b18e1cb2a9e83611ee92afd0d50032' | '25.11.2023 00:00:00' | '29.11.2023 00:00:00' | + | 'Ref' | 'Employee' | 'BeginDate' | 'EndDate' | 'PaidDays' | + | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec77' | 'e1cib/data/Catalog.Partners?ref=b7b18e1cb2a9e83611ee92afd0d50032' | '21.11.2023 00:00:00' | '22.11.2023 00:00:00' | 2 | + | 'e1cib/data/Document.EmployeeVacation?ref=b7b18e1cb2a9e83611ee934dac9fec78' | 'e1cib/data/Catalog.Partners?ref=b7b18e1cb2a9e83611ee92afd0d50032' | '25.11.2023 00:00:00' | '29.11.2023 00:00:00' | 4 | Scenario: test data for check of payroll calculation (hours shedule + several sick leave) @@ -3477,7 +3514,7 @@ Scenario: Create catalog AccessGroups and AccessProfiles objects (audit lock) And I execute code and put to varible "GetURL(Catalogs.Users.FindByDescription(\"CI\"))" "$$$$IdCI$$$$" And I check or create catalog "AccessGroups" objects: | 'Ref' | 'DeletionMark' | 'Code' | 'OnlyRegisters' | 'Author' | 'Description_en' | 'Description_hash' | 'Description_ru' | 'Description_tr' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | 'NotActive' | - | 'e1cib/data/Catalog.AccessGroups?ref=b7b6cb8aa66608cf11eed54b0e7af6b7' | 'False' | 5 | 'False' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'Audit lock control' | '' | '' | '' | '' | '' | '27.02.2024 10:35:56' | '01.01.0001 00:00:00' | 'False' | + | 'e1cib/data/Catalog.AccessGroups?ref=b7b6cb8aa66608cf11eed54b0e7af6b7' | 'False' | 10 | 'False' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'Audit lock control' | '' | '' | '' | '' | '' | '27.02.2024 10:35:56' | '01.01.0001 00:00:00' | 'False' | And I refill object tabular section "Profiles": | 'Ref' | 'Profile' | @@ -3489,10 +3526,10 @@ Scenario: Create catalog AccessGroups and AccessProfiles objects (audit lock) | 'e1cib/data/Catalog.AccessGroups?ref=b7b6cb8aa66608cf11eed54b0e7af6b7' | '$$IdCI$$' | And I check or create catalog "AccessProfiles" objects: - | 'Ref' | 'DeletionMark' | 'Code' | 'Author' | 'Description_en' | 'Description_hash' | 'Description_ru' | 'Description_tr' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | 'NotActive' | - | 'e1cib/data/Catalog.AccessProfiles?ref=b7b6cb8aa66608cf11eed54b0e7af6b5' | 'False' | 4 | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'Full access' | '' | '' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '27.02.2024 10:34:44' | '27.02.2024 10:35:07' | 'False' | - | 'e1cib/data/Catalog.AccessProfiles?ref=b7b6cb8aa66608cf11eed54b0e7af6b6' | 'False' | 5 | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'Audit lock' | '' | '' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '27.02.2024 10:34:44' | '27.02.2024 10:35:07' | 'False' | - | 'e1cib/data/Catalog.AccessProfiles?ref=b7b6cb8aa66608cf11eed54b0e7af6b8' | 'False' | 6 | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'Audit unlock' | '' | '' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '27.02.2024 10:36:16' | '27.02.2024 10:35:07' | 'False' | + | 'Ref' | 'DeletionMark' | 'Code' | 'Author' | 'Description_en' | 'Description_hash' | 'Description_ru' | 'Description_tr' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | 'NotActive' | + | 'e1cib/data/Catalog.AccessProfiles?ref=b7b6cb8aa66608cf11eed54b0e7af6b5' | 'False' | 11 | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'Full access' | '' | '' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '27.02.2024 10:34:44' | '27.02.2024 10:35:07' | 'False' | + | 'e1cib/data/Catalog.AccessProfiles?ref=b7b6cb8aa66608cf11eed54b0e7af6b6' | 'False' | 12 | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'Audit lock' | '' | '' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '27.02.2024 10:34:44' | '27.02.2024 10:35:07' | 'False' | + | 'e1cib/data/Catalog.AccessProfiles?ref=b7b6cb8aa66608cf11eed54b0e7af6b8' | 'False' | 13 | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'Audit unlock' | '' | '' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '27.02.2024 10:36:16' | '27.02.2024 10:35:07' | 'False' | And I refill object tabular section "Roles": | 'Ref' | 'Role' | 'Configuration' | @@ -3554,6 +3591,112 @@ Scenario: Create information register UserSettings records (for PhysicalCountByL | 'UserOrGroup' | 'MetadataObject' | 'AttributeName' | 'KindOfAttribute' | 'Value' | | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'Document.PhysicalCountByLocation' | 'Branch' | 'Enum.KindsOfAttributes.Common' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | +Scenario: Create catalog IntegrationSettings objects (Attach File Control) + + And I check or create catalog "IntegrationSettings" objects: + | 'Ref' | 'DeletionMark' | 'Description' | 'ExternalDataProc' | 'IntegrationType' | 'ExternalDataProcSettings' | 'Unit_SaveExchangeHistory' | 'Author' | 'UniqueID' | 'Editor' | 'CreateDate' | 'ModifyDate' | 'NotActive' | + | 'e1cib/data/Catalog.IntegrationSettings?ref=aa78120ed92fbced11eaf13dc8cb47e4' | 'False' | 'PICTURE STORAGE' | '' | 'Enum.IntegrationType.LocalFileStorage' | 'ValueStorage:AQEIAAAAAAAAAO+7v3siVSJ9' | 'False' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '_484fdf00900e4621ba12d253fb387ecd' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '07.05.2024 23:44:20' | '09.05.2024 16:16:34' | 'False' | + | 'e1cib/data/Catalog.IntegrationSettings?ref=b7bf8c16981f994a11ef0dffe1a30149' | 'False' | 'DOCUMENT STORAGE' | '' | 'Enum.IntegrationType.LocalFileStorage' | 'ValueStorage:AQEIAAAAAAAAAO+7v3siVSJ9' | 'False' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '_e6d6ad337e08414cb350d43075842892' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '09.05.2024 15:30:13' | '09.05.2024 16:11:26' | 'False' | + + And I refill object tabular section "ConnectionSetting": + | 'Ref' | 'Key' | 'Value' | 'Hide' | + | 'e1cib/data/Catalog.IntegrationSettings?ref=aa78120ed92fbced11eaf13dc8cb47e4' | 'AddressPath' | '#workingDir#/Picture/Source' | 'False' | + | 'e1cib/data/Catalog.IntegrationSettings?ref=b7bf8c16981f994a11ef0dffe1a30149' | 'AddressPath' | '#workingDir#/Picture/Source' | 'False' | + + And I refill object tabular section "ConnectionSettingTest": + | 'Ref' | 'Key' | 'Value' | 'Hide' | + | 'e1cib/data/Catalog.IntegrationSettings?ref=aa78120ed92fbced11eaf13dc8cb47e4' | 'AddressPath' | '#workingDir#/Picture/Source' | 'False' | + | 'e1cib/data/Catalog.IntegrationSettings?ref=b7bf8c16981f994a11ef0dffe1a30149' | 'AddressPath' | '#workingDir#/Picture/Source' | 'False' | + +Scenario: Create catalog AttachedDocumentSettings objects + + And I check or create catalog "AttachedDocumentSettings" objects: + | 'Ref' | 'DeletionMark' | 'Code' | 'Description' | 'FileStorageVolume' | 'NotActive' | + | 'e1cib/data/Catalog.AttachedDocumentSettings?ref=b7bf8c16981f994a11ef0d4fefcf3883' | 'False' | 1 | 'RetailReturnReceipt' | 'e1cib/data/Catalog.FileStorageVolumes?ref=b7bf8c16981f994a11ef0dffe1a3014a' | 'False' | + | 'e1cib/data/Catalog.AttachedDocumentSettings?ref=b7bf8c16981f994a11ef0d4fefcf38a1' | 'False' | 2 | 'PurchaseOrder' | 'e1cib/data/Catalog.FileStorageVolumes?ref=b7bf8c16981f994a11ef0dffe1a3014a' | 'False' | + + And I refill object tabular section "FileSettings": + | 'Ref' | 'FilePresention' | 'FileTemplate' | 'NamingFormat' | 'Required' | 'MaximumFileSize' | 'FileExtension' | + | 'e1cib/data/Catalog.AttachedDocumentSettings?ref=b7bf8c16981f994a11ef0d4fefcf3883' | 'e1cib/data/ChartOfCharacteristicTypes.AddAttributeAndProperty?ref=b7bf8c16981f994a11ef0d4fefcf3882' | '' | '%Shop_%DocDate_Return_request%DocNumber' | 'True' | | '*.jpeg; *.png; *.jpg' | + | 'e1cib/data/Catalog.AttachedDocumentSettings?ref=b7bf8c16981f994a11ef0d4fefcf3883' | 'e1cib/data/ChartOfCharacteristicTypes.AddAttributeAndProperty?ref=b7c0b354b75942f011ef1ced5b66c2c5' | '' | '%DocDate_Return_Receipt%DocNumber' | 'False' | | '*.pdf' | + | 'e1cib/data/Catalog.AttachedDocumentSettings?ref=b7bf8c16981f994a11ef0d4fefcf38a1' | 'e1cib/data/ChartOfCharacteristicTypes.AddAttributeAndProperty?ref=b7bf8c16981f994a11ef0d4fefcf38a0' | '' | '' | 'True' | | '*.jpg; *.pdf; *.docx' | + +Scenario: Create catalog FileStorageVolumes objects (Attach File Control) + + And I check or create catalog "FileStorageVolumes" objects: + | 'Ref' | 'DeletionMark' | 'Code' | 'Description' | 'FilesType' | 'POSTIntegrationSettings' | 'GETIntegrationSettings' | 'Author' | 'Editor' | 'CreateDate' | 'ModifyDate' | 'NotActive' | + | 'e1cib/data/Catalog.FileStorageVolumes?ref=b7bf8c16981f994a11ef0cb2958009a1' | 'False' | | 'DEFAULT PICTURE STORAGE' | 'Enum.FileTypes.Picture' | 'e1cib/data/Catalog.IntegrationSettings?ref=aa78120ed92fbced11eaf13dc8cb47e4' | 'e1cib/data/Catalog.IntegrationSettings?ref=aa78120ed92fbced11eaf13dc8cb47e4' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '07.05.2024 23:44:27' | '09.05.2024 16:16:35' | 'False' | + | 'e1cib/data/Catalog.FileStorageVolumes?ref=b7bf8c16981f994a11ef0dffe1a3014a' | 'False' | | 'DEFAULT DOCUMENT STORAGE' | 'Enum.FileTypes.Other' | 'e1cib/data/Catalog.IntegrationSettings?ref=b7bf8c16981f994a11ef0dffe1a30149' | 'e1cib/data/Catalog.IntegrationSettings?ref=b7bf8c16981f994a11ef0dffe1a30149' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '09.05.2024 15:30:54' | '09.05.2024 16:11:27' | 'False' | + +Scenario: Create document PurchaseOrder objects (PO Attach File Control) + + And I check or create document "PurchaseOrder" objects: + | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Agreement' | 'Company' | 'Currency' | 'LegalName' | 'Partner' | 'PriceIncludeTax' | 'Status' | 'PartnerBankAccount' | 'UseItemsReceiptScheduling' | 'TransactionType' | 'Author' | 'Branch' | 'Description' | 'DocumentAmount' | 'UniqueID' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | 'ManualMovementsEdit' | + | 'e1cib/data/Document.PurchaseOrder?ref=b7bf8c16981f994a11ef0de6b428cdad' | 'False' | 221 | '09.05.2023 12:29:59' | 'False' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb77' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1870' | 'True' | 'e1cib/data/Catalog.ObjectStatuses?ref=aa78120ed92fbced11eaf114c59ef01d' | '' | 'False' | 'Enum.PurchaseTransactionTypes.Purchase' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '28.05.2024 16:03:52' | '28.05.2024 16:39:14' | 'False' | + | 'e1cib/data/Document.PurchaseOrder?ref=b7bf8c16981f994a11ef0de6b428cdb0' | 'False' | 222 | '09.05.2023 13:09:34' | 'False' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb77' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1870' | 'True' | 'e1cib/data/Catalog.ObjectStatuses?ref=aa78120ed92fbced11eaf114c59ef01c' | '' | 'False' | 'Enum.PurchaseTransactionTypes.Purchase' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | '' | | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '28.05.2024 16:03:52' | '28.05.2024 16:39:36' | 'False' | + | 'e1cib/data/Document.PurchaseOrder?ref=b7bf8c16981f994a11ef0de6b428cdb3' | 'False' | 223 | '09.05.2023 13:09:53' | 'False' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb77' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1870' | 'True' | 'e1cib/data/Catalog.ObjectStatuses?ref=aa78120ed92fbced11eaf114c59ef01c' | '' | 'False' | 'Enum.PurchaseTransactionTypes.Purchase' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '' | '' | | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '28.05.2024 16:03:52' | '28.05.2024 16:03:53' | 'False' | + | 'e1cib/data/Document.PurchaseOrder?ref=b7bf8c16981f994a11ef0de6b428cdb6' | 'False' | 224 | '09.05.2023 13:10:09' | 'False' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb77' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1870' | 'True' | 'e1cib/data/Catalog.ObjectStatuses?ref=aa78120ed92fbced11eaf114c59ef01c' | '' | 'False' | 'Enum.PurchaseTransactionTypes.Purchase' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | '' | | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '28.05.2024 16:03:52' | '28.05.2024 16:39:52' | 'False' | + + And I refill object tabular section "ItemList": + | 'Ref' | 'Key' | 'Item' | 'ItemKey' | 'Store' | 'Unit' | 'Quantity' | 'PurchaseBasis' | 'Price' | 'TaxAmount' | 'TotalAmount' | 'NetAmount' | 'OffersAmount' | 'PriceType' | 'ProfitLossCenter' | 'ExpenseType' | 'DeliveryDate' | 'Detail' | 'DontCalculateRow' | 'QuantityInBaseUnit' | 'Cancel' | 'CancelReason' | 'SalesOrder' | 'InternalSupplyRequest' | 'PartnerItem' | 'IsService' | 'QuantityIsFixed' | 'VatRate' | + | 'e1cib/data/Document.PurchaseOrder?ref=b7bf8c16981f994a11ef0de6b428cdad' | 'ef465de5-f289-4f09-8b37-12c98cc03ae2' | 'e1cib/data/Catalog.Items?ref=aa78120ed92fbced11eaf115bcc9c5f3' | 'e1cib/data/Catalog.ItemKeys?ref=aa78120ed92fbced11eaf115bcc9c5fb' | 'e1cib/data/Catalog.Stores?ref=aa78120ed92fbced11eaf114c59ef00c' | 'e1cib/data/Catalog.Units?ref=aa78120ed92fbced11eaf113ba6c1862' | 10 | '' | | | | | | 'e1cib/data/Catalog.PriceTypes?ref=aa78120ed92fbced11eaf114c59ef005' | '' | '' | '01.01.0001 00:00:00' | '' | 'False' | 10 | 'False' | '' | '' | '' | '' | 'False' | 'False' | '' | + | 'e1cib/data/Document.PurchaseOrder?ref=b7bf8c16981f994a11ef0de6b428cdad' | 'dcd4178f-e9c8-43ea-b3b7-11dffc9fdc6b' | 'e1cib/data/Catalog.Items?ref=aa78120ed92fbced11eaf115bcc9c5f4' | 'e1cib/data/Catalog.ItemKeys?ref=aa78120ed92fbced11eaf115bcc9c601' | 'e1cib/data/Catalog.Stores?ref=aa78120ed92fbced11eaf114c59ef00c' | 'e1cib/data/Catalog.Units?ref=aa78120ed92fbced11eaf113ba6c1862' | 20 | '' | | | | | | 'e1cib/data/Catalog.PriceTypes?ref=aa78120ed92fbced11eaf114c59ef005' | '' | '' | '01.01.0001 00:00:00' | '' | 'False' | 20 | 'False' | '' | '' | '' | '' | 'False' | 'False' | '' | + | 'e1cib/data/Document.PurchaseOrder?ref=b7bf8c16981f994a11ef0de6b428cdb0' | 'b41d3fc2-3d44-4da8-acf7-0b7a8bc8b2a4' | 'e1cib/data/Catalog.Items?ref=aa78120ed92fbced11eaf115bcc9c5f3' | 'e1cib/data/Catalog.ItemKeys?ref=aa78120ed92fbced11eaf115bcc9c5fb' | 'e1cib/data/Catalog.Stores?ref=aa78120ed92fbced11eaf114c59ef00c' | 'e1cib/data/Catalog.Units?ref=aa78120ed92fbced11eaf113ba6c1862' | 10 | '' | | | | | | 'e1cib/data/Catalog.PriceTypes?ref=aa78120ed92fbced11eaf114c59ef005' | '' | '' | '01.01.0001 00:00:00' | '' | 'False' | 10 | 'False' | '' | '' | '' | '' | 'False' | 'False' | '' | + | 'e1cib/data/Document.PurchaseOrder?ref=b7bf8c16981f994a11ef0de6b428cdb0' | '2b1b72ad-0b38-40a1-ad73-89e015b369c9' | 'e1cib/data/Catalog.Items?ref=aa78120ed92fbced11eaf11c17ff4365' | 'e1cib/data/Catalog.ItemKeys?ref=aa78120ed92fbced11eaf11c17ff4367' | '' | 'e1cib/data/Catalog.Units?ref=aa78120ed92fbced11eaf113ba6c1862' | 1 | '' | | | | | | 'e1cib/data/Catalog.PriceTypes?ref=aa78120ed92fbced11eaf114c59ef005' | '' | '' | '01.01.0001 00:00:00' | '' | 'False' | 1 | 'False' | '' | '' | '' | '' | 'True' | 'False' | '' | + | 'e1cib/data/Document.PurchaseOrder?ref=b7bf8c16981f994a11ef0de6b428cdb3' | '10ece23e-110b-4359-baa8-eba695a9f401' | 'e1cib/data/Catalog.Items?ref=aa78120ed92fbced11eaf115bcc9c5f3' | 'e1cib/data/Catalog.ItemKeys?ref=aa78120ed92fbced11eaf115bcc9c5fb' | 'e1cib/data/Catalog.Stores?ref=aa78120ed92fbced11eaf114c59ef00c' | 'e1cib/data/Catalog.Units?ref=aa78120ed92fbced11eaf113ba6c1862' | 10 | '' | | | | | | 'e1cib/data/Catalog.PriceTypes?ref=aa78120ed92fbced11eaf114c59ef005' | '' | '' | '01.01.0001 00:00:00' | '' | 'False' | 10 | 'False' | '' | '' | '' | '' | 'False' | 'False' | '' | + | 'e1cib/data/Document.PurchaseOrder?ref=b7bf8c16981f994a11ef0de6b428cdb3' | 'afdd9c02-0d45-4eb4-82fd-a99174bb1d5d' | 'e1cib/data/Catalog.Items?ref=aa78120ed92fbced11eaf11c17ff4365' | 'e1cib/data/Catalog.ItemKeys?ref=aa78120ed92fbced11eaf11c17ff4367' | '' | 'e1cib/data/Catalog.Units?ref=aa78120ed92fbced11eaf113ba6c1862' | 1 | '' | | | | | | 'e1cib/data/Catalog.PriceTypes?ref=aa78120ed92fbced11eaf114c59ef005' | '' | '' | '01.01.0001 00:00:00' | '' | 'False' | 1 | 'False' | '' | '' | '' | '' | 'True' | 'False' | '' | + | 'e1cib/data/Document.PurchaseOrder?ref=b7bf8c16981f994a11ef0de6b428cdb6' | '53111e9c-4027-450c-b285-0ec3a9d1e589' | 'e1cib/data/Catalog.Items?ref=aa78120ed92fbced11eaf115bcc9c5f3' | 'e1cib/data/Catalog.ItemKeys?ref=aa78120ed92fbced11eaf115bcc9c5fb' | 'e1cib/data/Catalog.Stores?ref=aa78120ed92fbced11eaf114c59ef00c' | 'e1cib/data/Catalog.Units?ref=aa78120ed92fbced11eaf113ba6c1862' | 10 | '' | | | | | | 'e1cib/data/Catalog.PriceTypes?ref=aa78120ed92fbced11eaf114c59ef005' | '' | '' | '01.01.0001 00:00:00' | '' | 'False' | 10 | 'False' | '' | '' | '' | '' | 'False' | 'False' | '' | + | 'e1cib/data/Document.PurchaseOrder?ref=b7bf8c16981f994a11ef0de6b428cdb6' | '1460dd0f-4d2d-4ae2-adb5-ac049e071ed1' | 'e1cib/data/Catalog.Items?ref=aa78120ed92fbced11eaf11c17ff4365' | 'e1cib/data/Catalog.ItemKeys?ref=aa78120ed92fbced11eaf11c17ff4367' | '' | 'e1cib/data/Catalog.Units?ref=aa78120ed92fbced11eaf113ba6c1862' | 1 | '' | | | | | | 'e1cib/data/Catalog.PriceTypes?ref=aa78120ed92fbced11eaf114c59ef005' | '' | '' | '01.01.0001 00:00:00' | '' | 'False' | 1 | 'False' | '' | '' | '' | '' | 'True' | 'False' | '' | + + And I refill object tabular section "Currencies": + | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | + | 'e1cib/data/Document.PurchaseOrder?ref=b7bf8c16981f994a11ef0de6b428cdad' | ' ' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 1 | 1 | 'False' | 1 | 'e1cib/data/ChartOfCharacteristicTypes.CurrencyMovementType?ref=aa78120ed92fbced11eaf113ba6c185f' | | 'False' | + | 'e1cib/data/Document.PurchaseOrder?ref=b7bf8c16981f994a11ef0de6b428cdad' | ' ' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 1 | 1 | 'False' | 1 | 'e1cib/data/ChartOfCharacteristicTypes.CurrencyMovementType?ref=aa78120ed92fbced11eaf113ba6c185d' | | 'False' | + | 'e1cib/data/Document.PurchaseOrder?ref=b7bf8c16981f994a11ef0de6b428cdad' | ' ' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 0.1712 | 5.841121 | 'False' | 1 | 'e1cib/data/ChartOfCharacteristicTypes.CurrencyMovementType?ref=aa78120ed92fbced11eaf113ba6c185e' | | 'False' | + | 'e1cib/data/Document.PurchaseOrder?ref=b7bf8c16981f994a11ef0de6b428cdb0' | ' ' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 1 | 1 | 'False' | 1 | 'e1cib/data/ChartOfCharacteristicTypes.CurrencyMovementType?ref=aa78120ed92fbced11eaf113ba6c185f' | | 'False' | + | 'e1cib/data/Document.PurchaseOrder?ref=b7bf8c16981f994a11ef0de6b428cdb0' | ' ' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 1 | 1 | 'False' | 1 | 'e1cib/data/ChartOfCharacteristicTypes.CurrencyMovementType?ref=aa78120ed92fbced11eaf113ba6c185d' | | 'False' | + | 'e1cib/data/Document.PurchaseOrder?ref=b7bf8c16981f994a11ef0de6b428cdb0' | ' ' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 0.1712 | 5.841121 | 'False' | 1 | 'e1cib/data/ChartOfCharacteristicTypes.CurrencyMovementType?ref=aa78120ed92fbced11eaf113ba6c185e' | | 'False' | + | 'e1cib/data/Document.PurchaseOrder?ref=b7bf8c16981f994a11ef0de6b428cdb3' | ' ' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 1 | 1 | 'False' | 1 | 'e1cib/data/ChartOfCharacteristicTypes.CurrencyMovementType?ref=aa78120ed92fbced11eaf113ba6c185f' | | 'False' | + | 'e1cib/data/Document.PurchaseOrder?ref=b7bf8c16981f994a11ef0de6b428cdb3' | ' ' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 1 | 1 | 'False' | 1 | 'e1cib/data/ChartOfCharacteristicTypes.CurrencyMovementType?ref=aa78120ed92fbced11eaf113ba6c185d' | | 'False' | + | 'e1cib/data/Document.PurchaseOrder?ref=b7bf8c16981f994a11ef0de6b428cdb3' | ' ' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 0.1712 | 5.841121 | 'False' | 1 | 'e1cib/data/ChartOfCharacteristicTypes.CurrencyMovementType?ref=aa78120ed92fbced11eaf113ba6c185e' | | 'False' | + | 'e1cib/data/Document.PurchaseOrder?ref=b7bf8c16981f994a11ef0de6b428cdb6' | ' ' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 1 | 1 | 'False' | 1 | 'e1cib/data/ChartOfCharacteristicTypes.CurrencyMovementType?ref=aa78120ed92fbced11eaf113ba6c185f' | | 'False' | + | 'e1cib/data/Document.PurchaseOrder?ref=b7bf8c16981f994a11ef0de6b428cdb6' | ' ' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 1 | 1 | 'False' | 1 | 'e1cib/data/ChartOfCharacteristicTypes.CurrencyMovementType?ref=aa78120ed92fbced11eaf113ba6c185d' | | 'False' | + | 'e1cib/data/Document.PurchaseOrder?ref=b7bf8c16981f994a11ef0de6b428cdb6' | ' ' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 0.1712 | 5.841121 | 'False' | 1 | 'e1cib/data/ChartOfCharacteristicTypes.CurrencyMovementType?ref=aa78120ed92fbced11eaf113ba6c185e' | | 'False' | + + +Scenario: Create document RetailReturnReceipt objects (RRR Attach File Control) + + And I check or create document "RetailReturnReceipt" objects: + | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Agreement' | 'Company' | 'Currency' | 'LegalName' | 'ManagerSegment' | 'Partner' | 'PriceIncludeTax' | 'RetailCustomer' | 'UsePartnerTransactions' | 'LegalNameContract' | 'ConsolidatedRetailSales' | 'Workstation' | 'PaymentMethod' | 'StatusType' | 'Author' | 'Branch' | 'Description' | 'DocumentAmount' | 'UniqueID' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | 'ManualMovementsEdit' | + | 'e1cib/data/Document.RetailReturnReceipt?ref=b7bf8c16981f994a11ef0d4fefcf3884' | 'False' | 223 | '08.05.2024 18:37:53' | 'True' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | '' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1870' | 'True' | '' | 'False' | '' | '' | 'e1cib/data/Catalog.Workstations?ref=b762b13668d0905011eb97c8502ea899' | 'Enum.ReceiptPaymentMethods.FullCalculation' | 'Enum.RetailReceiptStatusTypes.Completed' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '' | '' | 550 | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '28.05.2024 16:03:53' | '28.05.2024 16:40:15' | 'False' | + + And I refill object tabular section "ItemList": + | 'Ref' | 'Key' | 'Cancel' | 'Item' | 'ItemKey' | 'Store' | 'NetAmount' | 'OffersAmount' | 'Price' | 'PriceType' | 'Quantity' | 'TaxAmount' | 'TotalAmount' | 'Unit' | 'RetailSalesReceipt' | 'DontCalculateRow' | 'ProfitLossCenter' | 'QuantityInBaseUnit' | 'Detail' | 'RevenueType' | 'AdditionalAnalytic' | 'ReturnReason' | 'SalesPerson' | 'LandedCost' | 'UseSerialLotNumber' | 'IsService' | 'isControlCodeString' | 'QuantityIsFixed' | 'LandedCostTax' | 'Consignor' | 'InventoryOrigin' | 'VatRate' | + | 'e1cib/data/Document.RetailReturnReceipt?ref=b7bf8c16981f994a11ef0d4fefcf3884' | '4ba97a5d-d531-43fe-afe7-7abecec8427c' | 'False' | 'e1cib/data/Catalog.Items?ref=aa78120ed92fbced11eaf115bcc9c5f3' | 'e1cib/data/Catalog.ItemKeys?ref=aa78120ed92fbced11eaf115bcc9c5fb' | 'e1cib/data/Catalog.Stores?ref=aa78120ed92fbced11eaf114c59ef00b' | 550 | | 550 | 'e1cib/data/Catalog.PriceTypes?ref=aa78120ed92fbced11eaf114c59eeffe' | 1 | | 550 | 'e1cib/data/Catalog.Units?ref=aa78120ed92fbced11eaf113ba6c1862' | '' | 'False' | '' | 1 | '' | '' | '' | '' | '' | 5.5 | 'False' | 'False' | 'False' | 'False' | | '' | 'Enum.InventoryOriginTypes.OwnStocks' | '' | + + And I refill object tabular section "Currencies": + | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | + | 'e1cib/data/Document.RetailReturnReceipt?ref=b7bf8c16981f994a11ef0d4fefcf3884' | ' ' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 1 | 1 | 'False' | 1 | 'e1cib/data/ChartOfCharacteristicTypes.CurrencyMovementType?ref=aa78120ed92fbced11eaf113ba6c185f' | 550 | 'False' | + | 'e1cib/data/Document.RetailReturnReceipt?ref=b7bf8c16981f994a11ef0d4fefcf3884' | ' ' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 1 | 1 | 'False' | 1 | 'e1cib/data/ChartOfCharacteristicTypes.CurrencyMovementType?ref=aa78120ed92fbced11eaf113ba6c185d' | 550 | 'False' | + | 'e1cib/data/Document.RetailReturnReceipt?ref=b7bf8c16981f994a11ef0d4fefcf3884' | ' ' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 0.1712 | 5.841121 | 'False' | 1 | 'e1cib/data/ChartOfCharacteristicTypes.CurrencyMovementType?ref=aa78120ed92fbced11eaf113ba6c185e' | 94.16 | 'False' | + + And I refill object tabular section "Payments": + | 'Ref' | 'Key' | 'PaymentType' | 'PaymentTerminal' | 'Account' | 'Amount' | 'Percent' | 'Commission' | 'PostponedPayment' | 'BankTerm' | 'RRNCode' | 'PaymentInfo' | 'FinancialMovementType' | 'CashFlowCenter' | 'PaymentAgentPartner' | 'PaymentAgentLegalName' | 'PaymentAgentPartnerTerms' | 'PaymentAgentLegalNameContract' | 'Certificate' | + | 'e1cib/data/Document.RetailReturnReceipt?ref=b7bf8c16981f994a11ef0d4fefcf3884' | '26a723d4-0895-428f-8ac1-12c940a63d2b' | 'e1cib/data/Catalog.PaymentTypes?ref=aa78120ed92fbced11eaf12effe70fcf' | '' | 'e1cib/data/Catalog.CashAccounts?ref=aa78120ed92fbced11eaf113ba6c1869' | 550 | | | 'False' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + + And I refill object tabular section "SourceOfOrigins": + | 'Ref' | 'Key' | 'SerialLotNumber' | 'SourceOfOrigin' | 'Quantity' | + | 'e1cib/data/Document.RetailReturnReceipt?ref=b7bf8c16981f994a11ef0d4fefcf3884' | '4ba97a5d-d531-43fe-afe7-7abecec8427c' | '' | '' | 1 | + + +Scenario: Create chart of characteristic types AddAttributeAndProperty objects (Attach File Control) + + And I check or create chart of characteristic types "AddAttributeAndProperty" objects: + | 'Ref' | 'DeletionMark' | 'Parent' | 'IsFolder' | 'ValueType' | 'Icon' | 'isIconSet' | 'isURL' | 'Multiline' | 'Comment' | 'Description_en' | 'Description_hash' | 'Description_ru' | 'Description_tr' | 'UniqueID' | 'SourceNodeID' | + | 'e1cib/data/ChartOfCharacteristicTypes.AddAttributeAndProperty?ref=b7c0b354b75942f011ef1ced5b66c2c5' | 'False' | '' | 'False' | 'd2p1:CatalogRef.AddAttributeAndPropertyValues' | 'ValueStorage:AQEIAAAAAAAAAO+7v3siVSJ9' | 'False' | 'False' | 'False' | '' | 'Return receipt' | '' | '' | '' | '_53507e1a72164bf9967740fc2a3fb566' | '' | + | 'e1cib/data/ChartOfCharacteristicTypes.AddAttributeAndProperty?ref=b7bf8c16981f994a11ef0d4fefcf3882' | 'False' | '' | 'False' | 'd2p1:CatalogRef.AddAttributeAndPropertyValues' | 'ValueStorage:AgFTS2/0iI3BTqDV67a9oKcN42CAgPe791crhSrVAgA=' | 'False' | 'False' | 'False' | '' | 'Return request' | '' | '' | '' | '_7fd78479384f40f18395a9b39ff44291' | '' | + | 'e1cib/data/ChartOfCharacteristicTypes.AddAttributeAndProperty?ref=b7bf8c16981f994a11ef0d4fefcf38a0' | 'False' | '' | 'False' | 'd2p1:CatalogRef.AddAttributeAndPropertyValues' | 'ValueStorage:AgFTS2/0iI3BTqDV67a9oKcN42CAgPe791crhSrVAgA=' | 'False' | 'False' | 'False' | '' | 'Purchase order' | '' | '' | '' | '_d54059daf81c4192bee4e59d86681507' | '' | + Scenario: Create information register Agreements records (NDB, Second Company) And I check or create catalog "Agreements" objects: diff --git a/features/External/ImportDataAccessRights.feature b/features/External/ImportDataAccessRights.feature index 1ac069d5e7..8f19812546 100644 --- a/features/External/ImportDataAccessRights.feature +++ b/features/External/ImportDataAccessRights.feature @@ -871,8 +871,8 @@ Scenario: import data for access rights | 'e1cib/data/Document.CreditNote?ref=b7aca07c053e25f811ee773262799107' | 'False' | 10 | '31.10.2023 11:50:10' | 'False' | 'e1cib/data/Catalog.Companies?ref=11111111111111111111111111111111' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=11111111111111111111111111111111' | '' | '' | And I refill object tabular section "Transactions": - | 'Ref' | 'Partner' | 'Key' | 'Agreement' | 'Currency' | 'Amount' | 'ProfitLossCenter' | 'ExpenseType' | 'AdditionalAnalytic' | 'LegalName' | 'LegalNameContract' | - | 'e1cib/data/Document.CreditNote?ref=b7aca07c053e25f811ee773262799107' | 'e1cib/data/Catalog.Partners?ref=b7aca07c053e25f811ee7407d7afc675' | '56435bf0-e262-48fb-9ce6-cf7b1dbb3a77' | 'e1cib/data/Catalog.Agreements?ref=b7aca07c053e25f811ee7407d7afc67d' | 'e1cib/data/Catalog.Currencies?refName=Default' | 100 | 'e1cib/data/Catalog.BusinessUnits?ref=11111111111111111111111111111111' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b7aca07c053e25f811ee7732627990eb' | '' | 'e1cib/data/Catalog.Companies?ref=b7aca07c053e25f811ee7407d7afc676' | '' | + | 'Ref' | 'Partner' | 'Key' | 'Agreement' | 'Currency' | 'Amount' | 'NetAmount' | 'TaxAmount' | 'VatRate' | 'ProfitLossCenter' | 'ExpenseType' | 'AdditionalAnalytic' | 'LegalName' | 'LegalNameContract' | + | 'e1cib/data/Document.CreditNote?ref=b7aca07c053e25f811ee773262799107' | 'e1cib/data/Catalog.Partners?ref=b7aca07c053e25f811ee7407d7afc675' | '56435bf0-e262-48fb-9ce6-cf7b1dbb3a77' | 'e1cib/data/Catalog.Agreements?ref=b7aca07c053e25f811ee7407d7afc67d' | 'e1cib/data/Catalog.Currencies?refName=Default' | 100 | 100 | '' | '' |'e1cib/data/Catalog.BusinessUnits?ref=11111111111111111111111111111111' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b7aca07c053e25f811ee7732627990eb' | '' | 'e1cib/data/Catalog.Companies?ref=b7aca07c053e25f811ee7407d7afc676' | '' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | @@ -891,8 +891,8 @@ Scenario: import data for access rights | 'e1cib/data/Document.DebitNote?ref=b7aca07c053e25f811ee773262799106' | 'False' | 10 | '31.10.2023 11:49:37' | 'False' | 'e1cib/data/Catalog.Companies?ref=11111111111111111111111111111111' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=11111111111111111111111111111111' | '' | '' | And I refill object tabular section "Transactions": - | 'Ref' | 'Key' | 'Partner' | 'Agreement' | 'Currency' | 'Amount' | 'ProfitLossCenter' | 'RevenueType' | 'AdditionalAnalytic' | 'LegalName' | 'LegalNameContract' | - | 'e1cib/data/Document.DebitNote?ref=b7aca07c053e25f811ee773262799106' | '06eeaa36-fb03-484c-a69f-9a856f68d640' | 'e1cib/data/Catalog.Partners?ref=b7aca07c053e25f811ee7407d7afc675' | 'e1cib/data/Catalog.Agreements?ref=b7aca07c053e25f811ee7407d7afc67b' | 'e1cib/data/Catalog.Currencies?refName=Default' | 50 | 'e1cib/data/Catalog.BusinessUnits?ref=11111111111111111111111111111111' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b7aca07c053e25f811ee7732627990e8' | '' | 'e1cib/data/Catalog.Companies?ref=b7aca07c053e25f811ee7407d7afc676' | '' | + | 'Ref' | 'Key' | 'Partner' | 'Agreement' | 'Currency' | 'Amount' | 'NetAmount' | 'TaxAmount' | 'VatRate' | 'ProfitLossCenter' | 'RevenueType' | 'AdditionalAnalytic' | 'LegalName' | 'LegalNameContract' | + | 'e1cib/data/Document.DebitNote?ref=b7aca07c053e25f811ee773262799106' | '06eeaa36-fb03-484c-a69f-9a856f68d640' | 'e1cib/data/Catalog.Partners?ref=b7aca07c053e25f811ee7407d7afc675' | 'e1cib/data/Catalog.Agreements?ref=b7aca07c053e25f811ee7407d7afc67b' | 'e1cib/data/Catalog.Currencies?refName=Default' | 50 | 50 | 50 | | 'e1cib/data/Catalog.BusinessUnits?ref=11111111111111111111111111111111' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b7aca07c053e25f811ee7732627990e8' | '' | 'e1cib/data/Catalog.Companies?ref=b7aca07c053e25f811ee7407d7afc676' | '' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | diff --git a/features/External/ImportDataCurrencyRevaluation.feature b/features/External/ImportDataCurrencyRevaluation.feature index 28bc9da648..edfc0baa03 100644 --- a/features/External/ImportDataCurrencyRevaluation.feature +++ b/features/External/ImportDataCurrencyRevaluation.feature @@ -361,8 +361,8 @@ Scenario: Create document DebitNote objects (multicurrency revaluation) | 'e1cib/data/Document.DebitNote?ref=b7c0b354b75942f011ef1c116e7ebc59' | 'False' | 1 | '09.02.2023 12:00:00' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '27.05.2024 16:54:10' | '27.05.2024 16:54:37' | 'False' | And I refill object tabular section "Transactions": - | 'Ref' | 'Key' | 'Partner' | 'Agreement' | 'Currency' | 'Amount' | 'ProfitLossCenter' | 'RevenueType' | 'AdditionalAnalytic' | 'LegalName' | 'LegalNameContract' | 'Project' | 'BasisDocument' | 'Detail' | - | 'e1cib/data/Document.DebitNote?ref=b7c0b354b75942f011ef1c116e7ebc59' | '5cf1756b-3e4f-480c-844f-69851ce356e0' | 'e1cib/data/Catalog.Partners?ref=b79ea93fec1998ed11ee09140139bba0' | 'e1cib/data/Catalog.Agreements?ref=b7bf8c16981f994a11ef1419cba382d3' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1856' | 200 | '' | '' | '' | 'e1cib/data/Catalog.Companies?ref=b79ea93fec1998ed11ee09140139bba1' | '' | '' | '' | '' | + | 'Ref' | 'Key' | 'Partner' | 'Agreement' | 'Currency' | 'Amount' | 'NetAmount' | 'TaxAmount' | 'VatRate' | 'ProfitLossCenter' | 'RevenueType' | 'AdditionalAnalytic' | 'LegalName' | 'LegalNameContract' | 'Project' | 'BasisDocument' | 'Detail' | + | 'e1cib/data/Document.DebitNote?ref=b7c0b354b75942f011ef1c116e7ebc59' | '5cf1756b-3e4f-480c-844f-69851ce356e0' | 'e1cib/data/Catalog.Partners?ref=b79ea93fec1998ed11ee09140139bba0' | 'e1cib/data/Catalog.Agreements?ref=b7bf8c16981f994a11ef1419cba382d3' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1856' | 200 | '200' | '' | '' | '' | '' | '' | 'e1cib/data/Catalog.Companies?ref=b79ea93fec1998ed11ee09140139bba1' | '' | '' | '' | '' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | diff --git a/features/External/ImportDataDebitCreditNote.feature b/features/External/ImportDataDebitCreditNote.feature index a0aa5f679b..08423485fe 100644 --- a/features/External/ImportDataDebitCreditNote.feature +++ b/features/External/ImportDataDebitCreditNote.feature @@ -220,8 +220,8 @@ Scenario: import data for debit credit note // Document.DebitCreditNote (CA-CT, by documents, same partner) And I check or create document "DebitCreditNote" objects: - | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'Amount' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | - | 'e1cib/data/Document.DebitCreditNote?ref=b7b5ac6d7ba6186311eecfde60f8e905' | 'False' | 2 | '20.02.2024 13:27:56' | 'True' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4963' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4964' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | '' | '' | 'Enum.DebtTypes.AdvanceCustomer' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4963' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4964' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | '' | '' | 'Enum.DebtTypes.TransactionCustomer' | '' | 'e1cib/data/Document.SalesInvoice?ref=b7b5ac6d7ba6186311eecf48a99a4977' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 500 | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '20.02.2024 13:33:35' | '20.02.2024 12:58:01' | + | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'ReceiveCurrency' | 'SendCurrency' | 'ExpenseType' | 'LossCenter' | 'RevenueType' | 'ProfitCenter' | 'SendAmount' | 'ReceiveAmount' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | + | 'e1cib/data/Document.DebitCreditNote?ref=b7b5ac6d7ba6186311eecfde60f8e905' | 'False' | 2 | '20.02.2024 13:27:56' | 'True' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4963' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4964' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | '' | '' | 'Enum.DebtTypes.AdvanceCustomer' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4963' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4964' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | '' | '' | 'Enum.DebtTypes.TransactionCustomer' | '' | 'e1cib/data/Document.SalesInvoice?ref=b7b5ac6d7ba6186311eecf48a99a4977' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' |'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed95fbced11eaf114c59ef02b'| 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | '500' | '500' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '20.02.2024 13:33:35' | '20.02.2024 12:58:01' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | @@ -231,8 +231,8 @@ Scenario: import data for debit credit note // Document.DebitCreditNote (CT-VA, by documents, same partner) And I check or create document "DebitCreditNote" objects: - | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'Amount' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | - | 'e1cib/data/Document.DebitCreditNote?ref=b7b5ac6d7ba6186311eecf48a99a497b' | 'False' | 1 | '20.02.2024 10:01:09' |'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4963' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4964' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | '' | '' | 'Enum.DebtTypes.TransactionCustomer' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4963' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4964' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a4965' | '' | '' | 'Enum.DebtTypes.AdvanceVendor' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 121 | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '26.04.2024 10:52:37' | '26.04.2024 11:18:10' | + | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'ReceiveCurrency' | 'SendCurrency' | 'ExpenseType' | 'LossCenter' | 'RevenueType' | 'ProfitCenter' | 'SendAmount' | 'ReceiveAmount' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | + | 'e1cib/data/Document.DebitCreditNote?ref=b7b5ac6d7ba6186311eecf48a99a497b' | 'False' | 1 | '20.02.2024 10:01:09' |'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4963' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4964' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | '' | '' | 'Enum.DebtTypes.TransactionCustomer' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4963' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4964' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a4965' | '' | '' | 'Enum.DebtTypes.AdvanceVendor' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' |'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed95fbced11eaf114c59ef02b'| 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | '121' | '121' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '26.04.2024 10:52:37' | '26.04.2024 11:18:10' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | @@ -241,8 +241,8 @@ Scenario: import data for debit credit note // Document.DebitCreditNote (CA-CA, by documents, same partner) And I check or create document "DebitCreditNote" objects: - | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'Amount' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | - | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef03a1f5e9fdfd' | 'False' | 3 | '30.03.2024 11:34:17' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4963' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4964' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | '' | '' | 'Enum.DebtTypes.AdvanceCustomer' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4963' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4964' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb75' | '' | '' | 'Enum.DebtTypes.AdvanceCustomer' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 128 | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '26.04.2024 11:35:36' | '26.04.2024 10:52:37' | + | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'ReceiveCurrency' | 'SendCurrency' | 'ExpenseType' | 'LossCenter' | 'RevenueType' | 'ProfitCenter' | 'SendAmount' | 'ReceiveAmount'| 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | + | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef03a1f5e9fdfd' | 'False' | 3 | '30.03.2024 11:34:17' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4963' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4964' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | '' | '' | 'Enum.DebtTypes.AdvanceCustomer' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4963' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4964' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb75' | '' | '' | 'Enum.DebtTypes.AdvanceCustomer' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' |'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed95fbced11eaf114c59ef02b'| 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | '128' | '128' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '26.04.2024 11:35:36' | '26.04.2024 10:52:37' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | @@ -252,8 +252,8 @@ Scenario: import data for debit credit note // Document.DebitCreditNote (VA-VA, by documents, same partner) And I check or create document "DebitCreditNote" objects: - | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'Amount' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | - | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef03a1f5e9fdff' | 'False' | 4 | '01.04.2024 11:48:58' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4963' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4964' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a4965' | '' | '' | 'Enum.DebtTypes.AdvanceVendor' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4963' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4964' | 'e1cib/data/Catalog.Agreements?ref=b7bb9478f8f9519511ef03a1f5e9fdfe' | '' | '' | 'Enum.DebtTypes.AdvanceVendor' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 127 | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '26.04.2024 12:55:56' | '26.04.2024 10:52:37' | + | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'ReceiveCurrency' | 'SendCurrency' | 'ExpenseType' | 'LossCenter' | 'RevenueType' | 'ProfitCenter' | 'SendAmount' | 'ReceiveAmount'| 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | + | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef03a1f5e9fdff' | 'False' | 4 | '01.04.2024 11:48:58' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4963' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4964' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a4965' | '' | '' | 'Enum.DebtTypes.AdvanceVendor' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4963' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4964' | 'e1cib/data/Catalog.Agreements?ref=b7bb9478f8f9519511ef03a1f5e9fdfe' | '' | '' | 'Enum.DebtTypes.AdvanceVendor' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' |'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed95fbced11eaf114c59ef02b'| 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | '127' | '127' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '26.04.2024 12:55:56' | '26.04.2024 10:52:37' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | @@ -263,8 +263,8 @@ Scenario: import data for debit credit note // Document.DebitCreditNote (CT-CT, by partner terms, same partner, different branches) And I check or create document "DebitCreditNote" objects: - | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'Amount' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | - | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef03a1f5e9fe00' | 'False' | 5 | '02.04.2024 13:06:46' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4960' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4961' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a4962' | '' | '' | 'Enum.DebtTypes.TransactionCustomer' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4960' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4961' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a4962' | '' | '' | 'Enum.DebtTypes.TransactionCustomer' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 111 | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '26.04.2024 13:08:55' | '26.04.2024 13:09:54' | + | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'ReceiveCurrency' | 'SendCurrency' | 'ExpenseType' | 'LossCenter' | 'RevenueType' | 'ProfitCenter' | 'SendAmount' | 'ReceiveAmount' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | + | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef03a1f5e9fe00' | 'False' | 5 | '02.04.2024 13:06:46' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4960' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4961' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a4962' | '' | '' | 'Enum.DebtTypes.TransactionCustomer' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4960' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4961' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a4962' | '' | '' | 'Enum.DebtTypes.TransactionCustomer' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' |'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed95fbced11eaf114c59ef02b'| 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | '111' | '111' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '26.04.2024 13:08:55' | '26.04.2024 13:09:54' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | @@ -274,8 +274,8 @@ Scenario: import data for debit credit note // Document.DebitCreditNote (VT-VT, by partner terms, same partner, different branches) And I check or create document "DebitCreditNote" objects: - | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'Amount' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | - | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef03a1f5e9fe01' | 'False' | 6 | '26.04.2024 13:20:20' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4955' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4956' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf134a6a475a0' | '' | '' | 'Enum.DebtTypes.TransactionVendor' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4955' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4956' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf134a6a475a0' | '' | '' | 'Enum.DebtTypes.TransactionVendor' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 109 | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '26.04.2024 13:21:32' | '26.04.2024 13:09:54' | + | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'ReceiveCurrency' | 'SendCurrency' | 'ExpenseType' | 'LossCenter' | 'RevenueType' | 'ProfitCenter' | 'SendAmount' | 'ReceiveAmount' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | + | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef03a1f5e9fe01' | 'False' | 6 | '26.04.2024 13:20:20' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4955' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4956' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf134a6a475a0' | '' | '' | 'Enum.DebtTypes.TransactionVendor' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4955' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4956' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf134a6a475a0' | '' | '' | 'Enum.DebtTypes.TransactionVendor' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' |'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed95fbced11eaf114c59ef02b'| 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | '109' | '109' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '26.04.2024 13:21:32' | '26.04.2024 13:09:54' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | @@ -285,8 +285,8 @@ Scenario: import data for debit credit note // Document.DebitCreditNote (VA-VT, by documents, different partners) And I check or create document "DebitCreditNote" objects: - | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'Amount' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | - | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef03a1f5e9fe02' | 'False' | 7 | '26.04.2024 13:31:41' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4957' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4958' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a4959' | '' | '' | 'Enum.DebtTypes.AdvanceVendor' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a495a' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a495b' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a495c' | '' | '' | 'Enum.DebtTypes.TransactionVendor' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 21 | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '26.04.2024 13:32:36' | '26.04.2024 13:09:54' | + | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'ReceiveCurrency' | 'SendCurrency' | 'ExpenseType' | 'LossCenter' | 'RevenueType' | 'ProfitCenter' | 'SendAmount' | 'ReceiveAmount'| 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | + | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef03a1f5e9fe02' | 'False' | 7 | '26.04.2024 13:31:41' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4957' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4958' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a4959' | '' | '' | 'Enum.DebtTypes.AdvanceVendor' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a495a' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a495b' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a495c' | '' | '' | 'Enum.DebtTypes.TransactionVendor' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' |'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed95fbced11eaf114c59ef02b'| 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | '21' | '21' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '26.04.2024 13:32:36' | '26.04.2024 13:09:54' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | @@ -296,8 +296,8 @@ Scenario: import data for debit credit note // Document.DebitCreditNote (VT-CA, by documents, different partners) And I check or create document "DebitCreditNote" objects: - | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'Amount' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | - | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef03a1f5e9fe03' | 'False' | 8 | '03.04.2024 14:19:17' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a495a' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a495b' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a495c' | '' | '' | 'Enum.DebtTypes.TransactionVendor' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a494f' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4950' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | '' | '' | 'Enum.DebtTypes.AdvanceCustomer' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 41 | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '26.04.2024 14:57:12' | '26.04.2024 13:09:54' | + | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'ReceiveCurrency' | 'SendCurrency' | 'ExpenseType' | 'LossCenter' | 'RevenueType' | 'ProfitCenter' | 'SendAmount' | 'ReceiveAmount' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | + | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef03a1f5e9fe03' | 'False' | 8 | '03.04.2024 14:19:17' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a495a' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a495b' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a495c' | '' | '' | 'Enum.DebtTypes.TransactionVendor' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a494f' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4950' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | '' | '' | 'Enum.DebtTypes.AdvanceCustomer' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' |'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed95fbced11eaf114c59ef02b'| 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | '41' | '41' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '26.04.2024 14:57:12' | '26.04.2024 13:09:54' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | @@ -307,8 +307,8 @@ Scenario: import data for debit credit note // Document.DebitCreditNote (VT-CT, by documents, different partners) And I check or create document "DebitCreditNote" objects: - | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'Amount' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | - | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef03a1f5e9fe04' | 'False' | 9 | '26.04.2024 16:15:09' | 'True' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a495a' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a495b' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a495c' | '' | '' | 'Enum.DebtTypes.TransactionVendor' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4951' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4952' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | '' | '' | 'Enum.DebtTypes.TransactionCustomer' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 51 | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '26.04.2024 16:15:48' | '26.04.2024 13:09:54' | + | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'ReceiveCurrency' | 'SendCurrency' | 'ExpenseType' | 'LossCenter' | 'RevenueType' | 'ProfitCenter' | 'SendAmount' | 'ReceiveAmount' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | + | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef03a1f5e9fe04' | 'False' | 9 | '26.04.2024 16:15:09' | 'True' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a495a' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a495b' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a495c' | '' | '' | 'Enum.DebtTypes.TransactionVendor' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4951' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4952' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | '' | '' | 'Enum.DebtTypes.TransactionCustomer' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' |'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed95fbced11eaf114c59ef02b'| 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | '51' | '51' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '26.04.2024 16:15:48' | '26.04.2024 13:09:54' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | @@ -318,8 +318,8 @@ Scenario: import data for debit credit note // Document.DebitCreditNote (CT-VA, by documents, different partners) And I check or create document "DebitCreditNote" objects: - | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'Amount' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | - | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef03a1f5e9fe05' | 'False' | 10 | '26.04.2024 17:51:11' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4951' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4952' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | '' | '' | 'Enum.DebtTypes.TransactionCustomer' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4957' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4958' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a4959' | '' | '' | 'Enum.DebtTypes.AdvanceVendor' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 74 | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '26.04.2024 17:52:39' | '26.04.2024 17:52:43' | + | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'ReceiveCurrency' | 'SendCurrency' | 'ExpenseType' | 'LossCenter' | 'RevenueType' | 'ProfitCenter' | 'SendAmount' | 'ReceiveAmount'| 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | + | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef03a1f5e9fe05' | 'False' | 10 | '26.04.2024 17:51:11' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4951' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4952' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | '' | '' | 'Enum.DebtTypes.TransactionCustomer' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4957' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4958' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a4959' | '' | '' | 'Enum.DebtTypes.AdvanceVendor' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' |'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed95fbced11eaf114c59ef02b'| 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | '74' | '74' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '26.04.2024 17:52:39' | '26.04.2024 17:52:43' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | @@ -329,8 +329,8 @@ Scenario: import data for debit credit note // Document.DebitCreditNote (CT-VA, by documents, different partners) And I check or create document "DebitCreditNote" objects: - | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'Amount' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | - | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef05f9ced08320' | 'False' | 11 | '29.04.2024 10:25:38' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a494f' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4950' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | '' | '' | 'Enum.DebtTypes.AdvanceCustomer' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4957' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4958' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a4959' | '' | '' | 'Enum.DebtTypes.AdvanceVendor' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 48 | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '29.04.2024 10:26:35' | '26.04.2024 17:52:43' | + | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'ReceiveCurrency' | 'SendCurrency' | 'ExpenseType' | 'LossCenter' | 'RevenueType' | 'ProfitCenter' | 'SendAmount' | 'ReceiveAmount' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | + | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef05f9ced08320' | 'False' | 11 | '29.04.2024 10:25:38' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a494f' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4950' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | '' | '' | 'Enum.DebtTypes.AdvanceCustomer' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4957' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4958' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a4959' | '' | '' | 'Enum.DebtTypes.AdvanceVendor' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' |'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed95fbced11eaf114c59ef02b'| 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | '48' | '48' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '29.04.2024 10:26:35' | '26.04.2024 17:52:43' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | @@ -340,8 +340,8 @@ Scenario: import data for debit credit note // Document.DebitCreditNote (CT-VT, by partner terms, different partners) And I check or create document "DebitCreditNote" objects: - | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'Amount' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | - | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef05f9ced08321' | 'False' | 12 | '29.04.2024 10:42:01' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4960' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4961' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a4962' | '' | '' | 'Enum.DebtTypes.TransactionCustomer' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4955' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4956' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf134a6a475a0' | '' | '' | 'Enum.DebtTypes.TransactionVendor' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 43 | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '29.04.2024 10:42:03' | '29.04.2024 10:40:28' | + | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'ReceiveCurrency' | 'SendCurrency' | 'ExpenseType' | 'LossCenter' | 'RevenueType' | 'ProfitCenter' | 'SendAmount' | 'ReceiveAmount'| 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | + | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef05f9ced08321' | 'False' | 12 | '29.04.2024 10:42:01' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4960' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4961' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a4962' | '' | '' | 'Enum.DebtTypes.TransactionCustomer' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4955' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4956' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf134a6a475a0' | '' | '' | 'Enum.DebtTypes.TransactionVendor' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' |'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed95fbced11eaf114c59ef02b'| 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | '43' | '43' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '29.04.2024 10:42:03' | '29.04.2024 10:40:28' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | @@ -351,8 +351,8 @@ Scenario: import data for debit credit note // Document.DebitCreditNote (VA-VA, by documents, different partners) And I check or create document "DebitCreditNote" objects: - | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'Amount' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | - | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef05f9ced08325' | 'False' | 13 | '29.04.2024 11:06:59' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4957' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4958' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a4959' | '' | '' | 'Enum.DebtTypes.AdvanceVendor' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4963' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4964' | 'e1cib/data/Catalog.Agreements?ref=b7bb9478f8f9519511ef03a1f5e9fdfe' | '' | '' | 'Enum.DebtTypes.AdvanceVendor' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 47 | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '29.04.2024 11:07:00' | '29.04.2024 11:06:16' | + | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'ReceiveCurrency' | 'SendCurrency' | 'ExpenseType' | 'LossCenter' | 'RevenueType' | 'ProfitCenter' | 'SendAmount' | 'ReceiveAmount' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | + | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef05f9ced08325' | 'False' | 13 | '29.04.2024 11:06:59' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4957' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4958' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a4959' | '' | '' | 'Enum.DebtTypes.AdvanceVendor' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4963' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4964' | 'e1cib/data/Catalog.Agreements?ref=b7bb9478f8f9519511ef03a1f5e9fdfe' | '' | '' | 'Enum.DebtTypes.AdvanceVendor' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' |'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed95fbced11eaf114c59ef02b'| 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | '47' | '47' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '29.04.2024 11:07:00' | '29.04.2024 11:06:16' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | @@ -362,8 +362,8 @@ Scenario: import data for debit credit note // Document.DebitCreditNote (СA-СA, by documents, different partners) And I check or create document "DebitCreditNote" objects: - | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'Amount' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | - | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef05f9ced08326' | 'False' | 14 | '29.04.2024 11:15:01' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a494f' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4950' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | '' | '' | 'Enum.DebtTypes.AdvanceCustomer' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4963' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4964' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | '' | '' | 'Enum.DebtTypes.AdvanceCustomer' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 49 | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '29.04.2024 11:15:31' | '29.04.2024 11:15:31' | + | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'ReceiveCurrency' | 'SendCurrency' | 'ExpenseType' | 'LossCenter' | 'RevenueType' | 'ProfitCenter' | 'SendAmount' | 'ReceiveAmount' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | + | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef05f9ced08326' | 'False' | 14 | '29.04.2024 11:15:01' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a494f' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4950' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | '' | '' | 'Enum.DebtTypes.AdvanceCustomer' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4963' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4964' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | '' | '' | 'Enum.DebtTypes.AdvanceCustomer' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' |'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed95fbced11eaf114c59ef02b'| 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | '49' | '49' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '29.04.2024 11:15:31' | '29.04.2024 11:15:31' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | @@ -373,8 +373,8 @@ Scenario: import data for debit credit note // Document.DebitCreditNote (СT-СT, by documents and partner terms, different partners) And I check or create document "DebitCreditNote" objects: - | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'Amount' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | - | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef05f9ced08327' | 'False' | 15 | '29.04.2024 11:21:10' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4951' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4952' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | '' | '' | 'Enum.DebtTypes.TransactionCustomer' | '' | 'e1cib/data/Document.SalesInvoice?ref=b7b5ac6d7ba6186311eecf48a99a4973' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4960' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4961' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a4962' | '' | '' | 'Enum.DebtTypes.TransactionCustomer' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 53 | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '29.04.2024 11:21:48' | '29.04.2024 12:09:09' | + | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'ReceiveCurrency' | 'SendCurrency' | 'ExpenseType' | 'LossCenter' | 'RevenueType' | 'ProfitCenter' | 'SendAmount' | 'ReceiveAmount'| 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | + | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef05f9ced08327' | 'False' | 15 | '29.04.2024 11:21:10' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4951' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4952' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | '' | '' | 'Enum.DebtTypes.TransactionCustomer' | '' | 'e1cib/data/Document.SalesInvoice?ref=b7b5ac6d7ba6186311eecf48a99a4973' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4960' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4961' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a4962' | '' | '' | 'Enum.DebtTypes.TransactionCustomer' | '' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' |'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed95fbced11eaf114c59ef02b'| 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | '53' | '53' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '29.04.2024 11:21:48' | '29.04.2024 12:09:09' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | @@ -384,8 +384,8 @@ Scenario: import data for debit credit note // Document.DebitCreditNote (VT-VT, by partner terms, different partners) And I check or create document "DebitCreditNote" objects: - | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'Amount' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | - | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef05f9ced08329' | 'False' | 16 | '29.04.2024 12:14:25' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4955' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4956' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf134a6a475a0' | '' | '' | 'Enum.DebtTypes.TransactionVendor' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a495a' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a495b' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a495c' | '' | '' | 'Enum.DebtTypes.TransactionVendor' | '' | 'e1cib/data/Document.PurchaseInvoice?ref=b7b5ac6d7ba6186311eecf48a99a496a' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 54 | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '29.04.2024 12:16:17' | '29.04.2024 12:25:39' | + | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'ReceiveBranch' | 'SendPartner' | 'SendLegalName' | 'SendAgreement' | 'SendLegalNameContract' | 'SendProject' | 'SendDebtType' | 'SendOrder' | 'SendBasisDocument' | 'ReceivePartner' | 'ReceiveLegalName' | 'ReceiveAgreement' | 'ReceiveLegalNameContract' | 'ReceiveProject' | 'ReceiveDebtType' | 'ReceiveOrder' | 'ReceiveBasisDocument' | 'Currency' | 'ReceiveCurrency' | 'SendCurrency' | 'ExpenseType' | 'LossCenter' | 'RevenueType' | 'ProfitCenter' | 'SendAmount' | 'ReceiveAmount' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | + | 'e1cib/data/Document.DebitCreditNote?ref=b7bb9478f8f9519511ef05f9ced08329' | 'False' | 16 | '29.04.2024 12:14:25' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a4955' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a4956' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf134a6a475a0' | '' | '' | 'Enum.DebtTypes.TransactionVendor' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b5ac6d7ba6186311eecf48a99a495a' | 'e1cib/data/Catalog.Companies?ref=b7b5ac6d7ba6186311eecf48a99a495b' | 'e1cib/data/Catalog.Agreements?ref=b7b5ac6d7ba6186311eecf48a99a495c' | '' | '' | 'Enum.DebtTypes.TransactionVendor' | '' | 'e1cib/data/Document.PurchaseInvoice?ref=b7b5ac6d7ba6186311eecf48a99a496a' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' |'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed95fbced11eaf114c59ef02b'| 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef024' | '54' | '54' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '29.04.2024 12:16:17' | '29.04.2024 12:25:39' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | diff --git a/features/External/ImportDocuments.feature b/features/External/ImportDocuments.feature index 2f94bcf37b..fe7620fd60 100644 --- a/features/External/ImportDocuments.feature +++ b/features/External/ImportDocuments.feature @@ -435,8 +435,8 @@ Scenario: Create document CreditNote objects | 'e1cib/data/Document.CreditNote?ref=aa78120ed92fbced11eaf126e999cc60' | 'False' | '1' | '07.09.2020 19:29:00' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '' | And I refill object tabular section "Transactions": - | 'Ref' | 'Key' | 'Partner' | 'Agreement' | 'Currency' | 'Amount' | 'ProfitLossCenter' | 'ExpenseType' | 'AdditionalAnalytic' | 'LegalName' | - | 'e1cib/data/Document.CreditNote?ref=aa78120ed92fbced11eaf126e999cc60' | 'feb4bd77-f09d-44d9-8d3a-fc8d44d93a8a' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf126e999cc58' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf126e999cc5b' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | '100' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed92fbced11eaf114c59ef02a' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf126e999cc59' | + | 'Ref' | 'Key' | 'Partner' | 'Agreement' | 'Currency' | 'Amount' | 'NetAmount' | 'TaxAmount' | 'VatRate' | 'ProfitLossCenter' | 'ExpenseType' | 'AdditionalAnalytic' | 'LegalName' | + | 'e1cib/data/Document.CreditNote?ref=aa78120ed92fbced11eaf126e999cc60' | 'feb4bd77-f09d-44d9-8d3a-fc8d44d93a8a' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf126e999cc58' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf126e999cc5b' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | '100' | '100' | '' | '' |'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed92fbced11eaf114c59ef02a' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf126e999cc59' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | @@ -451,8 +451,8 @@ Scenario: Create document DebitNote objects | 'e1cib/data/Document.DebitNote?ref=aa78120ed92fbced11eaf126e999cc5f' | 'False' | '1' | '07.09.2020 19:28:48' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '' | And I refill object tabular section "Transactions": - | 'Ref' | 'Key' | 'Partner' | 'Agreement' | 'Currency' | 'Amount' | 'ProfitLossCenter' | 'RevenueType' | 'AdditionalAnalytic' | 'LegalName' | - | 'e1cib/data/Document.DebitNote?ref=aa78120ed92fbced11eaf126e999cc5f' | '773d519a-c693-4974-aae9-7a3624fd46f9' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf126e999cc58' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf126e999cc5b' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | '1 000' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed92fbced11eaf114c59ef02a' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf126e999cc59' | + | 'Ref' | 'Key' | 'Partner' | 'Agreement' | 'Currency' | 'Amount' | 'NetAmount' | 'TaxAmount' | 'VatRate' | 'ProfitLossCenter' | 'RevenueType' | 'AdditionalAnalytic' | 'LegalName' | + | 'e1cib/data/Document.DebitNote?ref=aa78120ed92fbced11eaf126e999cc5f' | '773d519a-c693-4974-aae9-7a3624fd46f9' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf126e999cc58' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf126e999cc5b' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | '1 000' | '' | '' | '' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed92fbced11eaf114c59ef02a' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf126e999cc59' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | diff --git a/features/External/ImportDocumentsSecondPart.feature b/features/External/ImportDocumentsSecondPart.feature index bb59cd9651..810cbbecda 100644 --- a/features/External/ImportDocumentsSecondPart.feature +++ b/features/External/ImportDocumentsSecondPart.feature @@ -304,15 +304,15 @@ Scenario: Create document CreditNote objects (check movements) | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'Posted' | 'Company' | 'Author' | 'Branch' | 'Description' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | | 'e1cib/data/Document.CreditNote?ref=b762b13668d0905011eb95d6ad19358c' | 'False' | 1 | '05.04.2021 09:30:47' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '15.04.2024 17:48:22' | '15.04.2024 17:49:10' | | 'e1cib/data/Document.CreditNote?ref=b762b13668d0905011eb95d6ad19358d' | 'False' | 2 | '05.04.2021 09:30:58' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '15.04.2024 17:48:22' | '15.04.2024 17:48:24' | - | 'e1cib/data/Document.CreditNote?ref=b7b9951512c95f4111eefbdf433d2526' | 'False' | 4 | '16.04.2024 14:30:17' | 'False' |'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '16.04.2024 14:30:41' | '15.04.2024 17:49:10' | + | 'e1cib/data/Document.CreditNote?ref=b7b9951512c95f4111eefbdf433d2526' | 'False' | 4 | '16.04.2024 14:30:17' | 'False' |'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '16.04.2024 14:30:41' | '15.04.2024 17:49:10' | | 'e1cib/data/Document.CreditNote?ref=b7b9951512c95f4111eefbdf433d2527' | 'False' | 5 | '16.04.2024 14:30:45' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '16.04.2024 14:31:55' | '15.04.2024 17:48:24' | And I refill object tabular section "Transactions": - | 'Ref' | 'Partner' | 'Key' | 'Agreement' | 'Currency' | 'Amount' | 'ProfitLossCenter' | 'ExpenseType' | 'AdditionalAnalytic' | 'LegalName' | 'LegalNameContract' | 'Project' | 'BasisDocument' | - | 'e1cib/data/Document.CreditNote?ref=b762b13668d0905011eb95d6ad19358c' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1870' | 'a476c516-8dfe-4100-bbf8-1cce0467b0fa' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb77' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 500 | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed92fbced11eaf114c59ef02a' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | 'e1cib/data/Catalog.LegalNameContracts?ref=b76d88abafbd4c5e11ebf1c694dd9b44' | '' | '' | - | 'e1cib/data/Document.CreditNote?ref=b762b13668d0905011eb95d6ad19358d' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1870' | '4e364065-9c2e-46fa-af0a-e2f7f7c4b9e2' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 700 | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed92fbced11eaf114c59ef02a' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | '' | '' | '' | - | 'e1cib/data/Document.CreditNote?ref=b7b9951512c95f4111eefbdf433d2526' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1870' | 'a476c516-8dfe-4100-bbf8-1cce0467b0fa' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb77' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 120 | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed92fbced11eaf114c59ef02a' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | 'e1cib/data/Catalog.LegalNameContracts?ref=b76d88abafbd4c5e11ebf1c694dd9b44' | '' | 'e1cib/data/Document.PurchaseInvoice?ref=b76197e183b782dc11eb6d33b1126cc2' | - | 'e1cib/data/Document.CreditNote?ref=b7b9951512c95f4111eefbdf433d2527' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1870' | '4e364065-9c2e-46fa-af0a-e2f7f7c4b9e2' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 23 | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed92fbced11eaf114c59ef02a' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | '' | '' | 'e1cib/data/Document.SalesInvoice?ref=b7a78aa93c3f864f11ee4357af7774d9' | + | 'Ref' | 'Partner' | 'Key' | 'Agreement' | 'Currency' | 'Amount' | 'NetAmount' | 'TaxAmount' | 'VatRate' | 'ProfitLossCenter' | 'ExpenseType' | 'AdditionalAnalytic' | 'LegalName' | 'LegalNameContract' | 'Project' | 'BasisDocument' | + | 'e1cib/data/Document.CreditNote?ref=b762b13668d0905011eb95d6ad19358c' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1870' | 'a476c516-8dfe-4100-bbf8-1cce0467b0fa' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb77' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | '500' | '423.73' | '76.27' | 'e1cib/data/Catalog.TaxRates?ref=aa78120ed92fbced11eaf114c59ef010' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed92fbced11eaf114c59ef02a' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | 'e1cib/data/Catalog.LegalNameContracts?ref=b76d88abafbd4c5e11ebf1c694dd9b44' | '' | '' | + | 'e1cib/data/Document.CreditNote?ref=b762b13668d0905011eb95d6ad19358d' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1870' | '4e364065-9c2e-46fa-af0a-e2f7f7c4b9e2' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | '700' | '593.22' | '106.78' | 'e1cib/data/Catalog.TaxRates?ref=aa78120ed92fbced11eaf114c59ef010' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed92fbced11eaf114c59ef02a' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | '' | '' | '' | + | 'e1cib/data/Document.CreditNote?ref=b7b9951512c95f4111eefbdf433d2526' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1870' | 'a476c516-8dfe-4100-bbf8-1cce0467b0fa' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb77' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | '120' | '120' | '' | '' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed92fbced11eaf114c59ef02a' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | 'e1cib/data/Catalog.LegalNameContracts?ref=b76d88abafbd4c5e11ebf1c694dd9b44' | '' | 'e1cib/data/Document.PurchaseInvoice?ref=b76197e183b782dc11eb6d33b1126cc2' | + | 'e1cib/data/Document.CreditNote?ref=b7b9951512c95f4111eefbdf433d2527' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1870' | '4e364065-9c2e-46fa-af0a-e2f7f7c4b9e2' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | '23' | '23' | '' | '' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed92fbced11eaf114c59ef02a' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | '' | '' | 'e1cib/data/Document.SalesInvoice?ref=b7a78aa93c3f864f11ee4357af7774d9' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | @@ -340,11 +340,11 @@ Scenario: Create document DebitNote objects (check movements) | 'e1cib/data/Document.DebitNote?ref=b7b9951512c95f4111eefbdf433d2525' | 'False' | 5 | '16.04.2024 14:09:47' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '16.04.2024 14:10:24' | '15.04.2024 17:47:05' | And I refill object tabular section "Transactions": - | 'Ref' | 'Key' | 'Partner' | 'Agreement' | 'Currency' | 'Amount' | 'ProfitLossCenter' | 'RevenueType' | 'AdditionalAnalytic' | 'LegalName' | 'LegalNameContract' | 'Project' | 'BasisDocument' | - | 'e1cib/data/Document.DebitNote?ref=b762b13668d0905011eb95d6ad19358b' | '8581fd85-5543-4dc8-9d3a-d4d61f3c1d3d' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1870' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb77' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 2300 | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed92fbced11eaf114c59ef02a' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | 'e1cib/data/Catalog.LegalNameContracts?ref=b76d88abafbd4c5e11ebf1c694dd9b44' | 'e1cib/data/Catalog.Projects?ref=b7b4b80c227e00a211eeb6ca3018dc7d' | '' | - | 'e1cib/data/Document.DebitNote?ref=b762b13668d0905011eb95d6ad19358e' | 'b7d7af5b-a2a9-4f75-848c-0c33c4a0060e' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1870' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 100 | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed92fbced11eaf114c59ef02a' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | '' | '' | '' | - | 'e1cib/data/Document.DebitNote?ref=b7b9951512c95f4111eefbdf433d2524' | 'ee331f1b-6b37-448c-b065-326fd32bf083' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1870' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 100 | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | 'e1cib/data/Catalog.LegalNameContracts?ref=b76d88abafbd4c5e11ebf1c565207b8a' | '' | 'e1cib/data/Document.SalesInvoice?ref=b7a78aa93c3f864f11ee4357af7774d7' | - | 'e1cib/data/Document.DebitNote?ref=b7b9951512c95f4111eefbdf433d2525' | 'ee331f1b-6b37-448c-b065-326fd32bf083' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1870' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb77' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 100 | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | 'e1cib/data/Catalog.LegalNameContracts?ref=b76d88abafbd4c5e11ebf1c565207b8a' | '' | 'e1cib/data/Document.PurchaseInvoice?ref=b76197e183b782dc11eb6d33b1126cc2' | + | 'Ref' | 'Key' | 'Partner' | 'Agreement' | 'Currency' | 'Amount' | 'NetAmount' | 'TaxAmount' | 'VatRate' | 'ProfitLossCenter' | 'RevenueType' | 'AdditionalAnalytic' | 'LegalName' | 'LegalNameContract' | 'Project' | 'BasisDocument' | + | 'e1cib/data/Document.DebitNote?ref=b762b13668d0905011eb95d6ad19358b' | '8581fd85-5543-4dc8-9d3a-d4d61f3c1d3d' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1870' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb77' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 2300 | '1 949,15' | '350,85' | 'e1cib/data/Catalog.TaxRates?ref=aa78120ed92fbced11eaf114c59ef010' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed92fbced11eaf114c59ef02a' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | 'e1cib/data/Catalog.LegalNameContracts?ref=b76d88abafbd4c5e11ebf1c694dd9b44' | 'e1cib/data/Catalog.Projects?ref=b7b4b80c227e00a211eeb6ca3018dc7d' | '' | + | 'e1cib/data/Document.DebitNote?ref=b762b13668d0905011eb95d6ad19358e' | 'b7d7af5b-a2a9-4f75-848c-0c33c4a0060e' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1870' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 100 | '84,75' | '15,25' | 'e1cib/data/Catalog.TaxRates?ref=aa78120ed92fbced11eaf114c59ef010' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed92fbced11eaf114c59ef02a' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | '' | '' | '' | + | 'e1cib/data/Document.DebitNote?ref=b7b9951512c95f4111eefbdf433d2524' | 'ee331f1b-6b37-448c-b065-326fd32bf083' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1870' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb73' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 100 | '100' | '' | '' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | 'e1cib/data/Catalog.LegalNameContracts?ref=b76d88abafbd4c5e11ebf1c565207b8a' | '' | 'e1cib/data/Document.SalesInvoice?ref=b7a78aa93c3f864f11ee4357af7774d7' | + | 'e1cib/data/Document.DebitNote?ref=b7b9951512c95f4111eefbdf433d2525' | 'ee331f1b-6b37-448c-b065-326fd32bf083' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1870' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb77' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 100 | '100' | '' | '' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | 'e1cib/data/Catalog.LegalNameContracts?ref=b76d88abafbd4c5e11ebf1c565207b8a' | '' | 'e1cib/data/Document.PurchaseInvoice?ref=b76197e183b782dc11eb6d33b1126cc2' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | @@ -745,8 +745,8 @@ Scenario: Create document DebitNote objects (advance) | 'e1cib/data/Document.DebitNote?ref=b76790ebcbe4b2b311ebb3cc0f45eedf' | 'False' | 21 | '28.04.2021 21:50:00' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '09.04.2024 09:10:21' | '09.04.2024 10:20:37' | And I refill object tabular section "Transactions": - | 'Ref' | 'Key' | 'Partner' | 'Agreement' | 'Currency' | 'Amount' | 'ProfitLossCenter' | 'RevenueType' | 'AdditionalAnalytic' | 'LegalName' | 'LegalNameContract' | 'Project' | 'BasisDocument' | - | 'e1cib/data/Document.DebitNote?ref=b76790ebcbe4b2b311ebb3cc0f45eedf' | '582748da-ad91-4bc3-83d3-db64f4a4312c' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf124a9ba086a' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf12effe70fba' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 90 | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf124a9ba086b' | '' | '' | '' | + | 'Ref' | 'Key' | 'Partner' | 'Agreement' | 'Currency' | 'Amount' | 'NetAmount' | 'TaxAmount' | 'VatRate' | 'ProfitLossCenter' | 'RevenueType' | 'AdditionalAnalytic' | 'LegalName' | 'LegalNameContract' | 'Project' | 'BasisDocument' | + | 'e1cib/data/Document.DebitNote?ref=b76790ebcbe4b2b311ebb3cc0f45eedf' | '582748da-ad91-4bc3-83d3-db64f4a4312c' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf124a9ba086a' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf12effe70fba' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 90 | '90' | '' | '' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf124a9ba086b' | '' | '' | '' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | @@ -927,8 +927,8 @@ Scenario: Create document CreditNote objects (vendor, advance) | 'e1cib/data/Document.CreditNote?ref=b76790ebcbe4b2b311ebb4012c9e935f' | 'False' | 11 | '12.02.2021 14:00:00' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '09.04.2024 09:10:21' | '09.04.2024 10:22:25' | And I refill object tabular section "Transactions": - | 'Ref' | 'Partner' | 'Key' | 'Agreement' | 'Currency' | 'Amount' | 'ProfitLossCenter' | 'ExpenseType' | 'AdditionalAnalytic' | 'LegalName' | 'LegalNameContract' | 'Project' | 'BasisDocument' | - | 'e1cib/data/Document.CreditNote?ref=b76790ebcbe4b2b311ebb4012c9e935f' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1870' | 'b1ee5efe-6362-425c-b912-15faedf5b630' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb77' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 170 | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed95fbced11eaf114c59ef02b' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | '' | '' | '' | + | 'Ref' | 'Partner' | 'Key' | 'Agreement' | 'Currency' | 'Amount' | 'NetAmount' | 'TaxAmount' | 'VatRate' | 'ProfitLossCenter' | 'ExpenseType' | 'AdditionalAnalytic' | 'LegalName' | 'LegalNameContract' | 'Project' | 'BasisDocument' | + | 'e1cib/data/Document.CreditNote?ref=b76790ebcbe4b2b311ebb4012c9e935f' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1870' | 'b1ee5efe-6362-425c-b912-15faedf5b630' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf118bdb7bb77' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 170 | 170 | '' | '' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed95fbced11eaf114c59ef02b' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | '' | '' | '' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | @@ -1075,8 +1075,8 @@ Scenario: Create document CreditNote objects (advance, customers) | 'e1cib/data/Document.CreditNote?ref=b76790ebcbe4b2b311ebb48115309406' | 'False' | '12' | '16.02.2021 0:00:00' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | '' | And I refill object tabular section "Transactions": - | 'Ref' | 'Partner' | 'Key' | 'Agreement' | 'Currency' | 'Amount' | 'ProfitLossCenter' | 'ExpenseType' | 'AdditionalAnalytic' | 'LegalName' | - | 'e1cib/data/Document.CreditNote?ref=b76790ebcbe4b2b311ebb48115309406' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf128cde918b9' | '22377337-71e9-48b6-963c-40c8a2081932' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf128cde918ba' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | '900' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed95fbced11eaf114c59ef02b' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a3' | + | 'Ref' | 'Partner' | 'Key' | 'Agreement' | 'Currency' | 'Amount' | 'NetAmount' | 'TaxAmount' | 'VatRate' | 'ProfitLossCenter' | 'ExpenseType' | 'AdditionalAnalytic' | 'LegalName' | + | 'e1cib/data/Document.CreditNote?ref=b76790ebcbe4b2b311ebb48115309406' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf128cde918b9' | '22377337-71e9-48b6-963c-40c8a2081932' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf128cde918ba' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | '900' | 900 | '' | '' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed95fbced11eaf114c59ef02b' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a3' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | @@ -1092,9 +1092,9 @@ Scenario: Create document DebitNote objects (advance, customers) | 'e1cib/data/Document.DebitNote?ref=b768fb7fcb8cb62f11ebbc98f715ae82' | 'False' | '23' | '24.05.2021 00:00:00' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | '' | And I refill object tabular section "Transactions": - | 'Ref' | 'Key' | 'Partner' | 'Agreement' | 'Currency' | 'Amount' | 'ProfitLossCenter' | 'RevenueType' | 'AdditionalAnalytic' | 'LegalName' | - | 'e1cib/data/Document.DebitNote?ref=b76790ebcbe4b2b311ebb48115309407' | '0ff87260-21ba-45fd-9ce0-13dfcd48168b' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf128cde918b9' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf128cde918ba' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | '200' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a3' | - | 'e1cib/data/Document.DebitNote?ref=b768fb7fcb8cb62f11ebbc98f715ae82' | '0ff87260-21ba-45fd-9ce0-13dfcd48168b' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf128cde918b9' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf128cde918ba' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | '50' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a3' | + | 'Ref' | 'Key' | 'Partner' | 'Agreement' | 'Currency' | 'Amount' | 'NetAmount' | 'TaxAmount' | 'VatRate' | 'ProfitLossCenter' | 'RevenueType' | 'AdditionalAnalytic' | 'LegalName' | + | 'e1cib/data/Document.DebitNote?ref=b76790ebcbe4b2b311ebb48115309407' | '0ff87260-21ba-45fd-9ce0-13dfcd48168b' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf128cde918b9' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf128cde918ba' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | '200' | '200' | '' | '' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a3' | + | 'e1cib/data/Document.DebitNote?ref=b768fb7fcb8cb62f11ebbc98f715ae82' | '0ff87260-21ba-45fd-9ce0-13dfcd48168b' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf128cde918b9' | 'e1cib/data/Catalog.Agreements?ref=aa78120ed92fbced11eaf128cde918ba' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | '50' | '50' | '' | '' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | '' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a3' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | @@ -3805,8 +3805,8 @@ Scenario: create CreditNote (OtherPartnersTransactions) | 'e1cib/data/Document.CreditNote?ref=b79ea93fec1998ed11ee09140139bba7' | 'False' | 3 | '12.06.2023 14:56:54' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | And I refill object tabular section "Transactions": - | 'Ref' | 'Partner' | 'Key' | 'Agreement' | 'Currency' | 'Amount' | 'ProfitLossCenter' | 'ExpenseType' | 'AdditionalAnalytic' | 'LegalName' | 'LegalNameContract' | - | 'e1cib/data/Document.CreditNote?ref=b79ea93fec1998ed11ee09140139bba7' | 'e1cib/data/Catalog.Partners?ref=b79ea93fec1998ed11ee09140139bba3' | 'd0b5e13d-aba9-45ac-a08f-a35f20c4d4ec' | 'e1cib/data/Catalog.Agreements?ref=b79ea93fec1998ed11ee09140139bba5' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 100 | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed95fbced11eaf114c59ef02b' | '' | 'e1cib/data/Catalog.Companies?ref=b79ea93fec1998ed11ee09140139bba4' | '' | + | 'Ref' | 'Partner' | 'Key' | 'Agreement' | 'Currency' | 'Amount' | 'NetAmount' | 'TaxAmount' | 'VatRate' | 'ProfitLossCenter' | 'ExpenseType' | 'AdditionalAnalytic' | 'LegalName' | 'LegalNameContract' | + | 'e1cib/data/Document.CreditNote?ref=b79ea93fec1998ed11ee09140139bba7' | 'e1cib/data/Catalog.Partners?ref=b79ea93fec1998ed11ee09140139bba3' | 'd0b5e13d-aba9-45ac-a08f-a35f20c4d4ec' | 'e1cib/data/Catalog.Agreements?ref=b79ea93fec1998ed11ee09140139bba5' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 100 | 100 | '' | '' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed95fbced11eaf114c59ef02b' | '' | 'e1cib/data/Catalog.Companies?ref=b79ea93fec1998ed11ee09140139bba4' | '' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | @@ -3821,8 +3821,8 @@ Scenario: create DebitNote (OtherPartnersTransactions) | 'e1cib/data/Document.DebitNote?ref=b79ea93fec1998ed11ee09140139bba6' | 'False' | 3 | '12.06.2023 14:52:33' | 'False' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | '' | And I refill object tabular section "Transactions": - | 'Ref' | 'Key' | 'Partner' | 'Agreement' | 'Currency' | 'Amount' | 'ProfitLossCenter' | 'RevenueType' | 'AdditionalAnalytic' | 'LegalName' | 'LegalNameContract' | - | 'e1cib/data/Document.DebitNote?ref=b79ea93fec1998ed11ee09140139bba6' | 'ee331f1b-6b37-448c-b065-326fd32bf083' | 'e1cib/data/Catalog.Partners?ref=b79ea93fec1998ed11ee09140139bba0' | 'e1cib/data/Catalog.Agreements?ref=b79ea93fec1998ed11ee09140139bba2' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 100 | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | '' | 'e1cib/data/Catalog.Companies?ref=b79ea93fec1998ed11ee09140139bba1' | '' | + | 'Ref' | 'Key' | 'Partner' | 'Agreement' | 'Currency' | 'Amount' | 'NetAmount' | 'TaxAmount' | 'VatRate' | 'ProfitLossCenter' | 'RevenueType' | 'AdditionalAnalytic' | 'LegalName' | 'LegalNameContract' | + | 'e1cib/data/Document.DebitNote?ref=b79ea93fec1998ed11ee09140139bba6' | 'ee331f1b-6b37-448c-b065-326fd32bf083' | 'e1cib/data/Catalog.Partners?ref=b79ea93fec1998ed11ee09140139bba0' | 'e1cib/data/Catalog.Agreements?ref=b79ea93fec1998ed11ee09140139bba2' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 100 | 100 | '' | '' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef025' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=aa78120ed93fbced11eaf114c59ef02b' | '' | 'e1cib/data/Catalog.Companies?ref=b79ea93fec1998ed11ee09140139bba1' | '' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | diff --git a/features/External/Landed cost/ImportCatalogs.feature b/features/External/Landed cost/ImportCatalogs.feature index 2db78bf2e9..6ce7304e98 100644 --- a/features/External/Landed cost/ImportCatalogs.feature +++ b/features/External/Landed cost/ImportCatalogs.feature @@ -1035,26 +1035,24 @@ Scenario: Create catalog Taxes objects (LC) | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'e1cib/data/Catalog.TaxRates?ref=86ffd69b4676df1211ea9f651fcdcb98' | | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'e1cib/data/Catalog.TaxRates?ref=86ffd69b4676df1211ea9f652bba50d6' | | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'e1cib/data/Catalog.TaxRates?ref=86ffd69b4676df1211ea9f651fcdcb99' | - | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862c' | 'e1cib/data/Catalog.TaxRates?ref=86ffd69b4676df1211ea9f6531b259be' | - + And I refill object tabular section "UseDocuments": - | 'Ref' | 'DocumentName' | - | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'SalesOrder' | - | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'SalesInvoice' | - | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'PurchaseOrder' | - | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'PurchaseInvoice' | - | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'CashExpense' | - | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'CashRevenue' | - | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'CashRevenue' | - | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'PurchaseReturn' | - | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'PurchaseReturnOrder' | - | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'SalesReturnOrder' | - | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'SalesReturn' | - | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'RetailSalesReceipt' | - | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'RetailReturnReceipt' | - | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862c' | 'SalesOrder' | - | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862c' | 'SalesInvoice' | - + | 'Ref' | 'DocumentName' | + | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'SalesOrder' | + | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'SalesInvoice' | + | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'PurchaseOrder' | + | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'PurchaseInvoice' | + | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'CashExpense' | + | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'CashRevenue' | + | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'CashRevenue' | + | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'PurchaseReturn' | + | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'PurchaseReturnOrder' | + | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'SalesReturnOrder' | + | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'SalesReturn' | + | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'RetailSalesReceipt' | + | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'RetailReturnReceipt' | + | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'StockAdjustmentAsSurplus' | + Scenario: Create catalog InterfaceGroups objects (LC) And I check or create catalog "InterfaceGroups" objects: diff --git a/features/External/Landed cost/ImportDocuments.feature b/features/External/Landed cost/ImportDocuments.feature index ffc7a4d444..c5675e18c4 100644 --- a/features/External/Landed cost/ImportDocuments.feature +++ b/features/External/Landed cost/ImportDocuments.feature @@ -1280,10 +1280,10 @@ Scenario: Create document StockAdjustmentAsSurplus objects (LC) | 'e1cib/data/Document.StockAdjustmentAsSurplus?ref=b76e892a86cabee011ec00be81c3c113' | 'False' | 3 | '09.08.2021 12:00:00' | 'False' | 'e1cib/data/Catalog.Companies?ref=86ffd69b4676df1211ea9f63a205948c' | 'e1cib/data/Catalog.Stores?ref=86ffd69b4676df1211ea9f65021727e7' | 'e1cib/data/Catalog.Currencies?ref=86ffd69b4676df1211ea9f63629ef588' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '' | '' | And I refill object tabular section "ItemList": - | 'Ref' | 'Key' | 'Item' | 'ItemKey' | 'Unit' | 'Quantity' | 'ProfitLossCenter' | 'RevenueType' | 'BasisDocument' | 'QuantityInBaseUnit' | 'PhysicalInventory' | 'Amount' | 'UseSerialLotNumber' | - | 'e1cib/data/Document.StockAdjustmentAsSurplus?ref=b76e892a86cabee011ebff4278e33c96' | '12ee6d32-4aea-4d81-9555-b91cbf9f9e34' | 'e1cib/data/Catalog.Items?ref=86ffd69b4676df1211ea9f66ea4bc26a' | 'e1cib/data/Catalog.ItemKeys?ref=86ffd69b4676df1211ea9f672a68bfd7' | 'e1cib/data/Catalog.Units?ref=aa78120ed92fbced11eaf113ba6c1862' | 21 | 'e1cib/data/Catalog.BusinessUnits?ref=86ffd69b4676df1211ea9f65dfbee9e0' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b76e892a86cabee011ebfe98af57d4b2' | '' | 21 | '' | 2000 | 'False' | - | 'e1cib/data/Document.StockAdjustmentAsSurplus?ref=b76e892a86cabee011ebfe689f81475c' | '38d13ce9-2413-4294-b081-d490dfc3ce2f' | 'e1cib/data/Catalog.Items?ref=86ffd69b4676df1211ea9f66fb552ee5' | 'e1cib/data/Catalog.ItemKeys?ref=86ffd69b4676df1211ea9f6745c4ae3e' | 'e1cib/data/Catalog.Units?ref=aa78120ed92fbced11eaf113ba6c1862' | 10 | 'e1cib/data/Catalog.BusinessUnits?ref=86ffd69b4676df1211ea9f65dfbee9e0' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b76e892a86cabee011ebfe98af57d4b2' | '' | 10 | '' | 900 | 'False' | - | 'e1cib/data/Document.StockAdjustmentAsSurplus?ref=b76e892a86cabee011ec00be81c3c113' | '59601e1b-c12b-4500-a7c4-909407fb1368' | 'e1cib/data/Catalog.Items?ref=86ffd69b4676df1211ea9f66ea4bc26a' | 'e1cib/data/Catalog.ItemKeys?ref=86ffd69b4676df1211ea9f672a68bfd6' | 'e1cib/data/Catalog.Units?ref=aa78120ed92fbced11eaf113ba6c1862' | 10 | 'e1cib/data/Catalog.BusinessUnits?ref=86ffd69b4676df1211ea9f65dfbee9e0' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b76e892a86cabee011ebfe98af57d4b2' | '' | 10 | '' | 900 | 'False' | + | 'Ref' | 'Key' | 'Item' | 'ItemKey' | 'Unit' | 'Quantity' | 'ProfitLossCenter' | 'RevenueType' | 'BasisDocument' | 'QuantityInBaseUnit' | 'PhysicalInventory' | 'NetAmount' | 'UseSerialLotNumber' | 'TotalAmount' | 'TaxAmount' | 'Price' | 'VatRate' | + | 'e1cib/data/Document.StockAdjustmentAsSurplus?ref=b76e892a86cabee011ebff4278e33c96' | '12ee6d32-4aea-4d81-9555-b91cbf9f9e34' | 'e1cib/data/Catalog.Items?ref=86ffd69b4676df1211ea9f66ea4bc26a' | 'e1cib/data/Catalog.ItemKeys?ref=86ffd69b4676df1211ea9f672a68bfd7' | 'e1cib/data/Catalog.Units?ref=aa78120ed92fbced11eaf113ba6c1862' | 21 | 'e1cib/data/Catalog.BusinessUnits?ref=86ffd69b4676df1211ea9f65dfbee9e0' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b76e892a86cabee011ebfe98af57d4b2' | '' | 21 | '' | '1694.92' | 'False' | '2000' | '305.08' | '80.71' | 'e1cib/data/Catalog.TaxRates?ref=86ffd69b4676df1211ea9f651fcdcb98' | + | 'e1cib/data/Document.StockAdjustmentAsSurplus?ref=b76e892a86cabee011ebfe689f81475c' | '38d13ce9-2413-4294-b081-d490dfc3ce2f' | 'e1cib/data/Catalog.Items?ref=86ffd69b4676df1211ea9f66fb552ee5' | 'e1cib/data/Catalog.ItemKeys?ref=86ffd69b4676df1211ea9f6745c4ae3e' | 'e1cib/data/Catalog.Units?ref=aa78120ed92fbced11eaf113ba6c1862' | 10 | 'e1cib/data/Catalog.BusinessUnits?ref=86ffd69b4676df1211ea9f65dfbee9e0' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b76e892a86cabee011ebfe98af57d4b2' | '' | 10 | '' | '762.71' | 'False' | '900' | '137.29' | '76.27' | 'e1cib/data/Catalog.TaxRates?ref=86ffd69b4676df1211ea9f651fcdcb98' | + | 'e1cib/data/Document.StockAdjustmentAsSurplus?ref=b76e892a86cabee011ec00be81c3c113' | '59601e1b-c12b-4500-a7c4-909407fb1368' | 'e1cib/data/Catalog.Items?ref=86ffd69b4676df1211ea9f66ea4bc26a' | 'e1cib/data/Catalog.ItemKeys?ref=86ffd69b4676df1211ea9f672a68bfd6' | 'e1cib/data/Catalog.Units?ref=aa78120ed92fbced11eaf113ba6c1862' | 10 | 'e1cib/data/Catalog.BusinessUnits?ref=86ffd69b4676df1211ea9f65dfbee9e0' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b76e892a86cabee011ebfe98af57d4b2' | '' | 10 | '' | '900' | 'False' | '900' | '' | '90' | 'e1cib/data/Catalog.TaxRates?ref=86ffd69b4676df1211ea9f652bba50d6' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | @@ -1479,7 +1479,7 @@ Scenario: Create information register Taxes records (LC) And I check or create information register "Taxes" records: | 'Period' | 'Company' | 'Tax' | 'Use' | 'Priority' | 'IncludeToLandedCost' | | '01.10.2019 0:00:00' | 'e1cib/data/Catalog.Companies?ref=86ffd69b4676df1211ea9f63a205948c' | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862b' | 'True' | '1' | 'True' | - | '01.10.2019 0:00:00' | 'e1cib/data/Catalog.Companies?ref=86ffd69b4676df1211ea9f63a205948c' | 'e1cib/data/Catalog.Taxes?ref=86ffd69b4676df1211ea9f6a86a5862c' | 'True' | '2' | 'False' | + Scenario: Create information register CurrencyRates records (LC) @@ -2970,9 +2970,9 @@ Scenario: Create document StockAdjustmentAsSurplus, SalesInvoice, Sales return ( | 'e1cib/data/Document.StockAdjustmentAsSurplus?ref=b79caa5e6e0fe71811edf61b8f5ce1b0' | 'False' | 21 | '19.05.2023 11:06:39' | 'False' | 'e1cib/data/Catalog.Companies?ref=86ffd69b4676df1211ea9f63a205948c' | 'e1cib/data/Catalog.Stores?ref=86ffd69b4676df1211ea9f64f4e833d0' | 'e1cib/data/Catalog.Currencies?ref=86ffd69b4676df1211ea9f63629ef588' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '' | '' | And I refill object tabular section "ItemList": - | 'Ref' | 'Key' | 'Item' | 'ItemKey' | 'Unit' | 'Quantity' | 'ProfitLossCenter' | 'RevenueType' | 'BasisDocument' | 'QuantityInBaseUnit' | 'PhysicalInventory' | 'Amount' | 'AmountTax' | 'UseSerialLotNumber' | 'Price' | - | 'e1cib/data/Document.StockAdjustmentAsSurplus?ref=b79caa5e6e0fe71811edf61b8f5ce1b0' | '09030653-df72-467d-9874-55775d50424a' | 'e1cib/data/Catalog.Items?ref=86ffd69b4676df1211ea9f66ea4bc26a' | 'e1cib/data/Catalog.ItemKeys?ref=86ffd69b4676df1211ea9f672a68bfd7' | 'e1cib/data/Catalog.Units?ref=aa78120ed92fbced11eaf113ba6c1862' | 5 | 'e1cib/data/Catalog.BusinessUnits?ref=86ffd69b4676df1211ea9f65dfbee9e0' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b76e892a86cabee011ebfe98af57d4b2' | '' | 5 | '' | 50 | | 'False' | 10 | - | 'e1cib/data/Document.StockAdjustmentAsSurplus?ref=b79caa5e6e0fe71811edf61b8f5ce1b0' | '9da7dc39-f802-4b2d-ba68-969e66873a97' | 'e1cib/data/Catalog.Items?ref=86ffd69b4676df1211ea9f66ea4bc26a' | 'e1cib/data/Catalog.ItemKeys?ref=86ffd69b4676df1211ea9f672a68bfd8' | 'e1cib/data/Catalog.Units?ref=aa78120ed92fbced11eaf113ba6c1862' | 2 | 'e1cib/data/Catalog.BusinessUnits?ref=86ffd69b4676df1211ea9f65dfbee9e0' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b76e892a86cabee011ebfe98af57d4b2' | '' | 2 | '' | | | 'False' | | + | 'Ref' | 'Key' | 'Item' | 'ItemKey' | 'Unit' | 'Quantity' | 'ProfitLossCenter' | 'RevenueType' | 'BasisDocument' | 'QuantityInBaseUnit' | 'PhysicalInventory' | 'TotalAmount' | 'TaxAmount' | 'UseSerialLotNumber' | 'Price' | 'NetAmount' | + | 'e1cib/data/Document.StockAdjustmentAsSurplus?ref=b79caa5e6e0fe71811edf61b8f5ce1b0' | '09030653-df72-467d-9874-55775d50424a' | 'e1cib/data/Catalog.Items?ref=86ffd69b4676df1211ea9f66ea4bc26a' | 'e1cib/data/Catalog.ItemKeys?ref=86ffd69b4676df1211ea9f672a68bfd7' | 'e1cib/data/Catalog.Units?ref=aa78120ed92fbced11eaf113ba6c1862' | 5 | 'e1cib/data/Catalog.BusinessUnits?ref=86ffd69b4676df1211ea9f65dfbee9e0' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b76e892a86cabee011ebfe98af57d4b2' | '' | 5 | '' | '50' | | 'False' | '10' | '50' | + | 'e1cib/data/Document.StockAdjustmentAsSurplus?ref=b79caa5e6e0fe71811edf61b8f5ce1b0' | '9da7dc39-f802-4b2d-ba68-969e66873a97' | 'e1cib/data/Catalog.Items?ref=86ffd69b4676df1211ea9f66ea4bc26a' | 'e1cib/data/Catalog.ItemKeys?ref=86ffd69b4676df1211ea9f672a68bfd8' | 'e1cib/data/Catalog.Units?ref=aa78120ed92fbced11eaf113ba6c1862' | 2 | 'e1cib/data/Catalog.BusinessUnits?ref=86ffd69b4676df1211ea9f65dfbee9e0' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b76e892a86cabee011ebfe98af57d4b2' | '' | 2 | '' | | | 'False' | | | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | diff --git a/features/External/TestDataBase.feature b/features/External/TestDataBase.feature index dbfdbb941e..b102bd4b4a 100644 --- a/features/External/TestDataBase.feature +++ b/features/External/TestDataBase.feature @@ -209,6 +209,7 @@ Scenario: Create catalog Companies objects (test data base) | 'e1cib/data/Catalog.Companies?ref=b7b899319e68533011eeec137635c8ba' | 'False' | 24 | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b899319e68533011eeec137635c8b9' | 'Enum.CompanyLegalType.Company' | 'False' | '' | '' | 'False' | '' | '' | '' | '' | '' | | '' | | '' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'Vendor 5' | '' | 'Поставщик 5' | 'Tedarikçi 5' | '' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '15.04.2024 17:30:44' | '27.03.2024 14:45:29' | 'False' | | 'e1cib/data/Catalog.Companies?ref=b7b9951512c95f4111eefbd5567c016e' | 'False' | 25 | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b9951512c95f4111eefbd5567c016d' | 'Enum.CompanyLegalType.Company' | 'False' | '' | '' | 'False' | '' | '' | '' | '' | '' | | '' | | '' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'Customer 7' | '' | 'Клиент 7' | 'Müşteri 7' | '' | '' | '' | '' | '16.04.2024 12:41:18' | '01.01.0001 00:00:00' | 'False' | | 'e1cib/data/Catalog.Companies?ref=b7b9951512c95f4111eefbd5567c0170' | 'False' | 26 | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7b9951512c95f4111eefbd5567c016f' | 'Enum.CompanyLegalType.Company' | 'False' | '' | '' | 'False' | '' | '' | '' | '' | '' | | '' | | '' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'Vendor 6' | '' | 'Поставщик 6' | 'Tedarikçi 6' | '' | '' | '' | '' | '16.04.2024 12:42:14' | '01.01.0001 00:00:00' | 'False' | + | 'e1cib/data/Catalog.Companies?ref=b7ba865e4cc8c12b11eefd6888a5cac2' | 'False' | 41 | '' | '' | 'e1cib/data/Catalog.Partners?ref=b7ba865e4cc8c12b11eefd6888a5cac0' | 'Enum.CompanyLegalType.Company' | 'False' | '' | '' | 'False' | '' | '' | '' | '' | '' | | '' | | '' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'Tax authority' | '' | 'Налоговая администрация' | 'Vergi idaresi' | '' | '' | '' | '' | '16.04.2024 12:42:14' | '01.01.0001 00:00:00' | 'False' | And I refill object tabular section "Currencies": | 'Ref' | 'MovementType' | @@ -1566,13 +1567,13 @@ Scenario: Create document CreditNote objects (test data base) | 'e1cib/data/Document.CreditNote?ref=b7bb9478f8f9519511eefffd3ade56de' | 'False' | 6 | '21.03.2024 12:00:00' | 'False' | 'e1cib/data/Catalog.Companies?ref=b762b13668d0905011eb7663e35d7964' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=b762b13668d0905011eb7663e35d7958' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '21.04.2024 20:09:46' | '21.04.2024 19:35:18' | And I refill object tabular section "Transactions": - | 'Ref' | 'Partner' | 'Key' | 'Agreement' | 'Currency' | 'Amount' | 'ProfitLossCenter' | 'ExpenseType' | 'AdditionalAnalytic' | 'LegalName' | 'LegalNameContract' | 'Project' | 'BasisDocument' | - | 'e1cib/data/Document.CreditNote?ref=b762b13668d0905011eb767f10805dfc' | 'e1cib/data/Catalog.Partners?ref=b762b13668d0905011eb7663e35d794c' | '10982821-f436-4d7a-ab14-0674b2ffcc8e' | 'e1cib/data/Catalog.Agreements?ref=b762b13668d0905011eb76684b9f6868' | 'e1cib/data/Catalog.Currencies?ref=b762b13668d0905011eb7663e35d795e' | 15 | 'e1cib/data/Catalog.BusinessUnits?ref=b762b13668d0905011eb7663e35d7958' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b762b13668d0905011eb76684b9f6860' | '' | 'e1cib/data/Catalog.Companies?ref=b762b13668d0905011eb7674324a4a2c' | '' | '' | '' | - | 'e1cib/data/Document.CreditNote?ref=b7b5ac6d7ba6186311eec0f02fc4a1d3' | 'e1cib/data/Catalog.Partners?ref=b762b13668d0905011eb7663e35d794b' | '0e1b3536-eb18-4f12-9f54-f29b8bd341aa' | 'e1cib/data/Catalog.Agreements?ref=b762b13668d0905011eb76684b9f6867' | 'e1cib/data/Catalog.Currencies?ref=b762b13668d0905011eb7663e35d795e' | 50 | 'e1cib/data/Catalog.BusinessUnits?ref=b762b13668d0905011eb7663e35d7958' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b762b13668d0905011eb76684b9f6860' | '' | 'e1cib/data/Catalog.Companies?ref=b762b13668d0905011eb7674324a4a2a' | '' | '' | '' | - | 'e1cib/data/Document.CreditNote?ref=b7b899319e68533011eeec37f2388593' | 'e1cib/data/Catalog.Partners?ref=b7b899319e68533011eeec137635c8b9' | '0e1b3536-eb18-4f12-9f54-f29b8bd341aa' | 'e1cib/data/Catalog.Agreements?ref=b7b3f42485a6975311eeae10a2311e6d' | 'e1cib/data/Catalog.Currencies?ref=b762b13668d0905011eb7663e35d795e' | 50 | 'e1cib/data/Catalog.BusinessUnits?ref=b762b13668d0905011eb7663e35d7958' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b762b13668d0905011eb76684b9f6860' | '' | 'e1cib/data/Catalog.Companies?ref=b7b899319e68533011eeec137635c8ba' | '' | '' | '' | - | 'e1cib/data/Document.CreditNote?ref=b7b9951512c95f4111eefbd6c05be242' | 'e1cib/data/Catalog.Partners?ref=b7b9951512c95f4111eefbd5567c016d' | '0e1b3536-eb18-4f12-9f54-f29b8bd341aa' | 'e1cib/data/Catalog.Agreements?ref=b762b13668d0905011eb76684b9f6867' | 'e1cib/data/Catalog.Currencies?ref=b762b13668d0905011eb7663e35d795e' | 75 | 'e1cib/data/Catalog.BusinessUnits?ref=b762b13668d0905011eb7663e35d7958' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b762b13668d0905011eb76684b9f6860' | '' | 'e1cib/data/Catalog.Companies?ref=b7b9951512c95f4111eefbd5567c016e' | '' | '' | 'e1cib/data/Document.SalesInvoice?ref=b7b9951512c95f4111eefbd5567c0174' | - | 'e1cib/data/Document.CreditNote?ref=b7b9951512c95f4111eefbd6c05be243' | 'e1cib/data/Catalog.Partners?ref=b7b9951512c95f4111eefbd5567c016f' | '0e1b3536-eb18-4f12-9f54-f29b8bd341aa' | 'e1cib/data/Catalog.Agreements?ref=b7b3f42485a6975311eeae10a2311e6d' | 'e1cib/data/Catalog.Currencies?ref=b762b13668d0905011eb7663e35d795e' | 80 | 'e1cib/data/Catalog.BusinessUnits?ref=b762b13668d0905011eb7663e35d7958' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b762b13668d0905011eb76684b9f6860' | '' | 'e1cib/data/Catalog.Companies?ref=b7b9951512c95f4111eefbd5567c0170' | '' | '' | 'e1cib/data/Document.PurchaseInvoice?ref=b7b9951512c95f4111eefbd5567c0172' | - | 'e1cib/data/Document.CreditNote?ref=b7bb9478f8f9519511eefffd3ade56de' | 'e1cib/data/Catalog.Partners?ref=b7b4b80c227e00a211eeafaa57d74915' | '0e1b3536-eb18-4f12-9f54-f29b8bd341aa' | 'e1cib/data/Catalog.Agreements?ref=b7b4b80c227e00a211eeafaa57d74917' | 'e1cib/data/Catalog.Currencies?ref=b762b13668d0905011eb7663e35d795e' | 100 | 'e1cib/data/Catalog.BusinessUnits?ref=b762b13668d0905011eb7663e35d7958' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b762b13668d0905011eb76684b9f6860' | '' | 'e1cib/data/Catalog.Companies?ref=b7b4b80c227e00a211eeafaa57d74916' | '' | '' | '' | + | 'Ref' | 'Partner' | 'Key' | 'Agreement' | 'Currency' | 'Amount' | 'NetAmount' | 'TaxAmount' | 'VatRate' | 'ProfitLossCenter' | 'ExpenseType' | 'AdditionalAnalytic' | 'LegalName' | 'LegalNameContract' | 'Project' | 'BasisDocument' | + | 'e1cib/data/Document.CreditNote?ref=b762b13668d0905011eb767f10805dfc' | 'e1cib/data/Catalog.Partners?ref=b762b13668d0905011eb7663e35d794c' | '10982821-f436-4d7a-ab14-0674b2ffcc8e' | 'e1cib/data/Catalog.Agreements?ref=b762b13668d0905011eb76684b9f6868' | 'e1cib/data/Catalog.Currencies?ref=b762b13668d0905011eb7663e35d795e' | 15 | 15 | '' | '' | 'e1cib/data/Catalog.BusinessUnits?ref=b762b13668d0905011eb7663e35d7958' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b762b13668d0905011eb76684b9f6860' | '' | 'e1cib/data/Catalog.Companies?ref=b762b13668d0905011eb7674324a4a2c' | '' | '' | '' | + | 'e1cib/data/Document.CreditNote?ref=b7b5ac6d7ba6186311eec0f02fc4a1d3' | 'e1cib/data/Catalog.Partners?ref=b762b13668d0905011eb7663e35d794b' | '0e1b3536-eb18-4f12-9f54-f29b8bd341aa' | 'e1cib/data/Catalog.Agreements?ref=b762b13668d0905011eb76684b9f6867' | 'e1cib/data/Catalog.Currencies?ref=b762b13668d0905011eb7663e35d795e' | 50 | 50 | '' | '' | 'e1cib/data/Catalog.BusinessUnits?ref=b762b13668d0905011eb7663e35d7958' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b762b13668d0905011eb76684b9f6860' | '' | 'e1cib/data/Catalog.Companies?ref=b762b13668d0905011eb7674324a4a2a' | '' | '' | '' | + | 'e1cib/data/Document.CreditNote?ref=b7b899319e68533011eeec37f2388593' | 'e1cib/data/Catalog.Partners?ref=b7b899319e68533011eeec137635c8b9' | '0e1b3536-eb18-4f12-9f54-f29b8bd341aa' | 'e1cib/data/Catalog.Agreements?ref=b7b3f42485a6975311eeae10a2311e6d' | 'e1cib/data/Catalog.Currencies?ref=b762b13668d0905011eb7663e35d795e' | 50 | 50 | '' | '' | 'e1cib/data/Catalog.BusinessUnits?ref=b762b13668d0905011eb7663e35d7958' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b762b13668d0905011eb76684b9f6860' | '' | 'e1cib/data/Catalog.Companies?ref=b7b899319e68533011eeec137635c8ba' | '' | '' | '' | + | 'e1cib/data/Document.CreditNote?ref=b7b9951512c95f4111eefbd6c05be242' | 'e1cib/data/Catalog.Partners?ref=b7b9951512c95f4111eefbd5567c016d' | '0e1b3536-eb18-4f12-9f54-f29b8bd341aa' | 'e1cib/data/Catalog.Agreements?ref=b762b13668d0905011eb76684b9f6867' | 'e1cib/data/Catalog.Currencies?ref=b762b13668d0905011eb7663e35d795e' | 75 | 75 | '' | '' | 'e1cib/data/Catalog.BusinessUnits?ref=b762b13668d0905011eb7663e35d7958' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b762b13668d0905011eb76684b9f6860' | '' | 'e1cib/data/Catalog.Companies?ref=b7b9951512c95f4111eefbd5567c016e' | '' | '' | 'e1cib/data/Document.SalesInvoice?ref=b7b9951512c95f4111eefbd5567c0174' | + | 'e1cib/data/Document.CreditNote?ref=b7b9951512c95f4111eefbd6c05be243' | 'e1cib/data/Catalog.Partners?ref=b7b9951512c95f4111eefbd5567c016f' | '0e1b3536-eb18-4f12-9f54-f29b8bd341aa' | 'e1cib/data/Catalog.Agreements?ref=b7b3f42485a6975311eeae10a2311e6d' | 'e1cib/data/Catalog.Currencies?ref=b762b13668d0905011eb7663e35d795e' | 80 | 80 | '' | '' | 'e1cib/data/Catalog.BusinessUnits?ref=b762b13668d0905011eb7663e35d7958' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b762b13668d0905011eb76684b9f6860' | '' | 'e1cib/data/Catalog.Companies?ref=b7b9951512c95f4111eefbd5567c0170' | '' | '' | 'e1cib/data/Document.PurchaseInvoice?ref=b7b9951512c95f4111eefbd5567c0172' | + | 'e1cib/data/Document.CreditNote?ref=b7bb9478f8f9519511eefffd3ade56de' | 'e1cib/data/Catalog.Partners?ref=b7b4b80c227e00a211eeafaa57d74915' | '0e1b3536-eb18-4f12-9f54-f29b8bd341aa' | 'e1cib/data/Catalog.Agreements?ref=b7b4b80c227e00a211eeafaa57d74917' | 'e1cib/data/Catalog.Currencies?ref=b762b13668d0905011eb7663e35d795e' | 100 | 100 | '' | '' | 'e1cib/data/Catalog.BusinessUnits?ref=b762b13668d0905011eb7663e35d7958' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b762b13668d0905011eb76684b9f6860' | '' | 'e1cib/data/Catalog.Companies?ref=b7b4b80c227e00a211eeafaa57d74916' | '' | '' | '' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | @@ -1614,13 +1615,13 @@ Scenario: Create document DebitNote objects (test data base) | 'e1cib/data/Document.DebitNote?ref=b7bb9478f8f9519511ef0005cd54ac76' | 'False' | 6 | '21.04.2024 20:40:55' | 'False' | 'e1cib/data/Catalog.Companies?ref=b762b13668d0905011eb7663e35d7964' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'e1cib/data/Catalog.BusinessUnits?ref=b762b13668d0905011eb7663e35d795a' | '' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '21.04.2024 20:43:13' | '21.04.2024 20:46:12' | And I refill object tabular section "Transactions": - | 'Ref' | 'Key' | 'Partner' | 'Agreement' | 'Currency' | 'Amount' | 'ProfitLossCenter' | 'RevenueType' | 'AdditionalAnalytic' | 'LegalName' | 'LegalNameContract' | 'Project' | 'BasisDocument' | - | 'e1cib/data/Document.DebitNote?ref=b762b13668d0905011eb767f10805dfd' | 'e104c309-ceec-4af1-b13a-f76fc72bfabb' | 'e1cib/data/Catalog.Partners?ref=b762b13668d0905011eb7663e35d794d' | 'e1cib/data/Catalog.Agreements?ref=b762b13668d0905011eb76684b9f6870' | 'e1cib/data/Catalog.Currencies?ref=b762b13668d0905011eb7663e35d795e' | 25 | 'e1cib/data/Catalog.BusinessUnits?ref=b762b13668d0905011eb7663e35d7958' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b762b13668d0905011eb76684b9f685f' | '' | 'e1cib/data/Catalog.Companies?ref=b762b13668d0905011eb766bf96b276f' | '' | '' | '' | - | 'e1cib/data/Document.DebitNote?ref=b7b5ac6d7ba6186311eec0f02fc4a1d4' | 'e104c309-ceec-4af1-b13a-f76fc72bfabb' | 'e1cib/data/Catalog.Partners?ref=b762b13668d0905011eb7663e35d794b' | 'e1cib/data/Catalog.Agreements?ref=b762b13668d0905011eb76684b9f6867' | 'e1cib/data/Catalog.Currencies?ref=b762b13668d0905011eb7663e35d795e' | 40 | 'e1cib/data/Catalog.BusinessUnits?ref=b762b13668d0905011eb7663e35d7958' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b762b13668d0905011eb76684b9f685f' | '' | 'e1cib/data/Catalog.Companies?ref=b762b13668d0905011eb7674324a4a2a' | '' | '' | '' | - | 'e1cib/data/Document.DebitNote?ref=b7b899319e68533011eeec37f2388594' | 'e104c309-ceec-4af1-b13a-f76fc72bfabb' | 'e1cib/data/Catalog.Partners?ref=b7b899319e68533011eeec137635c8b9' | 'e1cib/data/Catalog.Agreements?ref=b7b3f42485a6975311eeae10a2311e6d' | 'e1cib/data/Catalog.Currencies?ref=b762b13668d0905011eb7663e35d795e' | 50 | 'e1cib/data/Catalog.BusinessUnits?ref=b762b13668d0905011eb7663e35d7958' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b762b13668d0905011eb76684b9f685f' | '' | 'e1cib/data/Catalog.Companies?ref=b7b899319e68533011eeec137635c8ba' | '' | '' | '' | - | 'e1cib/data/Document.DebitNote?ref=b7b9951512c95f4111eefbd6c05be240' | 'e104c309-ceec-4af1-b13a-f76fc72bfabb' | 'e1cib/data/Catalog.Partners?ref=b7b9951512c95f4111eefbd5567c016d' | 'e1cib/data/Catalog.Agreements?ref=b762b13668d0905011eb76684b9f6867' | 'e1cib/data/Catalog.Currencies?ref=b762b13668d0905011eb7663e35d795e' | 100 | 'e1cib/data/Catalog.BusinessUnits?ref=b762b13668d0905011eb7663e35d7958' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b762b13668d0905011eb76684b9f685f' | '' | 'e1cib/data/Catalog.Companies?ref=b7b9951512c95f4111eefbd5567c016e' | '' | '' | 'e1cib/data/Document.SalesInvoice?ref=b7b9951512c95f4111eefbd5567c0174' | - | 'e1cib/data/Document.DebitNote?ref=b7b9951512c95f4111eefbd6c05be241' | 'e104c309-ceec-4af1-b13a-f76fc72bfabb' | 'e1cib/data/Catalog.Partners?ref=b7b9951512c95f4111eefbd5567c016f' | 'e1cib/data/Catalog.Agreements?ref=b7b3f42485a6975311eeae10a2311e6d' | 'e1cib/data/Catalog.Currencies?ref=b762b13668d0905011eb7663e35d795e' | 100 | 'e1cib/data/Catalog.BusinessUnits?ref=b762b13668d0905011eb7663e35d7958' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b762b13668d0905011eb76684b9f685f' | '' | 'e1cib/data/Catalog.Companies?ref=b7b9951512c95f4111eefbd5567c0170' | '' | '' | 'e1cib/data/Document.PurchaseInvoice?ref=b7b9951512c95f4111eefbd5567c0172' | - | 'e1cib/data/Document.DebitNote?ref=b7bb9478f8f9519511ef0005cd54ac76' | 'e104c309-ceec-4af1-b13a-f76fc72bfabb' | 'e1cib/data/Catalog.Partners?ref=b7b7f539c58cb9f711eee769cbd12759' | 'e1cib/data/Catalog.Agreements?ref=b7b7f539c58cb9f711eee769cbd1275b' | 'e1cib/data/Catalog.Currencies?ref=b762b13668d0905011eb7663e35d795e' | 150 | 'e1cib/data/Catalog.BusinessUnits?ref=b762b13668d0905011eb7663e35d795a' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b762b13668d0905011eb76684b9f685f' | '' | 'e1cib/data/Catalog.Companies?ref=b7b7f539c58cb9f711eee769cbd1275a' | '' | '' | '' | + | 'Ref' | 'Key' | 'Partner' | 'Agreement' | 'Currency' | 'Amount' | 'NetAmount' | 'VatRate' | 'TaxAmount' | 'ProfitLossCenter' | 'RevenueType' | 'AdditionalAnalytic' | 'LegalName' | 'LegalNameContract' | 'Project' | 'BasisDocument' | + | 'e1cib/data/Document.DebitNote?ref=b762b13668d0905011eb767f10805dfd' | 'e104c309-ceec-4af1-b13a-f76fc72bfabb' | 'e1cib/data/Catalog.Partners?ref=b762b13668d0905011eb7663e35d794d' | 'e1cib/data/Catalog.Agreements?ref=b762b13668d0905011eb76684b9f6870' | 'e1cib/data/Catalog.Currencies?ref=b762b13668d0905011eb7663e35d795e' | 25 | 25 | | | 'e1cib/data/Catalog.BusinessUnits?ref=b762b13668d0905011eb7663e35d7958' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b762b13668d0905011eb76684b9f685f' | '' | 'e1cib/data/Catalog.Companies?ref=b762b13668d0905011eb766bf96b276f' | '' | '' | '' | + | 'e1cib/data/Document.DebitNote?ref=b7b5ac6d7ba6186311eec0f02fc4a1d4' | 'e104c309-ceec-4af1-b13a-f76fc72bfabb' | 'e1cib/data/Catalog.Partners?ref=b762b13668d0905011eb7663e35d794b' | 'e1cib/data/Catalog.Agreements?ref=b762b13668d0905011eb76684b9f6867' | 'e1cib/data/Catalog.Currencies?ref=b762b13668d0905011eb7663e35d795e' | 40 | 40 | | | 'e1cib/data/Catalog.BusinessUnits?ref=b762b13668d0905011eb7663e35d7958' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b762b13668d0905011eb76684b9f685f' | '' | 'e1cib/data/Catalog.Companies?ref=b762b13668d0905011eb7674324a4a2a' | '' | '' | '' | + | 'e1cib/data/Document.DebitNote?ref=b7b899319e68533011eeec37f2388594' | 'e104c309-ceec-4af1-b13a-f76fc72bfabb' | 'e1cib/data/Catalog.Partners?ref=b7b899319e68533011eeec137635c8b9' | 'e1cib/data/Catalog.Agreements?ref=b7b3f42485a6975311eeae10a2311e6d' | 'e1cib/data/Catalog.Currencies?ref=b762b13668d0905011eb7663e35d795e' | 50 | 50 | | | 'e1cib/data/Catalog.BusinessUnits?ref=b762b13668d0905011eb7663e35d7958' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b762b13668d0905011eb76684b9f685f' | '' | 'e1cib/data/Catalog.Companies?ref=b7b899319e68533011eeec137635c8ba' | '' | '' | '' | + | 'e1cib/data/Document.DebitNote?ref=b7b9951512c95f4111eefbd6c05be240' | 'e104c309-ceec-4af1-b13a-f76fc72bfabb' | 'e1cib/data/Catalog.Partners?ref=b7b9951512c95f4111eefbd5567c016d' | 'e1cib/data/Catalog.Agreements?ref=b762b13668d0905011eb76684b9f6867' | 'e1cib/data/Catalog.Currencies?ref=b762b13668d0905011eb7663e35d795e' | 100 | 100 | | | 'e1cib/data/Catalog.BusinessUnits?ref=b762b13668d0905011eb7663e35d7958' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b762b13668d0905011eb76684b9f685f' | '' | 'e1cib/data/Catalog.Companies?ref=b7b9951512c95f4111eefbd5567c016e' | '' | '' | 'e1cib/data/Document.SalesInvoice?ref=b7b9951512c95f4111eefbd5567c0174' | + | 'e1cib/data/Document.DebitNote?ref=b7b9951512c95f4111eefbd6c05be241' | 'e104c309-ceec-4af1-b13a-f76fc72bfabb' | 'e1cib/data/Catalog.Partners?ref=b7b9951512c95f4111eefbd5567c016f' | 'e1cib/data/Catalog.Agreements?ref=b7b3f42485a6975311eeae10a2311e6d' | 'e1cib/data/Catalog.Currencies?ref=b762b13668d0905011eb7663e35d795e' | 100 | 100 | | | 'e1cib/data/Catalog.BusinessUnits?ref=b762b13668d0905011eb7663e35d7958' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b762b13668d0905011eb76684b9f685f' | '' | 'e1cib/data/Catalog.Companies?ref=b7b9951512c95f4111eefbd5567c0170' | '' | '' | 'e1cib/data/Document.PurchaseInvoice?ref=b7b9951512c95f4111eefbd5567c0172' | + | 'e1cib/data/Document.DebitNote?ref=b7bb9478f8f9519511ef0005cd54ac76' | 'e104c309-ceec-4af1-b13a-f76fc72bfabb' | 'e1cib/data/Catalog.Partners?ref=b7b7f539c58cb9f711eee769cbd12759' | 'e1cib/data/Catalog.Agreements?ref=b7b7f539c58cb9f711eee769cbd1275b' | 'e1cib/data/Catalog.Currencies?ref=b762b13668d0905011eb7663e35d795e' | 150 | 150 | | | 'e1cib/data/Catalog.BusinessUnits?ref=b762b13668d0905011eb7663e35d795a' | 'e1cib/data/Catalog.ExpenseAndRevenueTypes?ref=b762b13668d0905011eb76684b9f685f' | '' | 'e1cib/data/Catalog.Companies?ref=b7b7f539c58cb9f711eee769cbd1275a' | '' | '' | '' | And I refill object tabular section "Currencies": | 'Ref' | 'Key' | 'CurrencyFrom' | 'Rate' | 'ReverseRate' | 'ShowReverseRate' | 'Multiplicity' | 'MovementType' | 'Amount' | 'IsFixed' | @@ -3597,114 +3598,117 @@ Scenario: Create chart of accounts Basic objects with LedgerTypeVariants (Basic // InformationRegister.LedgerTypeOperations And I check or create information register "LedgerTypeOperations" records: - | 'Period' | 'LedgerType' | 'AccountingOperation' | 'Use' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankPayment_DR_R1020B_AdvancesToVendors_R1021B_VendorsTransactions_CR_R3010B_CashOnHand' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankPayment_DR_R1021B_VendorsTransactions_CR_R1020B_AdvancesToVendors' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankPayment_DR_R2020B_AdvancesFromCustomers_R2021B_CustomersTransactions_CR_R3010B_CashOnHand' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankPayment_DR_R2021B_CustomersTransactions_CR_R2020B_AdvancesFromCustomers' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankPayment_DR_R3021B_CashInTransitIncoming_CR_R3010B_CashOnHand_CashTransferOrder' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankPayment_DR_R3021B_CashInTransitIncoming_CR_R3010B_CashOnHand_CurrencyExchange' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankPayment_DR_R5015B_OtherPartnersTransactions_CR_R3010B_CashOnHand' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankPayment_DR_R5022T_Expenses_CR_R3010B_CashOnHand' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankPayment_DR_R9510B_SalaryPayment_CR_R3010B_CashOnHand' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankPayment_DR_R3027B_EmployeeCashAdvance_CR_R3010B_CashOnHand' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankReceipt_DR_R3010B_CashOnHand_CR_R2020B_AdvancesFromCustomers_R2021B_CustomersTransactions' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankReceipt_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransactions' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankReceipt_DR_R3010B_CashOnHand_CR_R1020B_AdvancesToVendors_R1021B_VendorsTransactions' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankReceipt_DR_R1020B_AdvancesToVendors_CR_R1021B_VendorsTransactions' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankReceipt_DR_R3010B_CashOnHand_CR_R3021B_CashInTransitIncoming_CashTransferOrder' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankReceipt_DR_R3010B_CashOnHand_CR_R3021B_CashInTransitIncoming_CurrencyExchange' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankReceipt_DR_R3021B_CashInTransit_CR_R5021T_Revenues' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankReceipt_DR_R5022T_Expenses_CR_R3021B_CashInTransit' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankReceipt_DR_R3010B_CashOnHand_CR_R5015B_OtherPartnersTransactions' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankReceipt_DR_R3010B_CashOnHand_CR_R5021_Revenues' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=PurchaseInvoice_DR_R4050B_StockInventory_R5022T_Expenses_CR_R1021B_VendorsTransactions' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=PurchaseInvoice_DR_R1021B_VendorsTransactions_CR_R1020B_AdvancesToVendors' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=PurchaseInvoice_DR_R1040B_TaxesOutgoing_CR_R1021B_VendorsTransactions' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=RetailSalesReceipt_DR_R5022T_Expenses_CR_R4050B_StockInventory' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=SalesInvoice_DR_R2021B_CustomersTransactions_CR_R5021T_Revenues' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=SalesInvoice_DR_R5021T_Revenues_CR_R2040B_TaxesIncoming' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=SalesInvoice_DR_R5022T_Expenses_CR_R4050B_StockInventory' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=SalesInvoice_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransactions' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R2020B_AdvancesFromCustomers_CR_R5021T_Revenues' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R2020B_AdvancesFromCustomers' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashPayment_DR_R1020B_AdvancesToVendors_R1021B_VendorsTransactions_CR_R3010B_CashOnHand' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashPayment_DR_R1021B_VendorsTransactions_CR_R1020B_AdvancesToVendors' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashPayment_DR_R2020B_AdvancesFromCustomers_R2021B_CustomersTransactions_CR_R3010B_CashOnHand' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashPayment_DR_R2021B_CustomersTransactions_CR_R2020B_AdvancesFromCustomers' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashPayment_DR_R3021B_CashInTransitIncoming_CR_R3010B_CashOnHand_CashTransferOrder' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashPayment_DR_R5015B_OtherPartnersTransactions_CR_R3010B_CashOnHand' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashPayment_DR_R9510B_SalaryPayment_CR_R3010B_CashOnHand' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashPayment_DR_R3027B_EmployeeCashAdvance_CR_R3010B_CashOnHand' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashReceipt_DR_R3010B_CashOnHand_CR_R2020B_AdvancesFromCustomers_R2021B_CustomersTransactions' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashReceipt_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransactions' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashReceipt_DR_R3010B_CashOnHand_CR_R1020B_AdvancesToVendors_R1021B_VendorsTransactions' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashReceipt_DR_R1020B_AdvancesToVendors_CR_R1021B_VendorsTransactions' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashReceipt_DR_R3010B_CashOnHand_CR_R3021B_CashInTransitIncoming_CashTransferOrder' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashReceipt_DR_R3010B_CashOnHand_CR_R5015B_OtherPartnersTransactions' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashExpense_DR_R5022T_Expenses_CR_R3010B_CashOnHand' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashRevenue_DR_R3010B_CashOnHand_CR_R5021_Revenues' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=DebitNote_DR_R1021B_VendorsTransactions_CR_R5021_Revenues' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=DebitNote_DR_R1021B_VendorsTransactions_CR_R1020B_AdvancesToVendors' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=DebitNote_DR_R2021B_CustomersTransactions_CR_R5021_Revenues' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=DebitNote_DR_R5015B_OtherPartnersTransactions_CR_R5021_Revenues' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CreditNote_DR_R5022T_Expenses_CR_R2021B_CustomersTransactions' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CreditNote_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransactions' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CreditNote_DR_R5022T_Expenses_CR_R1021B_VendorsTransactions' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CreditNote_DR_R1021B_VendorsTransactions_CR_R1020B_AdvancesToVendors' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CreditNote_DR_R5022T_Expenses_CR_R5015B_OtherPartnersTransactions' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=MoneyTransfer_DR_R3010B_CashOnHand_CR_R3010B_CashOnHand' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=MoneyTransfer_DR_R3021B_CashInTransit_CR_R3010B_CashOnHand' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=MoneyTransfer_DR_R3010B_CashOnHand_CR_R3021B_CashInTransit' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=MoneyTransfer_DR_R3021B_CashInTransit_CR_R5021T_Revenues' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=MoneyTransfer_DR_R5022T_Expenses_CR_R3021B_CashInTransit' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CommissioningOfFixedAsset_DR_R8510B_BookValueOfFixedAsset_CR_R4050B_StockInventory' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ModernizationOfFixedAsset_DR_R8510B_BookValueOfFixedAsset_CR_R4050B_StockInventory' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ModernizationOfFixedAsset_DR_R4050B_StockInventory_CR_R8510B_BookValueOfFixedAsset' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=DecommissioningOfFixedAsset_DR_R4050B_StockInventory_CR_R8510B_BookValueOfFixedAsset' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=FixedAssetTransfer_DR_R8510B_BookValueOfFixedAsset_CR_R8510B_BookValueOfFixedAsset' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=DepreciationCalculation_DR_R5022T_Expenses_CR_DepreciationFixedAsset' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=Payroll_DR_R5022T_Expenses_CR_R9510B_SalaryPayment_Accrual' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=Payroll_DR_R9510B_SalaryPayment_CR_R5015B_OtherPartnersTransactions_Taxes' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=Payroll_DR_R9510B_SalaryPayment_CR_R5021T_Revenues_Deduction_IsRevenue' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=Payroll_DR_R5022T_Expenses_CR_R9510B_SalaryPayment_Deduction_IsNotRevenue' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=Payroll_DR_R9510B_SalaryPayment_CR_R3027B_EmployeeCashAdvance' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=Payroll_DR_R5022T_Expenses_CR_R5015B_OtherPartnersTransactions_Taxes' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ExpenseAccruals_DR_R5022T_Expenses_CR_R6070T_OtherPeriodsExpenses' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ExpenseAccruals_DR_R6070T_OtherPeriodsExpenses_CR_R5022T_Expenses' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=RevenueAccruals_DR_R6080T_OtherPeriodsRevenues_CR_R5021T_Revenues' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=RevenueAccruals_DR_R5021T_Revenues_CR_R6080T_OtherPeriodsRevenues' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=EmployeeCashAdvance_DR_R5022T_Expenses_CR_R3027B_EmployeeCashAdvance' | 'True' | - | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=EmployeeCashAdvance_DR_R1021B_VendorsTransactions_CR_R3027B_EmployeeCashAdvance' | 'True' | - | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R3010B_CashOnHand' | 'True' | - | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R3010B_CashOnHand_CR_R5021T_Revenues' | 'True' | - | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R1021B_VendorsTransactions' | 'True' | - | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R1021B_VendorsTransactions_CR_R5021T_Revenues' | 'True' | - | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R9510B_SalaryPayment' | 'True' | - | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R9510B_SalaryPayment_CR_R5021T_Revenues' | 'True' | - | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R1020B_AdvancesToVendors' | 'True' | - | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R1020B_AdvancesToVendors_CR_R5021T_Revenues' | 'True' | - | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R2021B_CustomersTransactions' | 'True' | - | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R2021B_CustomersTransactions_CR_R5021T_Revenues' | 'True' | - | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R3015B_CashAdvance' | 'True' | - | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R3015B_CashAdvance_CR_R5021T_Revenues' | 'True' | - | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R3027B_EmployeeCashAdvance' | 'True' | - | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R3027B_EmployeeCashAdvance_CR_R5021T_Revenues' | 'True' | - | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R5015B_OtherPartnersTransactions' | 'True' | - | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R5015B_OtherPartnersTransactions_CR_R5021T_Revenues' | 'True' | - | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R8510B_BookValueOfFixedAsset' | 'True' | - | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R8510B_BookValueOfFixedAsset_CR_R5021T_Revenues' | 'True' | - | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=DebitCreditNote_R5020B_PartnersBalance' | 'True' | - | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=DebitCreditNote_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransactions_Offset' | 'True' | - | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=DebitCreditNote_DR_R1021B_VendorsTransactions_CR_R1020B_AdvancesToVendors_Offset' | 'True' | - | '01.03.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=SalesReturn_DR_R2021B_CustomersTransactions_CR_R2020B_AdvancesFromCustomers' | 'True' | - | '01.03.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=SalesReturn_DR_R5021T_Revenues_CR_R2021B_CustomersTransactions' | 'True' | - | '01.03.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=SalesReturn_DR_R5021T_Revenues_CR_R1040B_TaxesOutgoing' | 'True' | - | '01.03.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=SalesReturn_DR_R5022T_Expenses_CR_R4050B_StockInventory' | 'True' | - | '01.03.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=PurchaseReturn_DR_R1020B_AdvancesToVendors_CR_R1021B_VendorsTransactions' | 'True' | - | '01.03.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=PurchaseReturn_DR_R1021B_VendorsTransactions_CR_R4050B_StockInventory' | 'True' | - | '01.03.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=PurchaseReturn_DR_R2040B_TaxesIncoming_CR_R1021B_VendorsTransactions' | 'True' | - + | 'Period' | 'LedgerType' | 'AccountingOperation' | 'Use' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankPayment_DR_R1020B_AdvancesToVendors_R1021B_VendorsTransactions_CR_R3010B_CashOnHand' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankPayment_DR_R1021B_VendorsTransactions_CR_R1020B_AdvancesToVendors' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankPayment_DR_R2020B_AdvancesFromCustomers_R2021B_CustomersTransactions_CR_R3010B_CashOnHand' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankPayment_DR_R2021B_CustomersTransactions_CR_R2020B_AdvancesFromCustomers' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankPayment_DR_R3021B_CashInTransitIncoming_CR_R3010B_CashOnHand_CashTransferOrder' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankPayment_DR_R3021B_CashInTransitIncoming_CR_R3010B_CashOnHand_CurrencyExchange' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankPayment_DR_R5015B_OtherPartnersTransactions_CR_R3010B_CashOnHand' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankPayment_DR_R5022T_Expenses_CR_R3010B_CashOnHand' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankPayment_DR_R9510B_SalaryPayment_CR_R3010B_CashOnHand' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankPayment_DR_R3027B_EmployeeCashAdvance_CR_R3010B_CashOnHand' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankReceipt_DR_R3010B_CashOnHand_CR_R2020B_AdvancesFromCustomers_R2021B_CustomersTransactions' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankReceipt_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransactions' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankReceipt_DR_R3010B_CashOnHand_CR_R1020B_AdvancesToVendors_R1021B_VendorsTransactions' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankReceipt_DR_R1020B_AdvancesToVendors_CR_R1021B_VendorsTransactions' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankReceipt_DR_R3010B_CashOnHand_CR_R3021B_CashInTransitIncoming_CashTransferOrder' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankReceipt_DR_R3010B_CashOnHand_CR_R3021B_CashInTransitIncoming_CurrencyExchange' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankReceipt_DR_R3021B_CashInTransit_CR_R5021T_Revenues' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankReceipt_DR_R5022T_Expenses_CR_R3021B_CashInTransit' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankReceipt_DR_R3010B_CashOnHand_CR_R5015B_OtherPartnersTransactions' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=BankReceipt_DR_R3010B_CashOnHand_CR_R5021_Revenues' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=PurchaseInvoice_DR_R4050B_StockInventory_R5022T_Expenses_CR_R1021B_VendorsTransactions' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=PurchaseInvoice_DR_R1021B_VendorsTransactions_CR_R1020B_AdvancesToVendors' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=PurchaseInvoice_DR_R1040B_TaxesOutgoing_CR_R1021B_VendorsTransactions' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=RetailSalesReceipt_DR_R5022T_Expenses_CR_R4050B_StockInventory' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=SalesInvoice_DR_R2021B_CustomersTransactions_CR_R5021T_Revenues' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=SalesInvoice_DR_R2021B_CustomersTransactions_CR_R2040B_TaxesIncoming' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=SalesInvoice_DR_R5022T_Expenses_CR_R4050B_StockInventory' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=SalesInvoice_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransactions' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R2020B_AdvancesFromCustomers_CR_R5021T_Revenues' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R2020B_AdvancesFromCustomers' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashPayment_DR_R1020B_AdvancesToVendors_R1021B_VendorsTransactions_CR_R3010B_CashOnHand' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashPayment_DR_R1021B_VendorsTransactions_CR_R1020B_AdvancesToVendors' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashPayment_DR_R2020B_AdvancesFromCustomers_R2021B_CustomersTransactions_CR_R3010B_CashOnHand' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashPayment_DR_R2021B_CustomersTransactions_CR_R2020B_AdvancesFromCustomers' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashPayment_DR_R3021B_CashInTransitIncoming_CR_R3010B_CashOnHand_CashTransferOrder' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashPayment_DR_R5015B_OtherPartnersTransactions_CR_R3010B_CashOnHand' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashPayment_DR_R9510B_SalaryPayment_CR_R3010B_CashOnHand' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashPayment_DR_R3027B_EmployeeCashAdvance_CR_R3010B_CashOnHand' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashReceipt_DR_R3010B_CashOnHand_CR_R2020B_AdvancesFromCustomers_R2021B_CustomersTransactions' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashReceipt_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransactions' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashReceipt_DR_R3010B_CashOnHand_CR_R1020B_AdvancesToVendors_R1021B_VendorsTransactions' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashReceipt_DR_R1020B_AdvancesToVendors_CR_R1021B_VendorsTransactions' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashReceipt_DR_R3010B_CashOnHand_CR_R3021B_CashInTransitIncoming_CashTransferOrder' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashReceipt_DR_R3010B_CashOnHand_CR_R5015B_OtherPartnersTransactions' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashExpense_DR_R5022T_Expenses_CR_R3010B_CashOnHand' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CashRevenue_DR_R3010B_CashOnHand_CR_R5021_Revenues' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=DebitNote_DR_R1021B_VendorsTransactions_CR_R5021_Revenues' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=DebitNote_DR_R1021B_VendorsTransactions_CR_R1020B_AdvancesToVendors' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=DebitNote_DR_R2021B_CustomersTransactions_CR_R5021_Revenues' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=DebitNote_DR_R5015B_OtherPartnersTransactions_CR_R5021_Revenues' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CreditNote_DR_R5022T_Expenses_CR_R2021B_CustomersTransactions' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CreditNote_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransactions' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CreditNote_DR_R5022T_Expenses_CR_R1021B_VendorsTransactions' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CreditNote_DR_R1021B_VendorsTransactions_CR_R1020B_AdvancesToVendors' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CreditNote_DR_R5022T_Expenses_CR_R5015B_OtherPartnersTransactions' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=MoneyTransfer_DR_R3010B_CashOnHand_CR_R3010B_CashOnHand' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=MoneyTransfer_DR_R3021B_CashInTransit_CR_R3010B_CashOnHand' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=MoneyTransfer_DR_R3010B_CashOnHand_CR_R3021B_CashInTransit' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=MoneyTransfer_DR_R3021B_CashInTransit_CR_R5021T_Revenues' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=MoneyTransfer_DR_R5022T_Expenses_CR_R3021B_CashInTransit' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=CommissioningOfFixedAsset_DR_R8510B_BookValueOfFixedAsset_CR_R4050B_StockInventory' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ModernizationOfFixedAsset_DR_R8510B_BookValueOfFixedAsset_CR_R4050B_StockInventory' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ModernizationOfFixedAsset_DR_R4050B_StockInventory_CR_R8510B_BookValueOfFixedAsset' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=DecommissioningOfFixedAsset_DR_R4050B_StockInventory_CR_R8510B_BookValueOfFixedAsset' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=FixedAssetTransfer_DR_R8510B_BookValueOfFixedAsset_CR_R8510B_BookValueOfFixedAsset' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=DepreciationCalculation_DR_R5022T_Expenses_CR_DepreciationFixedAsset' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=Payroll_DR_R5022T_Expenses_CR_R9510B_SalaryPayment_Accrual' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=Payroll_DR_R9510B_SalaryPayment_CR_R5015B_OtherPartnersTransactions_Taxes' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=Payroll_DR_R9510B_SalaryPayment_CR_R5021T_Revenues_Deduction_IsRevenue' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=Payroll_DR_R5022T_Expenses_CR_R9510B_SalaryPayment_Deduction_IsNotRevenue' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=Payroll_DR_R9510B_SalaryPayment_CR_R3027B_EmployeeCashAdvance' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=Payroll_DR_R5022T_Expenses_CR_R5015B_OtherPartnersTransactions_Taxes' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ExpenseAccruals_DR_R5022T_Expenses_CR_R6070T_OtherPeriodsExpenses' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ExpenseAccruals_DR_R6070T_OtherPeriodsExpenses_CR_R5022T_Expenses' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=RevenueAccruals_DR_R6080T_OtherPeriodsRevenues_CR_R5021T_Revenues' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=RevenueAccruals_DR_R5021T_Revenues_CR_R6080T_OtherPeriodsRevenues' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=EmployeeCashAdvance_DR_R5022T_Expenses_CR_R3027B_EmployeeCashAdvance' | 'True' | + | '01.01.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=EmployeeCashAdvance_DR_R1021B_VendorsTransactions_CR_R3027B_EmployeeCashAdvance' | 'True' | + | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R3010B_CashOnHand' | 'True' | + | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R3010B_CashOnHand_CR_R5021T_Revenues' | 'True' | + | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R1021B_VendorsTransactions' | 'True' | + | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R1021B_VendorsTransactions_CR_R5021T_Revenues' | 'True' | + | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R9510B_SalaryPayment' | 'True' | + | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R9510B_SalaryPayment_CR_R5021T_Revenues' | 'True' | + | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R1020B_AdvancesToVendors' | 'True' | + | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R1020B_AdvancesToVendors_CR_R5021T_Revenues' | 'True' | + | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R2021B_CustomersTransactions' | 'True' | + | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R2021B_CustomersTransactions_CR_R5021T_Revenues' | 'True' | + | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R3015B_CashAdvance' | 'True' | + | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R3015B_CashAdvance_CR_R5021T_Revenues' | 'True' | + | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R3027B_EmployeeCashAdvance' | 'True' | + | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R3027B_EmployeeCashAdvance_CR_R5021T_Revenues' | 'True' | + | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R5015B_OtherPartnersTransactions' | 'True' | + | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R5015B_OtherPartnersTransactions_CR_R5021T_Revenues' | 'True' | + | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R5022T_Expenses_CR_R8510B_BookValueOfFixedAsset' | 'True' | + | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=ForeignCurrencyRevaluation_DR_R8510B_BookValueOfFixedAsset_CR_R5021T_Revenues' | 'True' | + | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=DebitCreditNote_R5020B_PartnersBalance' | 'True' | + | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=DebitCreditNote_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransactions_Offset' | 'True' | + | '01.02.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=DebitCreditNote_DR_R1021B_VendorsTransactions_CR_R1020B_AdvancesToVendors_Offset' | 'True' | + | '01.03.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=SalesReturn_DR_R2021B_CustomersTransactions_CR_R2020B_AdvancesFromCustomers' | 'True' | + | '01.03.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=SalesReturn_DR_R5021T_Revenues_CR_R2021B_CustomersTransactions' | 'True' | + | '01.03.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=SalesReturn_DR_R1040B_TaxesOutgoing_CR_R2021B_CustomersTransactions' | 'True' | + | '01.03.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=SalesReturn_DR_R5022T_Expenses_CR_R4050B_StockInventory' | 'True' | + | '01.03.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=PurchaseReturn_DR_R1020B_AdvancesToVendors_CR_R1021B_VendorsTransactions' | 'True' | + | '01.03.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=PurchaseReturn_DR_R1021B_VendorsTransactions_CR_R4050B_StockInventory' | 'True' | + | '01.03.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=PurchaseInvoice_DR_R1040B_TaxesOutgoing_CR_R1021B_VendorsTransactions' | 'True' | + | '01.03.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=PurchaseReturn_DR_R1021B_VendorsTransactions_CR_R2040B_TaxesIncoming' | 'True' | + | '01.03.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=TaxesOperation_DR_R2040B_TaxesIncoming_CR_R1040B_TaxesOutgoing' | 'True' | + | '01.03.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=TaxesOperation_DR_R2040B_TaxesIncoming_CR_R5015B_OtherPartnersTransactions' | 'True' | + | '01.03.2021 00:00:00' | 'e1cib/data/Catalog.LedgerTypes?ref=b7b3f42485a6975311ee9a778a2b4095' | 'e1cib/data/Catalog.AccountingOperations?refName=TaxesOperation_DR_R5015B_OtherPartnersTransactions_CR_R1040B_TaxesOutgoing' | 'True' | And I check or create chart of accounts "Basic" objects with data exchange load true: | 'Ref' | 'DeletionMark' | 'Parent' | 'Code' | 'Order' | 'Type' | 'OffBalance' | 'LedgerTypeVariant' | 'SearchCode' | 'NotUsedForRecords' | 'Description_en' | 'Description_hash' | 'Description_ru' | 'Description_tr' | 'SourceNodeID' | 'Quantity' | 'Currency' | @@ -3763,7 +3767,7 @@ Scenario: Create chart of accounts Basic objects with LedgerTypeVariants (Basic | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d3c' | 'False' | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d3a' | '5202' | '5202' | 'Passive' | 'False' | 'e1cib/data/Catalog.LedgerTypeVariants?ref=b7b3f42485a6975311ee9a778a2b4096' | '5202' | 'False' | 'Advances Received' | '' | 'Авансы полученные' | 'Alınan Avanslar' | '' | 'False' | 'True' | | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d3d' | 'False' | '' | '5300' | '5300' | 'Passive' | 'False' | 'e1cib/data/Catalog.LedgerTypeVariants?ref=b7b3f42485a6975311ee9a778a2b4096' | '5300' | 'False' | 'Tax Liabilities' | '' | 'Задолженность по налогам' | 'Vergi Yükümlülükleri' | '' | 'False' | 'True' | | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d3e' | 'False' | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d3d' | '5301' | '5301' | 'Passive' | 'False' | 'e1cib/data/Catalog.LedgerTypeVariants?ref=b7b3f42485a6975311ee9a778a2b4096' | '5301' | 'False' | 'VAT Payable' | '' | 'НДС к уплате' | 'KDV Borçlu' | '' | 'False' | 'True' | - | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d3f' | 'False' | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d3d' | '5302' | '5302' | 'Passive' | 'False' | 'e1cib/data/Catalog.LedgerTypeVariants?ref=b7b3f42485a6975311ee9a778a2b4096' | '5302' | 'False' | 'Income Tax Payable' | '' | 'Налог на прибыль' | 'Gelir Vergisi Borçlu' | '' | 'False' | 'True' | + | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d3f' | 'False' | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d3d' | '5302' | '5302' | 'Passive' | 'False' | 'e1cib/data/Catalog.LedgerTypeVariants?ref=b7b3f42485a6975311ee9a778a2b4096' | '5302' | 'False' | 'Income VAT' | '' | 'НДС входящий' | 'Girdi KDV' | '' | 'False' | 'True' | | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d40' | 'False' | '' | '5400' | '5400' | 'Passive' | 'False' | 'e1cib/data/Catalog.LedgerTypeVariants?ref=b7b3f42485a6975311ee9a778a2b4096' | '5400' | 'False' | 'Other Current Liabilities' | '' | 'Прочие краткосрочные обязательства' | 'Diğer Cari Yükümlülükler' | '' | 'False' | 'True' | | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d41' | 'False' | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d40' | '5401' | '5401' | 'Passive' | 'False' | 'e1cib/data/Catalog.LedgerTypeVariants?ref=b7b3f42485a6975311ee9a778a2b4096' | '5401' | 'False' | 'Salaries and Wages Payable' | '' | 'Задолженность по заработной плате' | 'Maaş ve Ücretler Borçlu' | '' | 'False' | 'True' | | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d42' | 'False' | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d40' | '5402' | '5402' | 'Passive' | 'False' | 'e1cib/data/Catalog.LedgerTypeVariants?ref=b7b3f42485a6975311ee9a778a2b4096' | '5402' | 'False' | 'Social Security Payables' | '' | 'Расчеты по социальному страхованию' | 'Sosyal Güvenlik Borçları' | '' | 'False' | 'True' | @@ -3787,7 +3791,8 @@ Scenario: Create chart of accounts Basic objects with LedgerTypeVariants (Basic | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d64' | 'False' | '' | '9000.2' | '90002' | 'Passive' | 'False' | 'e1cib/data/Catalog.LedgerTypeVariants?ref=b7b3f42485a6975311ee9a778a2b4096' | '90002' | 'False' | 'Revenue from Products' | '' | 'Доход от продажи товаров' | 'Ürünlerden Elde Edilen Gelir' | '' | 'False' | 'True' | | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d65' | 'False' | '' | '970.1' | '9701' | 'Active' | 'False' | 'e1cib/data/Catalog.LedgerTypeVariants?ref=b7b3f42485a6975311ee9a778a2b4096' | '9701' | 'False' | 'Other period expense' | '' | 'Расходы будущих периодов' | 'Diğer dönem giderleri' | '' | 'False' | 'True' | | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d66' | 'False' | '' | '980.1' | '9801' | 'Passive' | 'False' | 'e1cib/data/Catalog.LedgerTypeVariants?ref=b7b3f42485a6975311ee9a778a2b4096' | '9801' | 'False' | 'Other period revenue' | '' | 'Доходы будущих периодов' | 'Diğer dönem gelirleri' | '' | 'False' | 'True' | - + | 'e1cib/data/ChartOfAccounts.Basic?ref=b7c0b354b75942f011ef218f2578a740' | 'False' | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d3d' | '5303' | '5303' | 'Passive' | 'False' | 'e1cib/data/Catalog.LedgerTypeVariants?ref=b7b3f42485a6975311ee9a778a2b4096' | '5303' | 'False' | 'Income VAT (return)' | '' | 'НДС входящий (возврат)' | 'Girdi KDV (iade)' | '' | 'False' | 'True' | + | 'e1cib/data/ChartOfAccounts.Basic?ref=b7c0b354b75942f011ef218f2578a742' | 'False' | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d3d' | '5304' | '5304' | 'Passive' | 'False' | 'e1cib/data/Catalog.LedgerTypeVariants?ref=b7b3f42485a6975311ee9a778a2b4096' | '5304' | 'False' | 'VAT Payable (return)' | '' | 'НДС исходящий (возврат)' | 'Ödenecek KDV (iade)' | '' | 'False' | 'True' | And I refill object tabular section "ExtDimensionTypes": | 'Ref' | 'ExtDimensionType' | 'TurnoversOnly' | 'Quantity' | 'Currency' | 'Amount' | | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9b657fe52af0' | 'e1cib/data/ChartOfCharacteristicTypes.AccountingExtraDimensionTypes?ref=b7b899319e68533011eef0d2c9fc5631' | 'False' | 'False' | 'True' | 'True' | @@ -3949,10 +3954,10 @@ Scenario: Create information register T9012S_AccountsPartner records (Basic LTV) Scenario: Create information register T9013S_AccountsTax records (Basic LTV) (test data base) And I check or create information register "T9013S_AccountsTax" records: - | 'Period' | 'Company' | 'LedgerTypeVariant' | 'Tax' | 'VatRate' | 'IncomingAccount' | 'OutgoingAccount' | - | '01.01.2022 00:00:00' | 'e1cib/data/Catalog.Companies?ref=b762b13668d0905011eb7663e35d7964' | 'e1cib/data/Catalog.LedgerTypeVariants?ref=b7b3f42485a6975311ee9a778a2b4096' | '' | '' | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d3f' | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d3e' | - | '01.01.2022 00:00:00' | 'e1cib/data/Catalog.Companies?ref=b762b13668d0905011eb7663e35d7964' | 'e1cib/data/Catalog.LedgerTypeVariants?ref=b7b3f42485a6975311ee9a778a2b4096' | 'e1cib/data/Catalog.Taxes?ref=b7ba865e4cc8c12b11eefd53280bdfff' | '' | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d42' | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d42' | - + | 'Period' | 'Company' | 'LedgerTypeVariant' | 'Tax' | 'VatRate' | 'IncomingAccount' | 'OutgoingAccount' | 'IncomingAccountReturn' | 'OutgoingAccountReturn' | + | '01.01.2022 00:00:00' | 'e1cib/data/Catalog.Companies?ref=b762b13668d0905011eb7663e35d7964' | 'e1cib/data/Catalog.LedgerTypeVariants?ref=b7b3f42485a6975311ee9a778a2b4096' | '' | '' | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d3f' | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d3e' | 'e1cib/data/ChartOfAccounts.Basic?ref=b7c0b354b75942f011ef218f2578a740' | 'e1cib/data/ChartOfAccounts.Basic?ref=b7c0b354b75942f011ef218f2578a742' | + | '01.01.2022 00:00:00' | 'e1cib/data/Catalog.Companies?ref=b762b13668d0905011eb7663e35d7964' | 'e1cib/data/Catalog.LedgerTypeVariants?ref=b7b3f42485a6975311ee9a778a2b4096' | 'e1cib/data/Catalog.Taxes?ref=b7ba865e4cc8c12b11eefd53280bdfff' | '' | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d42' | 'e1cib/data/ChartOfAccounts.Basic?ref=b7b3f42485a6975311ee9d8e807d8d42' | '' | '' | + Scenario: Create information register T9015S_AccountsFixedAsset records (test data base) And I check or create information register "T9015S_AccountsFixedAsset" records: diff --git a/features/Internal/_0040 BasicCheck/_0042BasiccheckOther.feature b/features/Internal/_0040 BasicCheck/_0042BasiccheckOther.feature index 05e23d9c96..9188e450e9 100644 --- a/features/Internal/_0040 BasicCheck/_0042BasiccheckOther.feature +++ b/features/Internal/_0040 BasicCheck/_0042BasiccheckOther.feature @@ -721,13 +721,6 @@ Scenario: Open object form "R5022T_Expenses" Then I raise "Failed to open information register form R5022T_Expenses" exception And I close current window -Scenario: Open object form "R5041B_TaxesPayable" - - Given I open "R5041B_TaxesPayable" accumulation register default form - If the warning is displayed then - Then I raise "Failed to open information register form R5041B_TaxesPayable" exception - And I close current window - Scenario: Open object form "R1022B_VendorsPaymentPlanning" Given I open "R1022B_VendorsPaymentPlanning" accumulation register default form diff --git a/features/Internal/_0299 SalesProcurementMethods/_0299SalesOrderNoReserve.feature b/features/Internal/_0299 SalesProcurementMethods/_0299SalesOrderNoReserve.feature index 510e103dfb..0587aefb63 100644 --- a/features/Internal/_0299 SalesProcurementMethods/_0299SalesOrderNoReserve.feature +++ b/features/Internal/_0299 SalesProcurementMethods/_0299SalesOrderNoReserve.feature @@ -262,14 +262,18 @@ Scenario: _029902 create SI for SO without reserve and check its movements (SO-S * Check SI movements (Register "R2040 Taxes incoming") And I select "R2040 Taxes incoming" exact value from "Register" drop-down list And I click "Generate report" button - And "ResultTable" spreadsheet document contains lines: - | '$$SalesInvoice029901$$' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "R2040 Taxes incoming"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Record type' | 'Period' | 'Resources' | '' | 'Dimensions' | '' | '' | '' | '' | - | '' | '' | '' | 'Taxable amount' | 'Tax amount' | 'Company' | 'Branch' | 'Tax' | 'Tax rate' | 'Tax movement type' | - | '' | 'Receipt' | '$$DateSalesInvoice029901$$' | '10 508,47' | '1 891,53' | 'Main Company' | '' | 'VAT' | '18%' | '' | - | '' | 'Receipt' | '$$DateSalesInvoice029901$$' | '11 864,41' | '2 135,59' | 'Main Company' | '' | 'VAT' | '18%' | '' | + Then "ResultTable" spreadsheet document is equal + | '$$SalesInvoice029901$$' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R2040 Taxes incoming"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | '' | '' | '' | + | '' | '' | '' | 'Amount' | 'Company' | 'Branch' | 'Tax' | 'Tax rate' | 'Invoice type' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | + | '' | 'Receipt' | '$$DateSalesInvoice029901$$' | '323,83' | 'Main Company' | '' | 'VAT' | '18%' | 'Invoice' | 'Reporting currency' | 'USD' | 'TRY' | + | '' | 'Receipt' | '$$DateSalesInvoice029901$$' | '365,61' | 'Main Company' | '' | 'VAT' | '18%' | 'Invoice' | 'Reporting currency' | 'USD' | 'TRY' | + | '' | 'Receipt' | '$$DateSalesInvoice029901$$' | '1 891,53' | 'Main Company' | '' | 'VAT' | '18%' | 'Invoice' | 'Local currency' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '$$DateSalesInvoice029901$$' | '1 891,53' | 'Main Company' | '' | 'VAT' | '18%' | 'Invoice' | 'en description is empty' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '$$DateSalesInvoice029901$$' | '2 135,59' | 'Main Company' | '' | 'VAT' | '18%' | 'Invoice' | 'Local currency' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '$$DateSalesInvoice029901$$' | '2 135,59' | 'Main Company' | '' | 'VAT' | '18%' | 'Invoice' | 'en description is empty' | 'TRY' | 'TRY' | * Check SI movements (Register "R4050 Stock inventory") And I select "R4050 Stock inventory" exact value from "Register" drop-down list And I click "Generate report" button @@ -519,72 +523,71 @@ Scenario: _029905 create Sales ivoice for SO (SC first) without reserve and chec | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | | '' | '' | '' | 'Amount' | 'Company' | 'Branch' | 'Currency' | 'Legal name' | 'Legal name contract' | | '' | 'Receipt' | '$$DateSalesInvoice029903$$' | '26 400' | 'Main Company' | '' | 'TRY' | 'Company Lomaniti' | '' | - * Check SI movements (Register "R2011 Shipment of sales orders") And I select "R2011 Shipment of sales orders" exact value from "Register" drop-down list And I click "Generate report" button And "ResultTable" spreadsheet document does not contain values - | 'Register "R2011 Shipment of sales orders"' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | - | '' | '' | '' | 'Quantity' | 'Company' | 'Branch' | 'Order' | 'Item key' | - | '' | 'Expense' | '$$DateSalesInvoice029903$$' | '31' | 'Main Company' | '' | '$$SalesOrder029903$$' | '38/Yellow' | - | '' | 'Expense' | '$$DateSalesInvoice029903$$' | '40' | 'Main Company' | '' | '$$SalesOrder029903$$' | '38/Black' | - + | 'Register "R2011 Shipment of sales orders"' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | + | '' | '' | '' | 'Quantity' | 'Company' | 'Branch' | 'Order' | 'Item key' | + | '' | 'Expense' | '$$DateSalesInvoice029903$$' | '31' | 'Main Company' | '' | '$$SalesOrder029903$$' | '38/Yellow' | + | '' | 'Expense' | '$$DateSalesInvoice029903$$' | '40' | 'Main Company' | '' | '$$SalesOrder029903$$' | '38/Black' | * Check SI movements (Register "R4050 Stock inventory") And I select "R4050 Stock inventory" exact value from "Register" drop-down list And I click "Generate report" button And "ResultTable" spreadsheet document contains lines: - | '$$SalesInvoice029903$$' | '' | '' | '' | '' | '' | '' | - | 'Document registrations records' | '' | '' | '' | '' | '' | '' | - | 'Register "R4050 Stock inventory"' | '' | '' | '' | '' | '' | '' | - | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | - | '' | '' | '' | 'Quantity' | 'Company' | 'Store' | 'Item key' | - | '' | 'Expense' | '$$DateSalesInvoice029903$$' | '31' | 'Main Company' | 'Store 02' | '38/Yellow' | - | '' | 'Expense' | '$$DateSalesInvoice029903$$' | '40' | 'Main Company' | 'Store 02' | '38/Black' | - + | '$$SalesInvoice029903$$' | '' | '' | '' | '' | '' | '' | + | 'Document registrations records' | '' | '' | '' | '' | '' | '' | + | 'Register "R4050 Stock inventory"' | '' | '' | '' | '' | '' | '' | + | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | + | '' | '' | '' | 'Quantity' | 'Company' | 'Store' | 'Item key' | + | '' | 'Expense' | '$$DateSalesInvoice029903$$' | '31' | 'Main Company' | 'Store 02' | '38/Yellow' | + | '' | 'Expense' | '$$DateSalesInvoice029903$$' | '40' | 'Main Company' | 'Store 02' | '38/Black' | * Check SI movements (Register "Register "R2001 Sales") And I select "R2001 Sales" exact value from "Register" drop-down list And I click "Generate report" button And "ResultTable" spreadsheet document contains lines: - | '$$SalesInvoice029903$$' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' |'' | '' | '' | - | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' |'' | '' | '' | - | 'Register "R2001 Sales"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' |'' | '' | '' | - | '' | 'Period' | 'Resources' | '' | '' | '' | 'Dimensions' | '' | '' | '' | '' | '' |'' | '' | '' | - | '' | '' | 'Quantity' | 'Amount' | 'Net amount' | 'Offers amount' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Invoice' | 'Item key' |'Serial lot number'| 'Row key' | 'Sales person' | - | '' | '$$DateSalesInvoice029903$$' | '31' | '2 122,88' | '1 799,05' | '' | 'Main Company' | '' | 'Reporting currency' | 'USD' | '$$SalesInvoice029903$$' | '38/Yellow' |'' | '*' | '' | - | '' | '$$DateSalesInvoice029903$$' | '31' | '12 400' | '10 508,47' | '' | 'Main Company' | '' | 'Local currency' | 'TRY' | '$$SalesInvoice029903$$' | '38/Yellow' |'' | '*' | '' | - | '' | '$$DateSalesInvoice029903$$' | '31' | '12 400' | '10 508,47' | '' | 'Main Company' | '' | 'TRY' | 'TRY' | '$$SalesInvoice029903$$' | '38/Yellow' |'' | '*' | '' | - | '' | '$$DateSalesInvoice029903$$' | '31' | '12 400' | '10 508,47' | '' | 'Main Company' | '' | 'en description is empty' | 'TRY' | '$$SalesInvoice029903$$' | '38/Yellow' |'' | '*' | '' | - | '' | '$$DateSalesInvoice029903$$' | '40' | '2 396,8' | '2 031,19' | '' | 'Main Company' | '' | 'Reporting currency' | 'USD' | '$$SalesInvoice029903$$' | '38/Black' |'' | '*' | '' | - | '' | '$$DateSalesInvoice029903$$' | '40' | '14 000' | '11 864,41' | '' | 'Main Company' | '' | 'Local currency' | 'TRY' | '$$SalesInvoice029903$$' | '38/Black' |'' | '*' | '' | - | '' | '$$DateSalesInvoice029903$$' | '40' | '14 000' | '11 864,41' | '' | 'Main Company' | '' | 'TRY' | 'TRY' | '$$SalesInvoice029903$$' | '38/Black' |'' | '*' | '' | - | '' | '$$DateSalesInvoice029903$$' | '40' | '14 000' | '11 864,41' | '' | 'Main Company' | '' | 'en description is empty' | 'TRY' | '$$SalesInvoice029903$$' | '38/Black' |'' | '*' | '' | - + | '$$SalesInvoice029903$$' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' |'' | '' | '' | + | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' |'' | '' | '' | + | 'Register "R2001 Sales"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' |'' | '' | '' | + | '' | 'Period' | 'Resources' | '' | '' | '' | 'Dimensions' | '' | '' | '' | '' | '' |'' | '' | '' | + | '' | '' | 'Quantity' | 'Amount' | 'Net amount' | 'Offers amount' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Invoice' | 'Item key' |'Serial lot number'| 'Row key' | 'Sales person' | + | '' | '$$DateSalesInvoice029903$$' | '31' | '2 122,88' | '1 799,05' | '' | 'Main Company' | '' | 'Reporting currency' | 'USD' | '$$SalesInvoice029903$$' | '38/Yellow' |'' | '*' | '' | + | '' | '$$DateSalesInvoice029903$$' | '31' | '12 400' | '10 508,47' | '' | 'Main Company' | '' | 'Local currency' | 'TRY' | '$$SalesInvoice029903$$' | '38/Yellow' |'' | '*' | '' | + | '' | '$$DateSalesInvoice029903$$' | '31' | '12 400' | '10 508,47' | '' | 'Main Company' | '' | 'TRY' | 'TRY' | '$$SalesInvoice029903$$' | '38/Yellow' |'' | '*' | '' | + | '' | '$$DateSalesInvoice029903$$' | '31' | '12 400' | '10 508,47' | '' | 'Main Company' | '' | 'en description is empty' | 'TRY' | '$$SalesInvoice029903$$' | '38/Yellow' |'' | '*' | '' | + | '' | '$$DateSalesInvoice029903$$' | '40' | '2 396,8' | '2 031,19' | '' | 'Main Company' | '' | 'Reporting currency' | 'USD' | '$$SalesInvoice029903$$' | '38/Black' |'' | '*' | '' | + | '' | '$$DateSalesInvoice029903$$' | '40' | '14 000' | '11 864,41' | '' | 'Main Company' | '' | 'Local currency' | 'TRY' | '$$SalesInvoice029903$$' | '38/Black' |'' | '*' | '' | + | '' | '$$DateSalesInvoice029903$$' | '40' | '14 000' | '11 864,41' | '' | 'Main Company' | '' | 'TRY' | 'TRY' | '$$SalesInvoice029903$$' | '38/Black' |'' | '*' | '' | + | '' | '$$DateSalesInvoice029903$$' | '40' | '14 000' | '11 864,41' | '' | 'Main Company' | '' | 'en description is empty' | 'TRY' | '$$SalesInvoice029903$$' | '38/Black' |'' | '*' | '' | * Check SI movements (Register "R2021 Customer transactions") And I select "R2021 Customer transactions" exact value from "Register" drop-down list And I click "Generate report" button And "ResultTable" spreadsheet document contains lines: - | '$$SalesInvoice029903$$' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "R2021 Customer transactions"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | 'Attributes' | '' | - | '' | '' | '' | 'Amount' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Agreement' | 'Basis' | 'Order' | 'Project' | 'Deferred calculation' | 'Customers advances closing' | - | '' | 'Receipt' | '$$DateSalesInvoice029903$$' | '4 519,68' | 'Main Company' | '' | 'Reporting currency' | 'USD' | 'TRY' | 'Company Lomaniti' | 'Lomaniti' | 'Basic Partner terms, TRY' | '$$SalesInvoice029903$$' | '$$SalesOrder029903$$' | '' | 'No' | '' | - | '' | 'Receipt' | '$$DateSalesInvoice029903$$' | '26 400' | 'Main Company' | '' | 'Local currency' | 'TRY' | 'TRY' | 'Company Lomaniti' | 'Lomaniti' | 'Basic Partner terms, TRY' | '$$SalesInvoice029903$$' | '$$SalesOrder029903$$' | '' | 'No' | '' | - | '' | 'Receipt' | '$$DateSalesInvoice029903$$' | '26 400' | 'Main Company' | '' | 'TRY' | 'TRY' | 'TRY' | 'Company Lomaniti' | 'Lomaniti' | 'Basic Partner terms, TRY' | '$$SalesInvoice029903$$' | '$$SalesOrder029903$$' | '' | 'No' | '' | - | '' | 'Receipt' | '$$DateSalesInvoice029903$$' | '26 400' | 'Main Company' | '' | 'en description is empty' | 'TRY' | 'TRY' | 'Company Lomaniti' | 'Lomaniti' | 'Basic Partner terms, TRY' | '$$SalesInvoice029903$$' | '$$SalesOrder029903$$' | '' | 'No' | '' | - + | '$$SalesInvoice029903$$' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R2021 Customer transactions"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | 'Attributes' | '' | + | '' | '' | '' | 'Amount' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Agreement' | 'Basis' | 'Order' | 'Project' | 'Deferred calculation' | 'Customers advances closing' | + | '' | 'Receipt' | '$$DateSalesInvoice029903$$' | '4 519,68' | 'Main Company' | '' | 'Reporting currency' | 'USD' | 'TRY' | 'Company Lomaniti' | 'Lomaniti' | 'Basic Partner terms, TRY' | '$$SalesInvoice029903$$' | '$$SalesOrder029903$$' | '' | 'No' | '' | + | '' | 'Receipt' | '$$DateSalesInvoice029903$$' | '26 400' | 'Main Company' | '' | 'Local currency' | 'TRY' | 'TRY' | 'Company Lomaniti' | 'Lomaniti' | 'Basic Partner terms, TRY' | '$$SalesInvoice029903$$' | '$$SalesOrder029903$$' | '' | 'No' | '' | + | '' | 'Receipt' | '$$DateSalesInvoice029903$$' | '26 400' | 'Main Company' | '' | 'TRY' | 'TRY' | 'TRY' | 'Company Lomaniti' | 'Lomaniti' | 'Basic Partner terms, TRY' | '$$SalesInvoice029903$$' | '$$SalesOrder029903$$' | '' | 'No' | '' | + | '' | 'Receipt' | '$$DateSalesInvoice029903$$' | '26 400' | 'Main Company' | '' | 'en description is empty' | 'TRY' | 'TRY' | 'Company Lomaniti' | 'Lomaniti' | 'Basic Partner terms, TRY' | '$$SalesInvoice029903$$' | '$$SalesOrder029903$$' | '' | 'No' | '' | * Check SI movements (Register "R2040 Taxes incoming") And I select "R2040 Taxes incoming" exact value from "Register" drop-down list And I click "Generate report" button - And "ResultTable" spreadsheet document contains lines: - | '$$SalesInvoice029903$$' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "R2040 Taxes incoming"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Record type' | 'Period' | 'Resources' | '' | 'Dimensions' | '' | '' | '' | '' | - | '' | '' | '' | 'Taxable amount' | 'Tax amount' | 'Company' | 'Branch' | 'Tax' | 'Tax rate' | 'Tax movement type' | - | '' | 'Receipt' | '$$DateSalesInvoice029903$$' | '10 508,47' | '1 891,53' | 'Main Company' | '' | 'VAT' | '18%' | '' | - | '' | 'Receipt' | '$$DateSalesInvoice029903$$' | '11 864,41' | '2 135,59' | 'Main Company' | '' | 'VAT' | '18%' | '' | + Then "ResultTable" spreadsheet document is equal + | '$$SalesInvoice029903$$' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R2040 Taxes incoming"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | '' | '' | '' | + | '' | '' | '' | 'Amount' | 'Company' | 'Branch' | 'Tax' | 'Tax rate' | 'Invoice type' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | + | '' | 'Receipt' | '$$DateSalesInvoice029903$$' | '323,83' | 'Main Company' | '' | 'VAT' | '18%' | 'Invoice' | 'Reporting currency' | 'USD' | 'TRY' | + | '' | 'Receipt' | '$$DateSalesInvoice029903$$' | '365,61' | 'Main Company' | '' | 'VAT' | '18%' | 'Invoice' | 'Reporting currency' | 'USD' | 'TRY' | + | '' | 'Receipt' | '$$DateSalesInvoice029903$$' | '1 891,53' | 'Main Company' | '' | 'VAT' | '18%' | 'Invoice' | 'Local currency' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '$$DateSalesInvoice029903$$' | '1 891,53' | 'Main Company' | '' | 'VAT' | '18%' | 'Invoice' | 'en description is empty' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '$$DateSalesInvoice029903$$' | '2 135,59' | 'Main Company' | '' | 'VAT' | '18%' | 'Invoice' | 'Local currency' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '$$DateSalesInvoice029903$$' | '2 135,59' | 'Main Company' | '' | 'VAT' | '18%' | 'Invoice' | 'en description is empty' | 'TRY' | 'TRY' | * Check SI movements (Register "R4050 Stock inventory") And I select "R4050 Stock inventory" exact value from "Register" drop-down list And I click "Generate report" button diff --git a/features/Internal/_0400 Movements/_0404SalesInvoiceMovements.feature b/features/Internal/_0400 Movements/_0404SalesInvoiceMovements.feature index 7c14a72cfa..579063e3f9 100644 --- a/features/Internal/_0400 Movements/_0404SalesInvoiceMovements.feature +++ b/features/Internal/_0400 Movements/_0404SalesInvoiceMovements.feature @@ -424,15 +424,20 @@ Scenario: _040143 check Sales invoice movements by the Register "R2040 Taxes in And I select "R2040 Taxes incoming" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Sales invoice 1 dated 28.01.2021 18:48:53' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "R2040 Taxes incoming"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Record type' | 'Period' | 'Resources' | '' | 'Dimensions' | '' | '' | '' | '' | - | '' | '' | '' | 'Taxable amount' | 'Tax amount' | 'Company' | 'Branch' | 'Tax' | 'Tax rate' | 'Tax movement type' | - | '' | 'Receipt' | '28.01.2021 18:48:53' | '80,51' | '14,49' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | '' | - | '' | 'Receipt' | '28.01.2021 18:48:53' | '418,64' | '75,36' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | '' | - | '' | 'Receipt' | '28.01.2021 18:48:53' | '2 817,8' | '507,2' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | '' | - + | 'Sales invoice 1 dated 28.01.2021 18:48:53' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R2040 Taxes incoming"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | '' | '' | '' | + | '' | '' | '' | 'Amount' | 'Company' | 'Branch' | 'Tax' | 'Tax rate' | 'Invoice type' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | + | '' | 'Receipt' | '28.01.2021 18:48:53' | '2,48' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Reporting currency' | 'USD' | 'TRY' | + | '' | 'Receipt' | '28.01.2021 18:48:53' | '12,9' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Reporting currency' | 'USD' | 'TRY' | + | '' | 'Receipt' | '28.01.2021 18:48:53' | '14,49' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Local currency' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '28.01.2021 18:48:53' | '14,49' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'en description is empty' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '28.01.2021 18:48:53' | '75,36' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Local currency' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '28.01.2021 18:48:53' | '75,36' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'en description is empty' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '28.01.2021 18:48:53' | '86,83' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Reporting currency' | 'USD' | 'TRY' | + | '' | 'Receipt' | '28.01.2021 18:48:53' | '507,2' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Local currency' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '28.01.2021 18:48:53' | '507,2' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'en description is empty' | 'TRY' | 'TRY' | And I close all client application windows Scenario: _040144 check Sales invoice movements by the Register "R4034 Scheduled goods shipments" (use shedule) @@ -1210,16 +1215,23 @@ Scenario: _0401344 check Sales invoice movements by the Register "R2040 Taxes i And I select "R2040 Taxes incoming" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Sales invoice 194 dated 04.11.2022 16:33:38' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "R2040 Taxes incoming"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Record type' | 'Period' | 'Resources' | '' | 'Dimensions' | '' | '' | '' | '' | - | '' | '' | '' | 'Taxable amount' | 'Tax amount' | 'Company' | 'Branch' | 'Tax' | 'Tax rate' | 'Tax movement type' | - | '' | 'Receipt' | '04.11.2022 16:33:38' | '84,75' | '15,25' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | '' | - | '' | 'Receipt' | '04.11.2022 16:33:38' | '338,98' | '61,02' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | '' | - | '' | 'Receipt' | '04.11.2022 16:33:38' | '440,68' | '79,32' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | '' | - | '' | 'Receipt' | '04.11.2022 16:33:38' | '800' | '' | 'Main Company' | 'Distribution department' | 'VAT' | 'Without VAT' | '' | - | '' | 'Receipt' | '04.11.2022 16:33:38' | '932,2' | '167,8' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | '' | + | 'Sales invoice 194 dated 04.11.2022 16:33:38' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R2040 Taxes incoming"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | '' | '' | '' | + | '' | '' | '' | 'Amount' | 'Company' | 'Branch' | 'Tax' | 'Tax rate' | 'Invoice type' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | + | '' | 'Receipt' | '04.11.2022 16:33:38' | '2,61' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Reporting currency' | 'USD' | 'TRY' | + | '' | 'Receipt' | '04.11.2022 16:33:38' | '10,45' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Reporting currency' | 'USD' | 'TRY' | + | '' | 'Receipt' | '04.11.2022 16:33:38' | '13,58' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Reporting currency' | 'USD' | 'TRY' | + | '' | 'Receipt' | '04.11.2022 16:33:38' | '15,25' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Local currency' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '04.11.2022 16:33:38' | '15,25' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'en description is empty' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '04.11.2022 16:33:38' | '28,73' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Reporting currency' | 'USD' | 'TRY' | + | '' | 'Receipt' | '04.11.2022 16:33:38' | '61,02' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Local currency' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '04.11.2022 16:33:38' | '61,02' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'en description is empty' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '04.11.2022 16:33:38' | '79,32' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Local currency' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '04.11.2022 16:33:38' | '79,32' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'en description is empty' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '04.11.2022 16:33:38' | '167,8' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Local currency' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '04.11.2022 16:33:38' | '167,8' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'en description is empty' | 'TRY' | 'TRY' | And I close all client application windows Scenario: _0401345 check Sales invoice movements by the Register "R4010 Actual stocks" (consignor and own stocks) diff --git a/features/Internal/_0400 Movements/_407PurchaseInvoiceMovements.feature b/features/Internal/_0400 Movements/_407PurchaseInvoiceMovements.feature index 26f3b3953f..06511b7334 100644 --- a/features/Internal/_0400 Movements/_407PurchaseInvoiceMovements.feature +++ b/features/Internal/_0400 Movements/_407PurchaseInvoiceMovements.feature @@ -315,14 +315,20 @@ Scenario: _040107 check Purchase invoice movements by the Register "R1040 Taxes And I select "R1040 Taxes outgoing" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Purchase invoice 115 dated 12.02.2021 15:13:56' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "R1040 Taxes outgoing"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Record type' | 'Period' | 'Resources' | '' | 'Dimensions' | '' | '' | '' | '' | - | '' | '' | '' | 'Taxable amount' | 'Tax amount' | 'Company' | 'Branch' | 'Tax' | 'Tax rate' | 'Tax movement type' | - | '' | 'Receipt' | '12.02.2021 15:13:56' | '254,24' | '45,76' | 'Main Company' | 'Front office' | 'VAT' | '18%' | '' | - | '' | 'Receipt' | '12.02.2021 15:13:56' | '847,46' | '152,54' | 'Main Company' | 'Front office' | 'VAT' | '18%' | '' | - | '' | 'Receipt' | '12.02.2021 15:13:56' | '847,46' | '152,54' | 'Main Company' | 'Front office' | 'VAT' | '18%' | '' | + | 'Purchase invoice 115 dated 12.02.2021 15:13:56' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R1040 Taxes outgoing"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | '' | '' | '' | + | '' | '' | '' | 'Amount' | 'Company' | 'Branch' | 'Tax' | 'Tax rate' | 'Invoice type' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | + | '' | 'Receipt' | '12.02.2021 15:13:56' | '7,83' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Invoice' | 'Reporting currency' | 'USD' | 'TRY' | + | '' | 'Receipt' | '12.02.2021 15:13:56' | '26,11' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Invoice' | 'Reporting currency' | 'USD' | 'TRY' | + | '' | 'Receipt' | '12.02.2021 15:13:56' | '26,11' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Invoice' | 'Reporting currency' | 'USD' | 'TRY' | + | '' | 'Receipt' | '12.02.2021 15:13:56' | '45,76' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Invoice' | 'Local currency' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '12.02.2021 15:13:56' | '45,76' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Invoice' | 'en description is empty' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '12.02.2021 15:13:56' | '152,54' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Invoice' | 'Local currency' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '12.02.2021 15:13:56' | '152,54' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Invoice' | 'Local currency' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '12.02.2021 15:13:56' | '152,54' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Invoice' | 'en description is empty' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '12.02.2021 15:13:56' | '152,54' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Invoice' | 'en description is empty' | 'TRY' | 'TRY' | And I close all client application windows Scenario: _040108 check Purchase invoice movements by the Register "R1012 Invoice closing of purchase orders" (PO exists) diff --git a/features/Internal/_0400 Movements/_413SalesReturnMovements.feature b/features/Internal/_0400 Movements/_413SalesReturnMovements.feature index 4740a7c5bb..5ffc17c783 100644 --- a/features/Internal/_0400 Movements/_413SalesReturnMovements.feature +++ b/features/Internal/_0400 Movements/_413SalesReturnMovements.feature @@ -352,25 +352,31 @@ Scenario: _041306 check Sales return movements by the Register "R2021 Customer | '' | 'Receipt' | '12.03.2021 08:44:18' | '-214,68' | 'Main Company' | 'Distribution department' | 'Reporting currency' | 'USD' | 'TRY' | 'Company Ferron BP' | 'Ferron BP' | 'Basic Partner terms, TRY' | 'Sales return 101 dated 12.03.2021 08:44:18' | '' | 'Project 01' | 'No' | '' | And I close all client application windows -Scenario: _041307 check Sales return movements by the Register "R2040 Taxes incoming" +Scenario: _041307 check Sales return movements by the Register "R1040 Taxes outgoing" * Select Sales return Given I open hyperlink "e1cib/list/Document.SalesReturn" And I go to line in "List" table | 'Number' | | '101' | - * Check movements by the Register "R2040 Taxes incoming" + * Check movements by the Register "R1040 Taxes outgoing" And I click "Registrations report" button - And I select "R2040 Taxes incoming" exact value from "Register" drop-down list + And I select "R1040 Taxes outgoing" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Sales return 101 dated 12.03.2021 08:44:18' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "R2040 Taxes incoming"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Record type' | 'Period' | 'Resources' | '' | 'Dimensions' | '' | '' | '' | '' | - | '' | '' | '' | 'Taxable amount' | 'Tax amount' | 'Company' | 'Branch' | 'Tax' | 'Tax rate' | 'Tax movement type' | - | '' | 'Receipt' | '12.03.2021 08:44:18' | '80,51' | '14,49' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | '' | - | '' | 'Receipt' | '12.03.2021 08:44:18' | '418,64' | '75,36' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | '' | - | '' | 'Receipt' | '12.03.2021 08:44:18' | '563,56' | '101,44' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | '' | + | 'Sales return 101 dated 12.03.2021 08:44:18' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R1040 Taxes outgoing"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | '' | '' | '' | + | '' | '' | '' | 'Amount' | 'Company' | 'Branch' | 'Tax' | 'Tax rate' | 'Invoice type' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | + | '' | 'Receipt' | '12.03.2021 08:44:18' | '2,48' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Return' | 'Reporting currency' | 'USD' | 'TRY' | + | '' | 'Receipt' | '12.03.2021 08:44:18' | '12,9' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Return' | 'Reporting currency' | 'USD' | 'TRY' | + | '' | 'Receipt' | '12.03.2021 08:44:18' | '14,49' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Return' | 'Local currency' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '12.03.2021 08:44:18' | '14,49' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Return' | 'en description is empty' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '12.03.2021 08:44:18' | '17,37' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Return' | 'Reporting currency' | 'USD' | 'TRY' | + | '' | 'Receipt' | '12.03.2021 08:44:18' | '75,36' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Return' | 'Local currency' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '12.03.2021 08:44:18' | '75,36' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Return' | 'en description is empty' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '12.03.2021 08:44:18' | '101,44' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Return' | 'Local currency' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '12.03.2021 08:44:18' | '101,44' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Return' | 'en description is empty' | 'TRY' | 'TRY' | And I close all client application windows Scenario: _041308 check Sales return movements by the Register "R4014 Serial lot numbers" @@ -881,7 +887,7 @@ Scenario: _041330 Sales return clear posting/mark for deletion | 'R4050 Stock inventory' | | 'R2021 Customer transactions' | | 'R4031 Goods in transit (incoming)' | - | 'R2040 Taxes incoming' | + | 'R1040 Taxes outgoing' | And I close all client application windows * Mark for deletion Given I open hyperlink "e1cib/list/Document.SalesReturn" @@ -918,7 +924,7 @@ Scenario: _041330 Sales return clear posting/mark for deletion | 'R4050 Stock inventory' | | 'R2021 Customer transactions' | | 'R4031 Goods in transit (incoming)' | - | 'R2040 Taxes incoming' | + | 'R1040 Taxes outgoing' | And I close all client application windows Scenario: _041328 check Sales return movements by the Register "R4010 Actual stocks" (Return from trade agent) @@ -1031,18 +1037,18 @@ Scenario: _041336 check Sales return movements by the Register "R2021 Customer | 'Register "R2021 Customer transactions"' | And I close all client application windows -Scenario: _041337 check Sales return movements by the Register "R2040 Taxes incoming" (Return from trade agent) +Scenario: _041337 check Sales return movements by the Register "R1040 Taxes outgoing" (Return from trade agent) * Select Sales return Given I open hyperlink "e1cib/list/Document.SalesReturn" And I go to line in "List" table | 'Number' | | '192' | - * Check movements by the Register "R2040 Taxes incoming" + * Check movements by the Register "R1040 Taxes outgoing" And I click "Registrations report" button - And I select "R2040 Taxes incoming" exact value from "Register" drop-down list + And I select "R1040 Taxes outgoing" exact value from "Register" drop-down list And I click "Generate report" button And "ResultTable" spreadsheet document does not contain values - | 'Register "R2040 Taxes incoming"' | + | 'Register "R1040 Taxes outgoing"' | And I close all client application windows Scenario: _041338 check Sales return movements by the Register "R5021 Revenues" (Return from trade agent) diff --git a/features/Internal/_0400 Movements/_416PurchaseReturnMovements.feature b/features/Internal/_0400 Movements/_416PurchaseReturnMovements.feature index 99f6c9e201..70b0c972bf 100644 --- a/features/Internal/_0400 Movements/_416PurchaseReturnMovements.feature +++ b/features/Internal/_0400 Movements/_416PurchaseReturnMovements.feature @@ -262,26 +262,32 @@ Scenario: _041606 check Purchase return movements by the Register "R4050 Stock | '' | 'Expense' | '14.03.2021 18:53:34' | '5' | 'Main Company' | 'Store 02' | 'S/Yellow' | And I close all client application windows -Scenario: _041607 check Purchase return movements by the Register "R1040 Taxes outgoing" +Scenario: _041607 check Purchase return movements by the Register "R2040 Taxes incoming" And I close all client application windows * Select Purchase return Given I open hyperlink "e1cib/list/Document.PurchaseReturn" And I go to line in "List" table | 'Number' | | '231' | - * Check movements by the Register "R1040 Taxes outgoing" + * Check movements by the Register "R2040 Taxes incoming" And I click "Registrations report" button - And I select "R1040 Taxes outgoing" exact value from "Register" drop-down list + And I select "R2040 Taxes incoming" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Purchase return 231 dated 14.03.2021 18:53:34' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "R1040 Taxes outgoing"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Record type' | 'Period' | 'Resources' | '' | 'Dimensions' | '' | '' | '' | '' | - | '' | '' | '' | 'Taxable amount' | 'Tax amount' | 'Company' | 'Branch' | 'Tax' | 'Tax rate' | 'Tax movement type' | - | '' | 'Receipt' | '14.03.2021 18:53:34' | '152,54' | '27,46' | 'Main Company' | 'Front office' | 'VAT' | '18%' | '' | - | '' | 'Receipt' | '14.03.2021 18:53:34' | '228,81' | '41,19' | 'Main Company' | 'Front office' | 'VAT' | '18%' | '' | - | '' | 'Receipt' | '14.03.2021 18:53:34' | '381,36' | '68,64' | 'Main Company' | 'Front office' | 'VAT' | '18%' | '' | + | 'Purchase return 231 dated 14.03.2021 18:53:34' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R2040 Taxes incoming"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | '' | '' | '' | + | '' | '' | '' | 'Amount' | 'Company' | 'Branch' | 'Tax' | 'Tax rate' | 'Invoice type' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | + | '' | 'Receipt' | '14.03.2021 18:53:34' | '4,7' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Return' | 'Reporting currency' | 'USD' | 'TRY' | + | '' | 'Receipt' | '14.03.2021 18:53:34' | '7,05' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Return' | 'Reporting currency' | 'USD' | 'TRY' | + | '' | 'Receipt' | '14.03.2021 18:53:34' | '11,75' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Return' | 'Reporting currency' | 'USD' | 'TRY' | + | '' | 'Receipt' | '14.03.2021 18:53:34' | '27,46' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Return' | 'Local currency' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '14.03.2021 18:53:34' | '27,46' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Return' | 'en description is empty' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '14.03.2021 18:53:34' | '41,19' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Return' | 'Local currency' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '14.03.2021 18:53:34' | '41,19' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Return' | 'en description is empty' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '14.03.2021 18:53:34' | '68,64' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Return' | 'Local currency' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '14.03.2021 18:53:34' | '68,64' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Return' | 'en description is empty' | 'TRY' | 'TRY' | And I close all client application windows Scenario: _041608 check Purchase return movements by the Register "R1012 Invoice closing of purchase orders" (with PRO) @@ -687,19 +693,19 @@ Scenario: _041627 check there is no Purchase return movements by the Register " | 'Register "R1021 Vendors transactions"' | And I close all client application windows -Scenario: _041628 check there is no Purchase return movements by the Register "R1040 Taxes outgoing" (Return to consignor) +Scenario: _041628 check there is no Purchase return movements by the Register "R2040 Taxes incoming" (Return to consignor) And I close all client application windows * Select Purchase return Given I open hyperlink "e1cib/list/Document.PurchaseReturn" And I go to line in "List" table | 'Number' | | '195' | - * Check movements by the Register "R1040 Taxes outgoing" + * Check movements by the Register "R2040 Taxes incoming" And I click "Registrations report" button - And I select "R1040 Taxes outgoing" exact value from "Register" drop-down list + And I select "R2040 Taxes incoming" exact value from "Register" drop-down list And I click "Generate report" button And "ResultTable" spreadsheet document does not contain values - | 'Register "R1040 Taxes outgoing"' | + | 'Register "R2040 Taxes incoming"' | And I close all client application windows Scenario: _041630 Purchase return clear posting/mark for deletion @@ -736,7 +742,7 @@ Scenario: _041630 Purchase return clear posting/mark for deletion | 'R4050 Stock inventory' | | 'R4011 Free stocks' | | 'R4032 Goods in transit (outgoing)' | - | 'R1040 Taxes outgoing' | + | 'R2040 Taxes incoming' | | 'R1012 Invoice closing of purchase orders' | And I close all client application windows * Mark for deletion @@ -776,6 +782,6 @@ Scenario: _041630 Purchase return clear posting/mark for deletion | 'R4050 Stock inventory' | | 'R4011 Free stocks' | | 'R4032 Goods in transit (outgoing)' | - | 'R1040 Taxes outgoing' | + | 'R2040 Taxes incoming' | | 'R1012 Invoice closing of purchase orders' | And I close all client application windows diff --git a/features/Internal/_0400 Movements/_430DebitNoteMovements.feature b/features/Internal/_0400 Movements/_430DebitNoteMovements.feature index c8edacfd37..56081f02f3 100644 --- a/features/Internal/_0400 Movements/_430DebitNoteMovements.feature +++ b/features/Internal/_0400 Movements/_430DebitNoteMovements.feature @@ -42,7 +42,8 @@ Scenario: _043000 preparation (Debit note) When Create catalog PartnerSegments objects When Create chart of characteristic types CurrencyMovementType objects When Create catalog TaxRates objects - When Create catalog Taxes objects + When Create catalog Taxes objects + When Create catalog Taxes objects (for debit and credit note) When Create information register TaxSettings records When Create information register PricesByItemKeys records When Create catalog IntegrationSettings objects @@ -280,9 +281,9 @@ Scenario: _043006 check Debit note movements by the Register "R5021 Revenues" (w | 'Register "R5021 Revenues"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | 'Period' | 'Resources' | '' | 'Dimensions' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | '' | 'Amount' | 'Amount with taxes' | 'Company' | 'Branch' | 'Profit loss center' | 'Revenue type' | 'Item key' | 'Currency' | 'Additional analytic' | 'Multi currency movement type' | 'Project' | - | '' | '05.04.2021 09:30:36' | '393,76' | '393,76' | 'Main Company' | 'Front office' | 'Distribution department' | 'Software' | '' | 'USD' | '' | 'Reporting currency' | 'Project 01' | - | '' | '05.04.2021 09:30:36' | '2 300' | '2 300' | 'Main Company' | 'Front office' | 'Distribution department' | 'Software' | '' | 'TRY' | '' | 'Local currency' | 'Project 01' | - | '' | '05.04.2021 09:30:36' | '2 300' | '2 300' | 'Main Company' | 'Front office' | 'Distribution department' | 'Software' | '' | 'TRY' | '' | 'en description is empty' | 'Project 01' | + | '' | '05.04.2021 09:30:36' | '333,69' | '393,76' | 'Main Company' | 'Front office' | 'Distribution department' | 'Software' | '' | 'USD' | '' | 'Reporting currency' | 'Project 01' | + | '' | '05.04.2021 09:30:36' | '1 949,15' | '2 300' | 'Main Company' | 'Front office' | 'Distribution department' | 'Software' | '' | 'TRY' | '' | 'Local currency' | 'Project 01' | + | '' | '05.04.2021 09:30:36' | '1 949,15' | '2 300' | 'Main Company' | 'Front office' | 'Distribution department' | 'Software' | '' | 'TRY' | '' | 'en description is empty' | 'Project 01' | And I close all client application windows Scenario: _043007 check Debit note movements by the Register "R5021 Revenues" (with customer) @@ -297,14 +298,14 @@ Scenario: _043007 check Debit note movements by the Register "R5021 Revenues" (w And I select "R5021 Revenues" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Debit note 2 dated 05.04.2021 09:31:09' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "R5021 Revenues"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Period' | 'Resources' | '' | 'Dimensions' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | '' | 'Amount' | 'Amount with taxes' | 'Company' | 'Branch' | 'Profit loss center' | 'Revenue type' | 'Item key' | 'Currency' | 'Additional analytic' | 'Multi currency movement type' | 'Project' | - | '' | '05.04.2021 09:31:09' | '17,12' | '17,12' | 'Main Company' | 'Front office' | 'Distribution department' | 'Software' | '' | 'USD' | '' | 'Reporting currency' | '' | - | '' | '05.04.2021 09:31:09' | '100' | '100' | 'Main Company' | 'Front office' | 'Distribution department' | 'Software' | '' | 'TRY' | '' | 'Local currency' | '' | - | '' | '05.04.2021 09:31:09' | '100' | '100' | 'Main Company' | 'Front office' | 'Distribution department' | 'Software' | '' | 'TRY' | '' | 'en description is empty' | '' | + | 'Debit note 2 dated 05.04.2021 09:31:09' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R5021 Revenues"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Period' | 'Resources' | '' | 'Dimensions' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | '' | 'Amount' | 'Amount with taxes' | 'Company' | 'Branch' | 'Profit loss center' | 'Revenue type' | 'Item key' | 'Currency' | 'Additional analytic' | 'Multi currency movement type' | 'Project' | + | '' | '05.04.2021 09:31:09' | '14,51' | '17,12' | 'Main Company' | 'Front office' | 'Distribution department' | 'Software' | '' | 'USD' | '' | 'Reporting currency' | '' | + | '' | '05.04.2021 09:31:09' | '84,75' | '100' | 'Main Company' | 'Front office' | 'Distribution department' | 'Software' | '' | 'TRY' | '' | 'Local currency' | '' | + | '' | '05.04.2021 09:31:09' | '84,75' | '100' | 'Main Company' | 'Front office' | 'Distribution department' | 'Software' | '' | 'TRY' | '' | 'en description is empty' | '' | And I close all client application windows Scenario: _043008 check Debit note movements by the Register "R5021 Revenues" (OtherPartnersTransactions) @@ -497,6 +498,46 @@ Scenario: _043017 check absence DebitNote movements by the Register "T2014 Adva | 'Register "T2014 Advances info"' | And I close all client application windows +Scenario: _043018 check DebitNote movements by the Register "R2040 Taxes incoming" (with vendor) + And I close all client application windows + * Select DN + Given I open hyperlink "e1cib/list/Document.DebitNote" + And I go to line in "List" table + | 'Number'| + | '1' | + * Check movements by the Register "R2040 Taxes incoming" + And I click "Registrations report info" button + And I select "R2040 Taxes incoming" exact value from "Register" drop-down list + And I click "Generate report" button + Then "ResultTable" spreadsheet document is equal + | 'Debit note 1 dated 05.04.2021 09:30:36' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R2040 Taxes incoming"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Tax' | 'Tax rate' | 'Invoice type' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Amount' | + | '' | '05.04.2021 09:30:36' | 'Receipt' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Return' | 'Local currency' | 'TRY' | 'TRY' | '350,85' | + | '' | '05.04.2021 09:30:36' | 'Receipt' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Return' | 'Reporting currency' | 'USD' | 'TRY' | '60,07' | + | '' | '05.04.2021 09:30:36' | 'Receipt' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Return' | 'en description is empty' | 'TRY' | 'TRY' | '350,85' | + And I close all client application windows + +Scenario: _043018 check DebitNote movements by the Register "R2040 Taxes incoming" (with customer) + And I close all client application windows + * Select DN + Given I open hyperlink "e1cib/list/Document.DebitNote" + And I go to line in "List" table + | 'Number'| + | '2' | + * Check movements by the Register "R2040 Taxes incoming" + And I click "Registrations report info" button + And I select "R2040 Taxes incoming" exact value from "Register" drop-down list + And I click "Generate report" button + Then "ResultTable" spreadsheet document is equal + | 'Debit note 2 dated 05.04.2021 09:31:09' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R2040 Taxes incoming"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Tax' | 'Tax rate' | 'Invoice type' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Amount' | + | '' | '05.04.2021 09:31:09' | 'Receipt' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Invoice' | 'Local currency' | 'TRY' | 'TRY' | '15,25' | + | '' | '05.04.2021 09:31:09' | 'Receipt' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Invoice' | 'Reporting currency' | 'USD' | 'TRY' | '2,61' | + | '' | '05.04.2021 09:31:09' | 'Receipt' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Invoice' | 'en description is empty' | 'TRY' | 'TRY' | '15,25' | + And I close all client application windows + Scenario: _043030 Debit note clear posting/mark for deletion And I close all client application windows * Select Debit note diff --git a/features/Internal/_0400 Movements/_431CreditNoteMovements.feature b/features/Internal/_0400 Movements/_431CreditNoteMovements.feature index fca3da8b95..eaeef34163 100644 --- a/features/Internal/_0400 Movements/_431CreditNoteMovements.feature +++ b/features/Internal/_0400 Movements/_431CreditNoteMovements.feature @@ -41,7 +41,8 @@ Scenario: _043100 preparation (Credit note) When Create catalog PartnerSegments objects When Create chart of characteristic types CurrencyMovementType objects When Create catalog TaxRates objects - When Create catalog Taxes objects + When Create catalog Taxes objects + When Create catalog Taxes objects (for debit and credit note) When Create information register TaxSettings records When Create information register PricesByItemKeys records When Create catalog IntegrationSettings objects @@ -282,9 +283,9 @@ Scenario: _043106 check Credit note movements by the Register "R5022 Expenses" ( | 'Register "R5022 Expenses"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | 'Period' | 'Resources' | '' | '' | 'Dimensions' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | 'Attributes' | | '' | '' | 'Amount' | 'Amount with taxes' | 'Amount cost' | 'Company' | 'Branch' | 'Profit loss center' | 'Expense type' | 'Item key' | 'Fixed asset' | 'Ledger type' | 'Currency' | 'Additional analytic' | 'Multi currency movement type' | 'Project' | 'Calculation movement cost' | - | '' | '05.04.2021 09:30:47' | '85,6' | '85,6' | '' | 'Main Company' | 'Front office' | 'Distribution department' | 'Software' | '' | '' | '' | 'USD' | '' | 'Reporting currency' | '' | '' | - | '' | '05.04.2021 09:30:47' | '500' | '500' | '' | 'Main Company' | 'Front office' | 'Distribution department' | 'Software' | '' | '' | '' | 'TRY' | '' | 'Local currency' | '' | '' | - | '' | '05.04.2021 09:30:47' | '500' | '500' | '' | 'Main Company' | 'Front office' | 'Distribution department' | 'Software' | '' | '' | '' | 'TRY' | '' | 'en description is empty' | '' | '' | + | '' | '05.04.2021 09:30:47' | '72,54' | '85,6' | '' | 'Main Company' | 'Front office' | 'Distribution department' | 'Software' | '' | '' | '' | 'USD' | '' | 'Reporting currency' | '' | '' | + | '' | '05.04.2021 09:30:47' | '423,73' | '500' | '' | 'Main Company' | 'Front office' | 'Distribution department' | 'Software' | '' | '' | '' | 'TRY' | '' | 'Local currency' | '' | '' | + | '' | '05.04.2021 09:30:47' | '423,73' | '500' | '' | 'Main Company' | 'Front office' | 'Distribution department' | 'Software' | '' | '' | '' | 'TRY' | '' | 'en description is empty' | '' | '' | And I close all client application windows Scenario: _043107 check Credit note movements by the Register "R5022 Expenses" (with customer) @@ -304,9 +305,9 @@ Scenario: _043107 check Credit note movements by the Register "R5022 Expenses" ( | 'Register "R5022 Expenses"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | 'Period' | 'Resources' | '' | '' | 'Dimensions' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | 'Attributes' | | '' | '' | 'Amount' | 'Amount with taxes' | 'Amount cost' | 'Company' | 'Branch' | 'Profit loss center' | 'Expense type' | 'Item key' | 'Fixed asset' | 'Ledger type' | 'Currency' | 'Additional analytic' | 'Multi currency movement type' | 'Project' | 'Calculation movement cost' | - | '' | '05.04.2021 09:30:58' | '119,84' | '119,84' | '' | 'Main Company' | 'Front office' | 'Distribution department' | 'Software' | '' | '' | '' | 'USD' | '' | 'Reporting currency' | '' | '' | - | '' | '05.04.2021 09:30:58' | '700' | '700' | '' | 'Main Company' | 'Front office' | 'Distribution department' | 'Software' | '' | '' | '' | 'TRY' | '' | 'Local currency' | '' | '' | - | '' | '05.04.2021 09:30:58' | '700' | '700' | '' | 'Main Company' | 'Front office' | 'Distribution department' | 'Software' | '' | '' | '' | 'TRY' | '' | 'en description is empty' | '' | '' | + | '' | '05.04.2021 09:30:58' | '101,56' | '119,84' | '' | 'Main Company' | 'Front office' | 'Distribution department' | 'Software' | '' | '' | '' | 'USD' | '' | 'Reporting currency' | '' | '' | + | '' | '05.04.2021 09:30:58' | '593,22' | '700' | '' | 'Main Company' | 'Front office' | 'Distribution department' | 'Software' | '' | '' | '' | 'TRY' | '' | 'Local currency' | '' | '' | + | '' | '05.04.2021 09:30:58' | '593,22' | '700' | '' | 'Main Company' | 'Front office' | 'Distribution department' | 'Software' | '' | '' | '' | 'TRY' | '' | 'en description is empty' | '' | '' | And I close all client application windows Scenario: _043108 check Credit note movements by the Register "R5022 Expenses" (OtherPartnersTransactions) @@ -498,7 +499,45 @@ Scenario: _043017 check absence Credit note movements by the Register "T2014 Ad | 'Register "T2014 Advances info"' | And I close all client application windows +Scenario: _043018 check Credit note movements by the Register "R1040 Taxes outgoing" (with customer) + And I close all client application windows + * Select CN + Given I open hyperlink "e1cib/list/Document.CreditNote" + And I go to line in "List" table + | 'Number'| + | '2' | + * Check movements by the Register "R1040 Taxes outgoing" + And I click "Registrations report info" button + And I select "R1040 Taxes outgoing" exact value from "Register" drop-down list + And I click "Generate report" button + Then "ResultTable" spreadsheet document is equal + | 'Credit note 2 dated 05.04.2021 09:30:58' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R1040 Taxes outgoing"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Tax' | 'Tax rate' | 'Invoice type' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Amount' | + | '' | '05.04.2021 09:30:58' | 'Receipt' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Return' | 'Local currency' | 'TRY' | 'TRY' | '106,78' | + | '' | '05.04.2021 09:30:58' | 'Receipt' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Return' | 'Reporting currency' | 'USD' | 'TRY' | '18,28' | + | '' | '05.04.2021 09:30:58' | 'Receipt' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Return' | 'en description is empty' | 'TRY' | 'TRY' | '106,78' | + And I close all client application windows +Scenario: _043019 check Credit note movements by the Register "R1040 Taxes outgoing" (with vendor) + And I close all client application windows + * Select CN + Given I open hyperlink "e1cib/list/Document.CreditNote" + And I go to line in "List" table + | 'Number'| + | '1' | + * Check movements by the Register "R1040 Taxes outgoing" + And I click "Registrations report info" button + And I select "R1040 Taxes outgoing" exact value from "Register" drop-down list + And I click "Generate report" button + Then "ResultTable" spreadsheet document is equal + | 'Credit note 1 dated 05.04.2021 09:30:47' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R1040 Taxes outgoing"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Tax' | 'Tax rate' | 'Invoice type' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Amount' | + | '' | '05.04.2021 09:30:47' | 'Receipt' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Invoice' | 'Local currency' | 'TRY' | 'TRY' | '76,27' | + | '' | '05.04.2021 09:30:47' | 'Receipt' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Invoice' | 'Reporting currency' | 'USD' | 'TRY' | '13,06' | + | '' | '05.04.2021 09:30:47' | 'Receipt' | 'Main Company' | 'Front office' | 'VAT' | '18%' | 'Invoice' | 'en description is empty' | 'TRY' | 'TRY' | '76,27' | + And I close all client application windows Scenario: _043130 Credit note clear posting/mark for deletion And I close all client application windows diff --git a/features/Internal/_0400 Movements/_432DebitCreditNoteMovements.feature b/features/Internal/_0400 Movements/_432DebitCreditNoteMovements.feature index fecdc92bba..62c69f209d 100644 --- a/features/Internal/_0400 Movements/_432DebitCreditNoteMovements.feature +++ b/features/Internal/_0400 Movements/_432DebitCreditNoteMovements.feature @@ -141,6 +141,7 @@ Scenario: _0432002 check DebitCreditNote movements by the register "R2020 Advanc | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Order' | 'Agreement' | 'Project' | 'Amount' | 'Deferred calculation' | 'Customers advances closing' | | '' | '20.02.2024 13:27:56' | 'Expense' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Basic Partner terms, TRY' | '' | '500' | 'No' | '' | | '' | '20.02.2024 13:27:56' | 'Expense' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Basic Partner terms, TRY' | '' | '85,6' | 'No' | '' | + | '' | '20.02.2024 13:27:56' | 'Expense' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Basic Partner terms, TRY' | '' | '500' | 'No' | '' | | '' | '20.02.2024 13:27:56' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Basic Partner terms, TRY' | '' | '500' | 'No' | '' | And I close all client application windows @@ -161,6 +162,7 @@ Scenario: _0432003 check DebitCreditNote movements by the register "R2021 Custom | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Agreement' | 'Basis' | 'Order' | 'Project' | 'Amount' | 'Deferred calculation' | 'Customers advances closing' | | '' | '20.02.2024 13:27:56' | 'Expense' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | 'Sales invoice 116 dated 19.02.2024 19:49:32' | '' | '' | '500' | 'No' | '' | | '' | '20.02.2024 13:27:56' | 'Expense' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | 'Sales invoice 116 dated 19.02.2024 19:49:32' | '' | '' | '85,6' | 'No' | '' | + | '' | '20.02.2024 13:27:56' | 'Expense' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | 'Sales invoice 116 dated 19.02.2024 19:49:32' | '' | '' | '500' | 'No' | '' | | '' | '20.02.2024 13:27:56' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | 'Sales invoice 116 dated 19.02.2024 19:49:32' | '' | '' | '500' | 'No' | '' | And I close all client application windows @@ -179,7 +181,7 @@ Scenario: _0432004 check DebitCreditNote movements by the register "T2014 Advanc | 'Debit/Credit note 2 dated 20.02.2024 13:27:56' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | 'Register "T2014 Advances info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | 'Company' | 'Branch' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Order' | 'Is vendor advance' | 'Is customer advance' | 'Unique ID' | 'Advance agreement' | 'Project' | 'Amount' | 'Is purchase order close' | 'Is sales order close' | 'Record type' | - | '' | 'Main Company' | 'Front office' | '20.02.2024 13:27:56' | ' ' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'No' | 'Yes' | '*' | 'Basic Partner terms, TRY' | '' | '500' | 'No' | 'No' | 'Expense' | + | '' | 'Main Company' | 'Front office' | '20.02.2024 13:27:56' | '*' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'No' | 'Yes' | '*' | 'Basic Partner terms, TRY' | '' | '500' | 'No' | 'No' | 'Expense' | And I close all client application windows Scenario: _0432005 check DebitCreditNote movements by the register "T2015 Transactions info" (CA-CT, by documents, same partner) @@ -197,7 +199,7 @@ Scenario: _0432005 check DebitCreditNote movements by the register "T2015 Trans | 'Debit/Credit note 2 dated 20.02.2024 13:27:56' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | 'Register "T2015 Transactions info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | 'Company' | 'Branch' | 'Order' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Agreement' | 'Is vendor transaction' | 'Is customer transaction' | 'Transaction basis' | 'Unique ID' | 'Project' | 'Amount' | 'Is due' | 'Is paid' | - | '' | 'Main Company' | 'Front office' | '' | '20.02.2024 13:27:56' | ' ' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | 'No' | 'Yes' | 'Sales invoice 116 dated 19.02.2024 19:49:32' | '*' | '' | '500' | 'No' | 'Yes' | + | '' | 'Main Company' | 'Front office' | '' | '20.02.2024 13:27:56' | '*' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | 'No' | 'Yes' | 'Sales invoice 116 dated 19.02.2024 19:49:32' | '*' | '' | '500' | 'No' | 'Yes' | And I close all client application windows Scenario: _0432006 check DebitCreditNote movements by the register "R5020 Partners balance" (CA-CT, by documents, same partner) @@ -216,9 +218,11 @@ Scenario: _0432006 check DebitCreditNote movements by the register "R5020 Partn | 'Register "R5020 Partners balance"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Partner' | 'Legal name' | 'Agreement' | 'Document' | 'Currency' | 'Multi currency movement type' | 'Transaction currency' | 'Amount' | 'Customer transaction' | 'Customer advance' | 'Vendor transaction' | 'Vendor advance' | 'Other transaction' | 'Advances closing' | | '' | '20.02.2024 13:27:56' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'Local currency' | 'TRY' | '500' | '' | '500' | '' | '' | '' | '' | + | '' | '20.02.2024 13:27:56' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'TRY' | 'TRY' | '500' | '' | '500' | '' | '' | '' | '' | | '' | '20.02.2024 13:27:56' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'en description is empty' | 'TRY' | '500' | '' | '500' | '' | '' | '' | '' | | '' | '20.02.2024 13:27:56' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | '' | 'USD' | 'Reporting currency' | 'TRY' | '85,6' | '' | '85,6' | '' | '' | '' | '' | | '' | '20.02.2024 13:27:56' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | 'Sales invoice 116 dated 19.02.2024 19:49:32' | 'TRY' | 'Local currency' | 'TRY' | '500' | '500' | '' | '' | '' | '' | '' | + | '' | '20.02.2024 13:27:56' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | 'Sales invoice 116 dated 19.02.2024 19:49:32' | 'TRY' | 'TRY' | 'TRY' | '500' | '500' | '' | '' | '' | '' | '' | | '' | '20.02.2024 13:27:56' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | 'Sales invoice 116 dated 19.02.2024 19:49:32' | 'TRY' | 'en description is empty' | 'TRY' | '500' | '500' | '' | '' | '' | '' | '' | | '' | '20.02.2024 13:27:56' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | 'Sales invoice 116 dated 19.02.2024 19:49:32' | 'USD' | 'Reporting currency' | 'TRY' | '85,6' | '85,6' | '' | '' | '' | '' | '' | And I close all client application windows @@ -256,6 +260,7 @@ Scenario: _0432008 check DebitCreditNote movements by the register "R2021 Custom | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Agreement' | 'Basis' | 'Order' | 'Project' | 'Amount' | 'Deferred calculation' | 'Customers advances closing' | | '' | '20.02.2024 10:01:09' | 'Expense' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | '' | '' | '' | '121' | 'No' | '' | | '' | '20.02.2024 10:01:09' | 'Expense' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | '' | '' | '' | '20,72' | 'No' | '' | + | '' | '20.02.2024 10:01:09' | 'Expense' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | '' | '' | '' | '121' | 'No' | '' | | '' | '20.02.2024 10:01:09' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | '' | '' | '' | '121' | 'No' | '' | And I close all client application windows @@ -276,6 +281,7 @@ Scenario: _0432009 check DebitCreditNote movements by the register "R1020 Advanc | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Order' | 'Agreement' | 'Project' | 'Amount' | 'Deferred calculation' | 'Vendors advances closing' | | '' | '20.02.2024 10:01:09' | 'Receipt' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Vendor (by documents)' | '' | '121' | 'No' | '' | | '' | '20.02.2024 10:01:09' | 'Receipt' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Vendor (by documents)' | '' | '20,72' | 'No' | '' | + | '' | '20.02.2024 10:01:09' | 'Receipt' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Vendor (by documents)' | '' | '121' | 'No' | '' | | '' | '20.02.2024 10:01:09' | 'Receipt' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Vendor (by documents)' | '' | '121' | 'No' | '' | And I close all client application windows @@ -294,7 +300,7 @@ Scenario: _0432010 check DebitCreditNote movements by the register "T2014 Advanc | 'Debit/Credit note 1 dated 20.02.2024 10:01:09' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | 'Register "T2014 Advances info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | 'Company' | 'Branch' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Order' | 'Is vendor advance' | 'Is customer advance' | 'Unique ID' | 'Advance agreement' | 'Project' | 'Amount' | 'Is purchase order close' | 'Is sales order close' | 'Record type' | - | '' | 'Main Company' | 'Front office' | '20.02.2024 10:01:09' | ' ' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Yes' | 'No' | '*' | 'Vendor (by documents)' | '' | '121' | 'No' | 'No' | 'Receipt' | + | '' | 'Main Company' | 'Front office' | '20.02.2024 10:01:09' | '*' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Yes' | 'No' | '*' | 'Vendor (by documents)' | '' | '121' | 'No' | 'No' | 'Receipt' | And I close all client application windows Scenario: _0432011 check DebitCreditNote movements by the register "T2015 Transactions info" (CT-VA, by documents, same partner) @@ -312,7 +318,7 @@ Scenario: _0432011 check DebitCreditNote movements by the register "T2015 Trans | 'Debit/Credit note 1 dated 20.02.2024 10:01:09' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | 'Register "T2015 Transactions info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | 'Company' | 'Branch' | 'Order' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Agreement' | 'Is vendor transaction' | 'Is customer transaction' | 'Transaction basis' | 'Unique ID' | 'Project' | 'Amount' | 'Is due' | 'Is paid' | - | '' | 'Main Company' | 'Front office' | '' | '20.02.2024 10:01:09' | ' ' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | 'No' | 'Yes' | '' | '*' | '' | '121' | 'No' | 'Yes' | + | '' | 'Main Company' | 'Front office' | '' | '20.02.2024 10:01:09' | '*' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | 'No' | 'Yes' | '' | '*' | '' | '121' | 'No' | 'Yes' | And I close all client application windows Scenario: _0432012 check DebitCreditNote movements by the register "R5020 Partners balance" (CT-VA, by documents, same partner) @@ -331,9 +337,11 @@ Scenario: _0432012 check DebitCreditNote movements by the register "R5020 Partn | 'Register "R5020 Partners balance"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Partner' | 'Legal name' | 'Agreement' | 'Document' | 'Currency' | 'Multi currency movement type' | 'Transaction currency' | 'Amount' | 'Customer transaction' | 'Customer advance' | 'Vendor transaction' | 'Vendor advance' | 'Other transaction' | 'Advances closing' | | '' | '20.02.2024 10:01:09' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Vendor (by documents)' | '' | 'TRY' | 'Local currency' | 'TRY' | '121' | '' | '' | '' | '121' | '' | '' | + | '' | '20.02.2024 10:01:09' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Vendor (by documents)' | '' | 'TRY' | 'TRY' | 'TRY' | '121' | '' | '' | '' | '121' | '' | '' | | '' | '20.02.2024 10:01:09' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Vendor (by documents)' | '' | 'TRY' | 'en description is empty' | 'TRY' | '121' | '' | '' | '' | '121' | '' | '' | | '' | '20.02.2024 10:01:09' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Vendor (by documents)' | '' | 'USD' | 'Reporting currency' | 'TRY' | '20,72' | '' | '' | '' | '20,72' | '' | '' | | '' | '20.02.2024 10:01:09' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'Local currency' | 'TRY' | '121' | '121' | '' | '' | '' | '' | '' | + | '' | '20.02.2024 10:01:09' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'TRY' | 'TRY' | '121' | '121' | '' | '' | '' | '' | '' | | '' | '20.02.2024 10:01:09' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'en description is empty' | 'TRY' | '121' | '121' | '' | '' | '' | '' | '' | | '' | '20.02.2024 10:01:09' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | '' | 'USD' | 'Reporting currency' | 'TRY' | '20,72' | '20,72' | '' | '' | '' | '' | '' | And I close all client application windows @@ -356,10 +364,12 @@ Scenario: _0432013 check DebitCreditNote movements by the register "R2020 Advanc | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Order' | 'Agreement' | 'Project' | 'Amount' | 'Deferred calculation' | 'Customers advances closing' | | '' | '30.03.2024 11:34:17' | 'Receipt' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Basic Partner terms, without VAT' | '' | '128' | 'No' | '' | | '' | '30.03.2024 11:34:17' | 'Receipt' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Basic Partner terms, without VAT' | '' | '21,91' | 'No' | '' | + | '' | '30.03.2024 11:34:17' | 'Receipt' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Basic Partner terms, without VAT' | '' | '128' | 'No' | '' | | '' | '30.03.2024 11:34:17' | 'Receipt' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Basic Partner terms, without VAT' | '' | '128' | 'No' | '' | | '' | '30.03.2024 11:34:17' | 'Expense' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Basic Partner terms, TRY' | '' | '128' | 'No' | '' | | '' | '30.03.2024 11:34:17' | 'Expense' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Basic Partner terms, TRY' | '' | '21,91' | 'No' | '' | - | '' | '30.03.2024 11:34:17' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Basic Partner terms, TRY' | '' | '128' | 'No' | '' | + | '' | '30.03.2024 11:34:17' | 'Expense' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Basic Partner terms, TRY' | '' | '128' | 'No' | '' | + | '' | '30.03.2024 11:34:17' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Basic Partner terms, TRY' | '' | '128' | 'No' | '' | And I close all client application windows Scenario: _0432014 check DebitCreditNote movements by the register "T2014 Advances info" (CA-CA, by documents, same partner) @@ -374,11 +384,11 @@ Scenario: _0432014 check DebitCreditNote movements by the register "T2014 Advanc And I select "T2014 Advances info" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document contains lines - | 'Debit/Credit note 3 dated 30.03.2024 11:34:17' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "T2014 Advances info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Company' | 'Branch' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Order' | 'Is vendor advance' | 'Is customer advance' | 'Unique ID' | 'Advance agreement' | 'Project' | 'Amount' | 'Is purchase order close' | 'Is sales order close' | 'Record type' | - | '' | 'Main Company' | 'Front office' | '30.03.2024 11:34:17' | ' ' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'No' | 'Yes' | '*' | 'Basic Partner terms, without VAT' | '' | '128' | 'No' | 'No' | 'Receipt' | - | '' | 'Main Company' | 'Front office' | '30.03.2024 11:34:17' | ' ' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'No' | 'Yes' | '*' | 'Basic Partner terms, TRY' | '' | '128' | 'No' | 'No' | 'Expense' | + | 'Debit/Credit note 3 dated 30.03.2024 11:34:17' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "T2014 Advances info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Company' | 'Branch' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Order' | 'Is vendor advance' | 'Is customer advance' | 'Unique ID' | 'Advance agreement' | 'Project' | 'Amount' | 'Is purchase order close' | 'Is sales order close' | 'Record type' | + | '' | 'Main Company' | 'Front office' | '30.03.2024 11:34:17' | '*' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'No' | 'Yes' | '*' | 'Basic Partner terms, without VAT' | '' | '128' | 'No' | 'No' | 'Receipt' | + | '' | 'Main Company' | 'Front office' | '30.03.2024 11:34:17' | '*' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'No' | 'Yes' | '*' | 'Basic Partner terms, TRY' | '' | '128' | 'No' | 'No' | 'Expense' | And I close all client application windows Scenario: _0432015 check DebitCreditNote movements by the register "R5020 Partners balance" (CA-CA, by documents, same partner) @@ -397,11 +407,13 @@ Scenario: _0432015 check DebitCreditNote movements by the register "R5020 Partn | 'Register "R5020 Partners balance"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Partner' | 'Legal name' | 'Agreement' | 'Document' | 'Currency' | 'Multi currency movement type' | 'Transaction currency' | 'Amount' | 'Customer transaction' | 'Customer advance' | 'Vendor transaction' | 'Vendor advance' | 'Other transaction' | 'Advances closing' | | '' | '30.03.2024 11:34:17' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'Local currency' | 'TRY' | '128' | '' | '128' | '' | '' | '' | '' | + | '' | '30.03.2024 11:34:17' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'TRY' | 'TRY' | '128' | '' | '128' | '' | '' | '' | '' | | '' | '30.03.2024 11:34:17' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'en description is empty' | 'TRY' | '128' | '' | '128' | '' | '' | '' | '' | | '' | '30.03.2024 11:34:17' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | '' | 'USD' | 'Reporting currency' | 'TRY' | '21,91' | '' | '21,91' | '' | '' | '' | '' | | '' | '30.03.2024 11:34:17' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, without VAT' | '' | 'TRY' | 'Local currency' | 'TRY' | '128' | '' | '128' | '' | '' | '' | '' | + | '' | '30.03.2024 11:34:17' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, without VAT' | '' | 'TRY' | 'TRY' | 'TRY' | '128' | '' | '128' | '' | '' | '' | '' | | '' | '30.03.2024 11:34:17' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, without VAT' | '' | 'TRY' | 'en description is empty' | 'TRY' | '128' | '' | '128' | '' | '' | '' | '' | - | '' | '30.03.2024 11:34:17' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, without VAT' | '' | 'USD' | 'Reporting currency' | 'TRY' | '21,91' | '' | '21,91' | '' | '' | '' | '' | + | '' | '30.03.2024 11:34:17' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, without VAT' | '' | 'USD' | 'Reporting currency' | 'TRY' | '21,91' | '' | '21,91' | '' | '' | '' | '' | And I close all client application windows # @@ -422,10 +434,12 @@ Scenario: _0432016 check DebitCreditNote movements by the register "R1020 Advanc | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Order' | 'Agreement' | 'Project' | 'Amount' | 'Deferred calculation' | 'Vendors advances closing' | | '' | '01.04.2024 11:48:58' | 'Receipt' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Vendor (by documents) 2' | '' | '127' | 'No' | '' | | '' | '01.04.2024 11:48:58' | 'Receipt' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Vendor (by documents) 2' | '' | '21,74' | 'No' | '' | + | '' | '01.04.2024 11:48:58' | 'Receipt' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Vendor (by documents) 2' | '' | '127' | 'No' | '' | | '' | '01.04.2024 11:48:58' | 'Receipt' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Vendor (by documents) 2' | '' | '127' | 'No' | '' | | '' | '01.04.2024 11:48:58' | 'Expense' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Vendor (by documents)' | '' | '127' | 'No' | '' | | '' | '01.04.2024 11:48:58' | 'Expense' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Vendor (by documents)' | '' | '21,74' | 'No' | '' | - | '' | '01.04.2024 11:48:58' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Vendor (by documents)' | '' | '127' | 'No' | '' | + | '' | '01.04.2024 11:48:58' | 'Expense' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Vendor (by documents)' | '' | '127' | 'No' | '' | + | '' | '01.04.2024 11:48:58' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Vendor (by documents)' | '' | '127' | 'No' | '' | And I close all client application windows Scenario: _0432017 check DebitCreditNote movements by the register "T2014 Advances info" (VA-VA, by documents, same partner) @@ -440,11 +454,11 @@ Scenario: _0432017 check DebitCreditNote movements by the register "T2014 Advanc And I select "T2014 Advances info" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document contains lines - | 'Debit/Credit note 4 dated 01.04.2024 11:48:58' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "T2014 Advances info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Company' | 'Branch' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Order' | 'Is vendor advance' | 'Is customer advance' | 'Unique ID' | 'Advance agreement' | 'Project' | 'Amount' | 'Is purchase order close' | 'Is sales order close' | 'Record type' | - | '' | 'Main Company' | 'Front office' | '01.04.2024 11:48:58' | ' ' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Yes' | 'No' | '*' | 'Vendor (by documents)' | '' | '127' | 'No' | 'No' | 'Expense' | - | '' | 'Main Company' | 'Front office' | '01.04.2024 11:48:58' | ' ' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Yes' | 'No' | '*' | 'Vendor (by documents) 2' | '' | '127' | 'No' | 'No' | 'Receipt' | + | 'Debit/Credit note 4 dated 01.04.2024 11:48:58' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "T2014 Advances info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Company' | 'Branch' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Order' | 'Is vendor advance' | 'Is customer advance' | 'Unique ID' | 'Advance agreement' | 'Project' | 'Amount' | 'Is purchase order close' | 'Is sales order close' | 'Record type' | + | '' | 'Main Company' | 'Front office' | '01.04.2024 11:48:58' | '*' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Yes' | 'No' | '*' | 'Vendor (by documents)' | '' | '127' | 'No' | 'No' | 'Expense' | + | '' | 'Main Company' | 'Front office' | '01.04.2024 11:48:58' | '*' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Yes' | 'No' | '*' | 'Vendor (by documents) 2' | '' | '127' | 'No' | 'No' | 'Receipt' | And I close all client application windows Scenario: _0432018 check DebitCreditNote movements by the register "R5020 Partners balance" (VA-VA, by documents, same partner) @@ -463,11 +477,13 @@ Scenario: _0432018 check DebitCreditNote movements by the register "R5020 Partn | 'Register "R5020 Partners balance"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Partner' | 'Legal name' | 'Agreement' | 'Document' | 'Currency' | 'Multi currency movement type' | 'Transaction currency' | 'Amount' | 'Customer transaction' | 'Customer advance' | 'Vendor transaction' | 'Vendor advance' | 'Other transaction' | 'Advances closing' | | '' | '01.04.2024 11:48:58' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Vendor (by documents) 2' | '' | 'TRY' | 'Local currency' | 'TRY' | '127' | '' | '' | '' | '127' | '' | '' | + | '' | '01.04.2024 11:48:58' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Vendor (by documents) 2' | '' | 'TRY' | 'TRY' | 'TRY' | '127' | '' | '' | '' | '127' | '' | '' | | '' | '01.04.2024 11:48:58' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Vendor (by documents) 2' | '' | 'TRY' | 'en description is empty' | 'TRY' | '127' | '' | '' | '' | '127' | '' | '' | | '' | '01.04.2024 11:48:58' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Vendor (by documents) 2' | '' | 'USD' | 'Reporting currency' | 'TRY' | '21,74' | '' | '' | '' | '21,74' | '' | '' | | '' | '01.04.2024 11:48:58' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Vendor (by documents)' | '' | 'TRY' | 'Local currency' | 'TRY' | '127' | '' | '' | '' | '127' | '' | '' | + | '' | '01.04.2024 11:48:58' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Vendor (by documents)' | '' | 'TRY' | 'TRY' | 'TRY' | '127' | '' | '' | '' | '127' | '' | '' | | '' | '01.04.2024 11:48:58' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Vendor (by documents)' | '' | 'TRY' | 'en description is empty' | 'TRY' | '127' | '' | '' | '' | '127' | '' | '' | - | '' | '01.04.2024 11:48:58' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Vendor (by documents)' | '' | 'USD' | 'Reporting currency' | 'TRY' | '21,74' | '' | '' | '' | '21,74' | '' | '' | + | '' | '01.04.2024 11:48:58' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Vendor (by documents)' | '' | 'USD' | 'Reporting currency' | 'TRY' | '21,74' | '' | '' | '' | '21,74' | '' | '' | And I close all client application windows # @@ -488,9 +504,11 @@ Scenario: _0432019 check DebitCreditNote movements by the register "R2021 Custom | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Agreement' | 'Basis' | 'Order' | 'Project' | 'Amount' | 'Deferred calculation' | 'Customers advances closing' | | '' | '02.04.2024 13:06:46' | 'Receipt' | 'Main Company' | 'Distribution department' | 'Local currency' | 'TRY' | 'TRY' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | '' | '' | '111' | 'No' | '' | | '' | '02.04.2024 13:06:46' | 'Receipt' | 'Main Company' | 'Distribution department' | 'Reporting currency' | 'USD' | 'TRY' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | '' | '' | '19' | 'No' | '' | + | '' | '02.04.2024 13:06:46' | 'Receipt' | 'Main Company' | 'Distribution department' | 'TRY' | 'TRY' | 'TRY' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | '' | '' | '111' | 'No' | '' | | '' | '02.04.2024 13:06:46' | 'Receipt' | 'Main Company' | 'Distribution department' | 'en description is empty' | 'TRY' | 'TRY' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | '' | '' | '111' | 'No' | '' | | '' | '02.04.2024 13:06:46' | 'Expense' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | '' | '' | '111' | 'No' | '' | | '' | '02.04.2024 13:06:46' | 'Expense' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | '' | '' | '19' | 'No' | '' | + | '' | '02.04.2024 13:06:46' | 'Expense' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | '' | '' | '111' | 'No' | '' | | '' | '02.04.2024 13:06:46' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | '' | '' | '111' | 'No' | '' | And I close all client application windows @@ -506,11 +524,11 @@ Scenario: _0432020 check DebitCreditNote movements by the register "T2015 Transa And I select "T2015 Transactions info" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Debit/Credit note 5 dated 02.04.2024 13:06:46' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "T2015 Transactions info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Company' | 'Branch' | 'Order' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Agreement' | 'Is vendor transaction' | 'Is customer transaction' | 'Transaction basis' | 'Unique ID' | 'Project' | 'Amount' | 'Is due' | 'Is paid' | - | '' | 'Main Company' | 'Front office' | '' | '02.04.2024 13:06:46' | ' ' | 'TRY' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'No' | 'Yes' | '' | '*' | '' | '111' | 'No' | 'Yes' | - | '' | 'Main Company' | 'Distribution department' | '' | '02.04.2024 13:06:46' | ' ' | 'TRY' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'No' | 'Yes' | '' | '*' | '' | '111' | 'Yes' | 'No' | + | 'Debit/Credit note 5 dated 02.04.2024 13:06:46' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "T2015 Transactions info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Company' | 'Branch' | 'Order' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Agreement' | 'Is vendor transaction' | 'Is customer transaction' | 'Transaction basis' | 'Unique ID' | 'Project' | 'Amount' | 'Is due' | 'Is paid' | + | '' | 'Main Company' | 'Front office' | '' | '02.04.2024 13:06:46' | '*' | 'TRY' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'No' | 'Yes' | '' | '*' | '' | '111' | 'No' | 'Yes' | + | '' | 'Main Company' | 'Distribution department' | '' | '02.04.2024 13:06:46' | '*' | 'TRY' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'No' | 'Yes' | '' | '*' | '' | '111' | 'Yes' | 'No' | And I close all client application windows Scenario: _0432059 check DebitCreditNote movements by the register "R5020 Partners balance" (CT-CT, by partner terms, same partner) @@ -529,9 +547,11 @@ Scenario: _0432059 check DebitCreditNote movements by the register "R5020 Partne | 'Register "R5020 Partners balance"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Partner' | 'Legal name' | 'Agreement' | 'Document' | 'Currency' | 'Multi currency movement type' | 'Transaction currency' | 'Amount' | 'Customer transaction' | 'Customer advance' | 'Vendor transaction' | 'Vendor advance' | 'Other transaction' | 'Advances closing' | | '' | '02.04.2024 13:06:46' | 'Receipt' | 'Main Company' | 'Distribution department' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | 'TRY' | 'Local currency' | 'TRY' | '111' | '111' | '' | '' | '' | '' | '' | + | '' | '02.04.2024 13:06:46' | 'Receipt' | 'Main Company' | 'Distribution department' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | 'TRY' | 'TRY' | 'TRY' | '111' | '111' | '' | '' | '' | '' | '' | | '' | '02.04.2024 13:06:46' | 'Receipt' | 'Main Company' | 'Distribution department' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | 'TRY' | 'en description is empty' | 'TRY' | '111' | '111' | '' | '' | '' | '' | '' | | '' | '02.04.2024 13:06:46' | 'Receipt' | 'Main Company' | 'Distribution department' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | 'USD' | 'Reporting currency' | 'TRY' | '19' | '19' | '' | '' | '' | '' | '' | | '' | '02.04.2024 13:06:46' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | 'TRY' | 'Local currency' | 'TRY' | '111' | '111' | '' | '' | '' | '' | '' | + | '' | '02.04.2024 13:06:46' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | 'TRY' | 'TRY' | 'TRY' | '111' | '111' | '' | '' | '' | '' | '' | | '' | '02.04.2024 13:06:46' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | 'TRY' | 'en description is empty' | 'TRY' | '111' | '111' | '' | '' | '' | '' | '' | | '' | '02.04.2024 13:06:46' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | 'USD' | 'Reporting currency' | 'TRY' | '19' | '19' | '' | '' | '' | '' | '' | And I close all client application windows @@ -554,10 +574,12 @@ Scenario: _0432021 check DebitCreditNote movements by the register "R1021 Vendor | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Agreement' | 'Basis' | 'Order' | 'Project' | 'Amount' | 'Deferred calculation' | 'Vendors advances closing' | | '' | '26.04.2024 13:20:20' | 'Receipt' | 'Main Company' | 'Distribution department' | 'Local currency' | 'TRY' | 'TRY' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | '' | '' | '' | '109' | 'No' | '' | | '' | '26.04.2024 13:20:20' | 'Receipt' | 'Main Company' | 'Distribution department' | 'Reporting currency' | 'USD' | 'TRY' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | '' | '' | '' | '18,66' | 'No' | '' | + | '' | '26.04.2024 13:20:20' | 'Receipt' | 'Main Company' | 'Distribution department' | 'TRY' | 'TRY' | 'TRY' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | '' | '' | '' | '109' | 'No' | '' | | '' | '26.04.2024 13:20:20' | 'Receipt' | 'Main Company' | 'Distribution department' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | '' | '' | '' | '109' | 'No' | '' | | '' | '26.04.2024 13:20:20' | 'Expense' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | '' | '' | '' | '109' | 'No' | '' | | '' | '26.04.2024 13:20:20' | 'Expense' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | '' | '' | '' | '18,66' | 'No' | '' | - | '' | '26.04.2024 13:20:20' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | '' | '' | '' | '109' | 'No' | '' | + | '' | '26.04.2024 13:20:20' | 'Expense' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | '' | '' | '' | '109' | 'No' | '' | + | '' | '26.04.2024 13:20:20' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | '' | '' | '' | '109' | 'No' | '' | And I close all client application windows Scenario: _0432022 check DebitCreditNote movements by the register "T2015 Transactions info" (VT-VT, by partner terms, same partner) @@ -572,11 +594,11 @@ Scenario: _0432022 check DebitCreditNote movements by the register "T2015 Transa And I select "T2015 Transactions info" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Debit/Credit note 6 dated 26.04.2024 13:20:20' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "T2015 Transactions info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Company' | 'Branch' | 'Order' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Agreement' | 'Is vendor transaction' | 'Is customer transaction' | 'Transaction basis' | 'Unique ID' | 'Project' | 'Amount' | 'Is due' | 'Is paid' | - | '' | 'Main Company' | 'Front office' | '' | '26.04.2024 13:20:20' | ' ' | 'TRY' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | 'Yes' | 'No' | '' | '*' | '' | '109' | 'No' | 'Yes' | - | '' | 'Main Company' | 'Distribution department' | '' | '26.04.2024 13:20:20' | ' ' | 'TRY' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | 'Yes' | 'No' | '' | '*' | '' | '109' | 'Yes' | 'No' | + | 'Debit/Credit note 6 dated 26.04.2024 13:20:20' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "T2015 Transactions info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Company' | 'Branch' | 'Order' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Agreement' | 'Is vendor transaction' | 'Is customer transaction' | 'Transaction basis' | 'Unique ID' | 'Project' | 'Amount' | 'Is due' | 'Is paid' | + | '' | 'Main Company' | 'Front office' | '' | '26.04.2024 13:20:20' | '*' | 'TRY' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | 'Yes' | 'No' | '' | '*' | '' | '109' | 'No' | 'Yes' | + | '' | 'Main Company' | 'Distribution department' | '' | '26.04.2024 13:20:20' | '*' | 'TRY' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | 'Yes' | 'No' | '' | '*' | '' | '109' | 'Yes' | 'No' | And I close all client application windows # @@ -597,6 +619,7 @@ Scenario: _0432023 check DebitCreditNote movements by the register "R1021 Vendor | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Agreement' | 'Basis' | 'Order' | 'Project' | 'Amount' | 'Deferred calculation' | 'Vendors advances closing' | | '' | '26.04.2024 13:31:41' | 'Expense' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | '' | '' | '' | '21' | 'No' | '' | | '' | '26.04.2024 13:31:41' | 'Expense' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | '' | '' | '' | '3,6' | 'No' | '' | + | '' | '26.04.2024 13:31:41' | 'Expense' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | '' | '' | '' | '21' | 'No' | '' | | '' | '26.04.2024 13:31:41' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | '' | '' | '' | '21' | 'No' | '' | And I close all client application windows @@ -617,6 +640,7 @@ Scenario: _0432024 check DebitCreditNote movements by the register "R1020 Advanc | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Order' | 'Agreement' | 'Project' | 'Amount' | 'Deferred calculation' | 'Vendors advances closing' | | '' | '26.04.2024 13:31:41' | 'Expense' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Vendor (Advance, by documents)' | '' | '21' | 'No' | '' | | '' | '26.04.2024 13:31:41' | 'Expense' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Vendor (Advance, by documents)' | '' | '3,6' | 'No' | '' | + | '' | '26.04.2024 13:31:41' | 'Expense' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Vendor (Advance, by documents)' | '' | '21' | 'No' | '' | | '' | '26.04.2024 13:31:41' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Vendor (Advance, by documents)' | '' | '21' | 'No' | '' | And I close all client application windows @@ -636,9 +660,11 @@ Scenario: _0432025 check DebitCreditNote movements by the register "R5020 Partne | 'Register "R5020 Partners balance"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Partner' | 'Legal name' | 'Agreement' | 'Document' | 'Currency' | 'Multi currency movement type' | 'Transaction currency' | 'Amount' | 'Customer transaction' | 'Customer advance' | 'Vendor transaction' | 'Vendor advance' | 'Other transaction' | 'Advances closing' | | '' | '26.04.2024 13:31:41' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | '' | 'TRY' | 'Local currency' | 'TRY' | '21' | '' | '' | '21' | '' | '' | '' | + | '' | '26.04.2024 13:31:41' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | '' | 'TRY' | 'TRY' | 'TRY' | '21' | '' | '' | '21' | '' | '' | '' | | '' | '26.04.2024 13:31:41' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | '' | 'TRY' | 'en description is empty' | 'TRY' | '21' | '' | '' | '21' | '' | '' | '' | | '' | '26.04.2024 13:31:41' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | '' | 'USD' | 'Reporting currency' | 'TRY' | '3,6' | '' | '' | '3,6' | '' | '' | '' | | '' | '26.04.2024 13:31:41' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'TRY' | 'Local currency' | 'TRY' | '21' | '' | '' | '' | '21' | '' | '' | + | '' | '26.04.2024 13:31:41' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'TRY' | 'TRY' | 'TRY' | '21' | '' | '' | '' | '21' | '' | '' | | '' | '26.04.2024 13:31:41' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'TRY' | 'en description is empty' | 'TRY' | '21' | '' | '' | '' | '21' | '' | '' | | '' | '26.04.2024 13:31:41' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'USD' | 'Reporting currency' | 'TRY' | '3,6' | '' | '' | '' | '3,6' | '' | '' | And I close all client application windows @@ -655,10 +681,10 @@ Scenario: _0432026 check DebitCreditNote movements by the register "T2014 Advanc And I select "T2014 Advances info" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Debit/Credit note 7 dated 26.04.2024 13:31:41' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "T2014 Advances info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Company' | 'Branch' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Order' | 'Is vendor advance' | 'Is customer advance' | 'Unique ID' | 'Advance agreement' | 'Project' | 'Amount' | 'Is purchase order close' | 'Is sales order close' | 'Record type' | - | '' | 'Main Company' | 'Front office' | '26.04.2024 13:31:41' | ' ' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Yes' | 'No' | '*' | 'Vendor (Advance, by documents)' | '' | '21' | 'No' | 'No' | 'Expense' | + | 'Debit/Credit note 7 dated 26.04.2024 13:31:41' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "T2014 Advances info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Company' | 'Branch' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Order' | 'Is vendor advance' | 'Is customer advance' | 'Unique ID' | 'Advance agreement' | 'Project' | 'Amount' | 'Is purchase order close' | 'Is sales order close' | 'Record type' | + | '' | 'Main Company' | 'Front office' | '26.04.2024 13:31:41' | '*' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Yes' | 'No' | '*' | 'Vendor (Advance, by documents)' | '' | '21' | 'No' | 'No' | 'Expense' | And I close all client application windows Scenario: _0432027 check DebitCreditNote movements by the register "T2015 Transactions info" (VA-VT, by documents, different partners) @@ -673,10 +699,10 @@ Scenario: _0432027 check DebitCreditNote movements by the register "T2015 Transa And I select "T2015 Transactions info" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Debit/Credit note 7 dated 26.04.2024 13:31:41' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "T2015 Transactions info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Company' | 'Branch' | 'Order' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Agreement' | 'Is vendor transaction' | 'Is customer transaction' | 'Transaction basis' | 'Unique ID' | 'Project' | 'Amount' | 'Is due' | 'Is paid' | - | '' | 'Main Company' | 'Front office' | '' | '26.04.2024 13:31:41' | ' ' | 'TRY' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Yes' | 'No' | '' | '*' | '' | '21' | 'No' | 'Yes' | + | 'Debit/Credit note 7 dated 26.04.2024 13:31:41' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "T2015 Transactions info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Company' | 'Branch' | 'Order' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Agreement' | 'Is vendor transaction' | 'Is customer transaction' | 'Transaction basis' | 'Unique ID' | 'Project' | 'Amount' | 'Is due' | 'Is paid' | + | '' | 'Main Company' | 'Front office' | '' | '26.04.2024 13:31:41' | '*' | 'TRY' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Yes' | 'No' | '' | '*' | '' | '21' | 'No' | 'Yes' | And I close all client application windows Scenario: _0432060 check DebitCreditNote movements by the register "R5010 Reconciliation statement" (VA-VT, by documents, different partners) @@ -716,6 +742,7 @@ Scenario: _0432028 check DebitCreditNote movements by the register "R1021 Vendor | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Agreement' | 'Basis' | 'Order' | 'Project' | 'Amount' | 'Deferred calculation' | 'Vendors advances closing' | | '' | '03.04.2024 14:19:17' | 'Expense' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | '' | '' | '' | '41' | 'No' | '' | | '' | '03.04.2024 14:19:17' | 'Expense' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | '' | '' | '' | '7,02' | 'No' | '' | + | '' | '03.04.2024 14:19:17' | 'Expense' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | '' | '' | '' | '41' | 'No' | '' | | '' | '03.04.2024 14:19:17' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | '' | '' | '' | '41' | 'No' | '' | And I close all client application windows @@ -736,6 +763,7 @@ Scenario: _0432029 check DebitCreditNote movements by the register "R2020 Advanc | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Order' | 'Agreement' | 'Project' | 'Amount' | 'Deferred calculation' | 'Customers advances closing' | | '' | '03.04.2024 14:19:17' | 'Receipt' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | '' | 'Basic Partner terms, TRY' | '' | '41' | 'No' | '' | | '' | '03.04.2024 14:19:17' | 'Receipt' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | '' | 'Basic Partner terms, TRY' | '' | '7,02' | 'No' | '' | + | '' | '03.04.2024 14:19:17' | 'Receipt' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | '' | 'Basic Partner terms, TRY' | '' | '41' | 'No' | '' | | '' | '03.04.2024 14:19:17' | 'Receipt' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | '' | 'Basic Partner terms, TRY' | '' | '41' | 'No' | '' | And I close all client application windows @@ -755,9 +783,11 @@ Scenario: _0432030 check DebitCreditNote movements by the register "R5020 Partne | 'Register "R5020 Partners balance"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Partner' | 'Legal name' | 'Agreement' | 'Document' | 'Currency' | 'Multi currency movement type' | 'Transaction currency' | 'Amount' | 'Customer transaction' | 'Customer advance' | 'Vendor transaction' | 'Vendor advance' | 'Other transaction' | 'Advances closing' | | '' | '03.04.2024 14:19:17' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | '' | 'TRY' | 'Local currency' | 'TRY' | '41' | '' | '' | '41' | '' | '' | '' | + | '' | '03.04.2024 14:19:17' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | '' | 'TRY' | 'TRY' | 'TRY' | '41' | '' | '' | '41' | '' | '' | '' | | '' | '03.04.2024 14:19:17' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | '' | 'TRY' | 'en description is empty' | 'TRY' | '41' | '' | '' | '41' | '' | '' | '' | | '' | '03.04.2024 14:19:17' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | '' | 'USD' | 'Reporting currency' | 'TRY' | '7,02' | '' | '' | '7,02' | '' | '' | '' | | '' | '03.04.2024 14:19:17' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'Local currency' | 'TRY' | '41' | '' | '41' | '' | '' | '' | '' | + | '' | '03.04.2024 14:19:17' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'TRY' | 'TRY' | '41' | '' | '41' | '' | '' | '' | '' | | '' | '03.04.2024 14:19:17' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'en description is empty' | 'TRY' | '41' | '' | '41' | '' | '' | '' | '' | | '' | '03.04.2024 14:19:17' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | 'Basic Partner terms, TRY' | '' | 'USD' | 'Reporting currency' | 'TRY' | '7,02' | '' | '7,02' | '' | '' | '' | '' | And I close all client application windows @@ -774,10 +804,10 @@ Scenario: _0432031 check DebitCreditNote movements by the register "T2014 Advanc And I select "T2014 Advances info" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Debit/Credit note 8 dated 03.04.2024 14:19:17' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "T2014 Advances info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Company' | 'Branch' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Order' | 'Is vendor advance' | 'Is customer advance' | 'Unique ID' | 'Advance agreement' | 'Project' | 'Amount' | 'Is purchase order close' | 'Is sales order close' | 'Record type' | - | '' | 'Main Company' | 'Front office' | '03.04.2024 14:19:17' | ' ' | 'TRY' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | '' | 'No' | 'Yes' | '*' | 'Basic Partner terms, TRY' | '' | '41' | 'No' | 'No' | 'Receipt' | + | 'Debit/Credit note 8 dated 03.04.2024 14:19:17' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "T2014 Advances info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Company' | 'Branch' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Order' | 'Is vendor advance' | 'Is customer advance' | 'Unique ID' | 'Advance agreement' | 'Project' | 'Amount' | 'Is purchase order close' | 'Is sales order close' | 'Record type' | + | '' | 'Main Company' | 'Front office' | '03.04.2024 14:19:17' | '*' | 'TRY' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | '' | 'No' | 'Yes' | '*' | 'Basic Partner terms, TRY' | '' | '41' | 'No' | 'No' | 'Receipt' | And I close all client application windows Scenario: _0432032 check DebitCreditNote movements by the register "T2015 Transactions info" (VT-CA, by documents, different partners) @@ -792,10 +822,10 @@ Scenario: _0432032 check DebitCreditNote movements by the register "T2015 Transa And I select "T2015 Transactions info" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Debit/Credit note 8 dated 03.04.2024 14:19:17' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "T2015 Transactions info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Company' | 'Branch' | 'Order' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Agreement' | 'Is vendor transaction' | 'Is customer transaction' | 'Transaction basis' | 'Unique ID' | 'Project' | 'Amount' | 'Is due' | 'Is paid' | - | '' | 'Main Company' | 'Front office' | '' | '03.04.2024 14:19:17' | ' ' | 'TRY' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Yes' | 'No' | '' | '*' | '' | '41' | 'No' | 'Yes' | + | 'Debit/Credit note 8 dated 03.04.2024 14:19:17' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "T2015 Transactions info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Company' | 'Branch' | 'Order' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Agreement' | 'Is vendor transaction' | 'Is customer transaction' | 'Transaction basis' | 'Unique ID' | 'Project' | 'Amount' | 'Is due' | 'Is paid' | + | '' | 'Main Company' | 'Front office' | '' | '03.04.2024 14:19:17' | '*' | 'TRY' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Yes' | 'No' | '' | '*' | '' | '41' | 'No' | 'Yes' | And I close all client application windows Scenario: _0432065 check DebitCreditNote movements by the register "R5010 Reconciliation statement" (VT-CA, by documents, different partners) @@ -835,6 +865,7 @@ Scenario: _0432033 check DebitCreditNote movements by the register "R1021 Vendor | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Agreement' | 'Basis' | 'Order' | 'Project' | 'Amount' | 'Deferred calculation' | 'Vendors advances closing' | | '' | '26.04.2024 16:15:09' | 'Expense' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | '' | '' | '' | '51' | 'No' | '' | | '' | '26.04.2024 16:15:09' | 'Expense' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | '' | '' | '' | '8,73' | 'No' | '' | + | '' | '26.04.2024 16:15:09' | 'Expense' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | '' | '' | '' | '51' | 'No' | '' | | '' | '26.04.2024 16:15:09' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | '' | '' | '' | '51' | 'No' | '' | And I close all client application windows @@ -855,6 +886,7 @@ Scenario: _0432034 check DebitCreditNote movements by the register "R2021 Custom | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Agreement' | 'Basis' | 'Order' | 'Project' | 'Amount' | 'Deferred calculation' | 'Customers advances closing' | | '' | '26.04.2024 16:15:09' | 'Expense' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | '' | '' | '' | '51' | 'No' | '' | | '' | '26.04.2024 16:15:09' | 'Expense' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | '' | '' | '' | '8,73' | 'No' | '' | + | '' | '26.04.2024 16:15:09' | 'Expense' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | '' | '' | '' | '51' | 'No' | '' | | '' | '26.04.2024 16:15:09' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | '' | '' | '' | '51' | 'No' | '' | And I close all client application windows @@ -874,9 +906,11 @@ Scenario: _0432035 check DebitCreditNote movements by the register "R5020 Partne | 'Register "R5020 Partners balance"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Partner' | 'Legal name' | 'Agreement' | 'Document' | 'Currency' | 'Multi currency movement type' | 'Transaction currency' | 'Amount' | 'Customer transaction' | 'Customer advance' | 'Vendor transaction' | 'Vendor advance' | 'Other transaction' | 'Advances closing' | | '' | '26.04.2024 16:15:09' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | '' | 'TRY' | 'Local currency' | 'TRY' | '51' | '' | '' | '51' | '' | '' | '' | + | '' | '26.04.2024 16:15:09' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | '' | 'TRY' | 'TRY' | 'TRY' | '51' | '' | '' | '51' | '' | '' | '' | | '' | '26.04.2024 16:15:09' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | '' | 'TRY' | 'en description is empty' | 'TRY' | '51' | '' | '' | '51' | '' | '' | '' | | '' | '26.04.2024 16:15:09' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | '' | 'USD' | 'Reporting currency' | 'TRY' | '8,73' | '' | '' | '8,73' | '' | '' | '' | | '' | '26.04.2024 16:15:09' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'Local currency' | 'TRY' | '51' | '51' | '' | '' | '' | '' | '' | + | '' | '26.04.2024 16:15:09' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'TRY' | 'TRY' | '51' | '51' | '' | '' | '' | '' | '' | | '' | '26.04.2024 16:15:09' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'en description is empty' | 'TRY' | '51' | '51' | '' | '' | '' | '' | '' | | '' | '26.04.2024 16:15:09' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | '' | 'USD' | 'Reporting currency' | 'TRY' | '8,73' | '8,73' | '' | '' | '' | '' | '' | And I close all client application windows @@ -893,12 +927,12 @@ Scenario: _0432036 check DebitCreditNote movements by the register "T2015 Transa And I click "Registrations report info" button And I select "T2015 Transactions info" exact value from "Register" drop-down list And I click "Generate report" button - Then "ResultTable" spreadsheet document is equal - | 'Debit/Credit note 9 dated 26.04.2024 16:15:09' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "T2015 Transactions info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Company' | 'Branch' | 'Order' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Agreement' | 'Is vendor transaction' | 'Is customer transaction' | 'Transaction basis' | 'Unique ID' | 'Project' | 'Amount' | 'Is due' | 'Is paid' | - | '' | 'Main Company' | 'Front office' | '' | '26.04.2024 16:15:09' | ' ' | 'TRY' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | 'No' | 'Yes' | '' | '*' | '' | '51' | 'No' | 'Yes' | - | '' | 'Main Company' | 'Front office' | '' | '26.04.2024 16:15:09' | ' ' | 'TRY' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Yes' | 'No' | '' | '*' | '' | '51' | 'No' | 'Yes' | + Then "ResultTable" spreadsheet document contains lines + | 'Debit/Credit note 9 dated 26.04.2024 16:15:09' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "T2015 Transactions info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Company' | 'Branch' | 'Order' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Agreement' | 'Is vendor transaction' | 'Is customer transaction' | 'Transaction basis' | 'Unique ID' | 'Project' | 'Amount' | 'Is due' | 'Is paid' | + | '' | 'Main Company' | 'Front office' | '' | '26.04.2024 16:15:09' | '*' | 'TRY' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Yes' | 'No' | '' | '*' | '' | '51' | 'No' | 'Yes' | + | '' | 'Main Company' | 'Front office' | '' | '26.04.2024 16:15:09' | '*' | 'TRY' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | 'No' | 'Yes' | '' | '*' | '' | '51' | 'No' | 'Yes' | And I close all client application windows Scenario: _0432066 check DebitCreditNote movements by the register "R5010 Reconciliation statement" (VT-CT, by documents, different partners) @@ -938,7 +972,8 @@ Scenario: _0432037 check DebitCreditNote movements by the register "R1020 Advanc | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Order' | 'Agreement' | 'Project' | 'Amount' | 'Deferred calculation' | 'Vendors advances closing' | | '' | '26.04.2024 17:51:11' | 'Receipt' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Vendor (Advance, by documents)' | '' | '74' | 'No' | '' | | '' | '26.04.2024 17:51:11' | 'Receipt' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Vendor (Advance, by documents)' | '' | '12,67' | 'No' | '' | - | '' | '26.04.2024 17:51:11' | 'Receipt' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Vendor (Advance, by documents)' | '' | '74' | 'No' | '' | + | '' | '26.04.2024 17:51:11' | 'Receipt' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Vendor (Advance, by documents)' | '' | '74' | 'No' | '' | + | '' | '26.04.2024 17:51:11' | 'Receipt' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Vendor (Advance, by documents)' | '' | '74' | 'No' | '' | And I close all client application windows Scenario: _0432038 check DebitCreditNote movements by the register "R2021 Customer transactions" (CT-VA, by documents, different partners) @@ -958,6 +993,7 @@ Scenario: _0432038 check DebitCreditNote movements by the register "R2021 Custom | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Agreement' | 'Basis' | 'Order' | 'Project' | 'Amount' | 'Deferred calculation' | 'Customers advances closing' | | '' | '26.04.2024 17:51:11' | 'Expense' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | '' | '' | '' | '74' | 'No' | '' | | '' | '26.04.2024 17:51:11' | 'Expense' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | '' | '' | '' | '12,67' | 'No' | '' | + | '' | '26.04.2024 17:51:11' | 'Expense' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | '' | '' | '' | '74' | 'No' | '' | | '' | '26.04.2024 17:51:11' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | '' | '' | '' | '74' | 'No' | '' | And I close all client application windows @@ -977,11 +1013,13 @@ Scenario: _0432039 check DebitCreditNote movements by the register "R5020 Partne | 'Register "R5020 Partners balance"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Partner' | 'Legal name' | 'Agreement' | 'Document' | 'Currency' | 'Multi currency movement type' | 'Transaction currency' | 'Amount' | 'Customer transaction' | 'Customer advance' | 'Vendor transaction' | 'Vendor advance' | 'Other transaction' | 'Advances closing' | | '' | '26.04.2024 17:51:11' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'TRY' | 'Local currency' | 'TRY' | '74' | '' | '' | '' | '74' | '' | '' | + | '' | '26.04.2024 17:51:11' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'TRY' | 'TRY' | 'TRY' | '74' | '' | '' | '' | '74' | '' | '' | | '' | '26.04.2024 17:51:11' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'TRY' | 'en description is empty' | 'TRY' | '74' | '' | '' | '' | '74' | '' | '' | | '' | '26.04.2024 17:51:11' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'USD' | 'Reporting currency' | 'TRY' | '12,67' | '' | '' | '' | '12,67' | '' | '' | | '' | '26.04.2024 17:51:11' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'Local currency' | 'TRY' | '74' | '74' | '' | '' | '' | '' | '' | + | '' | '26.04.2024 17:51:11' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'TRY' | 'TRY' | '74' | '74' | '' | '' | '' | '' | '' | | '' | '26.04.2024 17:51:11' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'en description is empty' | 'TRY' | '74' | '74' | '' | '' | '' | '' | '' | - | '' | '26.04.2024 17:51:11' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | '' | 'USD' | 'Reporting currency' | 'TRY' | '12,67' | '12,67' | '' | '' | '' | '' | '' | + | '' | '26.04.2024 17:51:11' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | '' | 'USD' | 'Reporting currency' | 'TRY' | '12,67' | '12,67' | '' | '' | '' | '' | '' | And I close all client application windows @@ -997,10 +1035,10 @@ Scenario: _0432040 check DebitCreditNote movements by the register "T2015 Transa And I select "T2015 Transactions info" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Debit/Credit note 10 dated 26.04.2024 17:51:11' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "T2015 Transactions info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Company' | 'Branch' | 'Order' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Agreement' | 'Is vendor transaction' | 'Is customer transaction' | 'Transaction basis' | 'Unique ID' | 'Project' | 'Amount' | 'Is due' | 'Is paid' | - | '' | 'Main Company' | 'Front office' | '' | '26.04.2024 17:51:11' | ' ' | 'TRY' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | 'No' | 'Yes' | '' | '*' | '' | '74' | 'No' | 'Yes' | + | 'Debit/Credit note 10 dated 26.04.2024 17:51:11' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "T2015 Transactions info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Company' | 'Branch' | 'Order' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Agreement' | 'Is vendor transaction' | 'Is customer transaction' | 'Transaction basis' | 'Unique ID' | 'Project' | 'Amount' | 'Is due' | 'Is paid' | + | '' | 'Main Company' | 'Front office' | '' | '26.04.2024 17:51:11' | '*' | 'TRY' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | 'No' | 'Yes' | '' | '*' | '' | '74' | 'No' | 'Yes' | And I close all client application windows Scenario: _0432041 check DebitCreditNote movements by the register "T2014 Advances info" (CT-VA, by documents, different partners) @@ -1015,10 +1053,10 @@ Scenario: _0432041 check DebitCreditNote movements by the register "T2014 Advanc And I select "T2014 Advances info" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Debit/Credit note 10 dated 26.04.2024 17:51:11' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "T2014 Advances info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Company' | 'Branch' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Order' | 'Is vendor advance' | 'Is customer advance' | 'Unique ID' | 'Advance agreement' | 'Project' | 'Amount' | 'Is purchase order close' | 'Is sales order close' | 'Record type' | - | '' | 'Main Company' | 'Front office' | '26.04.2024 17:51:11' | ' ' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Yes' | 'No' | '*' | 'Vendor (Advance, by documents)' | '' | '74' | 'No' | 'No' | 'Receipt' | + | 'Debit/Credit note 10 dated 26.04.2024 17:51:11' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "T2014 Advances info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Company' | 'Branch' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Order' | 'Is vendor advance' | 'Is customer advance' | 'Unique ID' | 'Advance agreement' | 'Project' | 'Amount' | 'Is purchase order close' | 'Is sales order close' | 'Record type' | + | '' | 'Main Company' | 'Front office' | '26.04.2024 17:51:11' | '*' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Yes' | 'No' | '*' | 'Vendor (Advance, by documents)' | '' | '74' | 'No' | 'No' | 'Receipt' | And I close all client application windows Scenario: _0432067 check DebitCreditNote movements by the register "R5010 Reconciliation statement" (CT-VA, by documents, different partners) @@ -1058,7 +1096,8 @@ Scenario: _0432042 check DebitCreditNote movements by the register "R1020 Advanc | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Order' | 'Agreement' | 'Project' | 'Amount' | 'Deferred calculation' | 'Vendors advances closing' | | '' | '29.04.2024 10:25:38' | 'Expense' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Vendor (Advance, by documents)' | '' | '48' | 'No' | '' | | '' | '29.04.2024 10:25:38' | 'Expense' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Vendor (Advance, by documents)' | '' | '8,22' | 'No' | '' | - | '' | '29.04.2024 10:25:38' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Vendor (Advance, by documents)' | '' | '48' | 'No' | '' | + | '' | '29.04.2024 10:25:38' | 'Expense' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Vendor (Advance, by documents)' | '' | '48' | 'No' | '' | + | '' | '29.04.2024 10:25:38' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Vendor (Advance, by documents)' | '' | '48' | 'No' | '' | And I close all client application windows Scenario: _0432043 check DebitCreditNote movements by the register "R2020 Advances from customer" (CA-VA, by documents, different partners) @@ -1078,6 +1117,7 @@ Scenario: _0432043 check DebitCreditNote movements by the register "R2020 Advanc | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Order' | 'Agreement' | 'Project' | 'Amount' | 'Deferred calculation' | 'Customers advances closing' | | '' | '29.04.2024 10:25:38' | 'Expense' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | '' | 'Basic Partner terms, TRY' | '' | '48' | 'No' | '' | | '' | '29.04.2024 10:25:38' | 'Expense' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | '' | 'Basic Partner terms, TRY' | '' | '8,22' | 'No' | '' | + | '' | '29.04.2024 10:25:38' | 'Expense' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | '' | 'Basic Partner terms, TRY' | '' | '48' | 'No' | '' | | '' | '29.04.2024 10:25:38' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | '' | 'Basic Partner terms, TRY' | '' | '48' | 'No' | '' | And I close all client application windows @@ -1092,12 +1132,12 @@ Scenario: _0432044 check DebitCreditNote movements by the register "T2014 Advanc And I click "Registrations report info" button And I select "T2014 Advances info" exact value from "Register" drop-down list And I click "Generate report" button - Then "ResultTable" spreadsheet document is equal - | 'Debit/Credit note 11 dated 29.04.2024 10:25:38' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "T2014 Advances info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Company' | 'Branch' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Order' | 'Is vendor advance' | 'Is customer advance' | 'Unique ID' | 'Advance agreement' | 'Project' | 'Amount' | 'Is purchase order close' | 'Is sales order close' | 'Record type' | - | '' | 'Main Company' | 'Front office' | '29.04.2024 10:25:38' | ' ' | 'TRY' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | '' | 'No' | 'Yes' | '*' | 'Basic Partner terms, TRY' | '' | '48' | 'No' | 'No' | 'Expense' | - | '' | 'Main Company' | 'Front office' | '29.04.2024 10:25:38' | ' ' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Yes' | 'No' | '*' | 'Vendor (Advance, by documents)' | '' | '48' | 'No' | 'No' | 'Expense' | + Then "ResultTable" spreadsheet document contains lines: + | 'Debit/Credit note 11 dated 29.04.2024 10:25:38' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "T2014 Advances info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Company' | 'Branch' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Order' | 'Is vendor advance' | 'Is customer advance' | 'Unique ID' | 'Advance agreement' | 'Project' | 'Amount' | 'Is purchase order close' | 'Is sales order close' | 'Record type' | + | '' | 'Main Company' | 'Front office' | '29.04.2024 10:25:38' | '*' | 'TRY' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | '' | 'No' | 'Yes' | '*' | 'Basic Partner terms, TRY' | '' | '48' | 'No' | 'No' | 'Expense' | + | '' | 'Main Company' | 'Front office' | '29.04.2024 10:25:38' | '*' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Yes' | 'No' | '*' | 'Vendor (Advance, by documents)' | '' | '48' | 'No' | 'No' | 'Expense' | And I close all client application windows Scenario: _0432061 check DebitCreditNote movements by the register "R5020 Partners balance" (CA-VA, by documents, different partners) @@ -1116,9 +1156,11 @@ Scenario: _0432061 check DebitCreditNote movements by the register "R5020 Partne | 'Register "R5020 Partners balance"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Partner' | 'Legal name' | 'Agreement' | 'Document' | 'Currency' | 'Multi currency movement type' | 'Transaction currency' | 'Amount' | 'Customer transaction' | 'Customer advance' | 'Vendor transaction' | 'Vendor advance' | 'Other transaction' | 'Advances closing' | | '' | '29.04.2024 10:25:38' | 'Receipt' | 'Main Company' | 'Front office' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'Local currency' | 'TRY' | '48' | '' | '48' | '' | '' | '' | '' | + | '' | '29.04.2024 10:25:38' | 'Receipt' | 'Main Company' | 'Front office' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'TRY' | 'TRY' | '48' | '' | '48' | '' | '' | '' | '' | | '' | '29.04.2024 10:25:38' | 'Receipt' | 'Main Company' | 'Front office' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'en description is empty' | 'TRY' | '48' | '' | '48' | '' | '' | '' | '' | | '' | '29.04.2024 10:25:38' | 'Receipt' | 'Main Company' | 'Front office' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | 'Basic Partner terms, TRY' | '' | 'USD' | 'Reporting currency' | 'TRY' | '8,22' | '' | '8,22' | '' | '' | '' | '' | | '' | '29.04.2024 10:25:38' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'TRY' | 'Local currency' | 'TRY' | '48' | '' | '' | '' | '48' | '' | '' | + | '' | '29.04.2024 10:25:38' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'TRY' | 'TRY' | 'TRY' | '48' | '' | '' | '' | '48' | '' | '' | | '' | '29.04.2024 10:25:38' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'TRY' | 'en description is empty' | 'TRY' | '48' | '' | '' | '' | '48' | '' | '' | | '' | '29.04.2024 10:25:38' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'USD' | 'Reporting currency' | 'TRY' | '8,22' | '' | '' | '' | '8,22' | '' | '' | And I close all client application windows @@ -1159,6 +1201,7 @@ Scenario: _0432045 check DebitCreditNote movements by the register "R1021 Vendor | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Agreement' | 'Basis' | 'Order' | 'Project' | 'Amount' | 'Deferred calculation' | 'Vendors advances closing' | | '' | '29.04.2024 10:42:01' | 'Expense' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | '' | '' | '' | '43' | 'No' | '' | | '' | '29.04.2024 10:42:01' | 'Expense' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | '' | '' | '' | '7,36' | 'No' | '' | + | '' | '29.04.2024 10:42:01' | 'Expense' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | '' | '' | '' | '43' | 'No' | '' | | '' | '29.04.2024 10:42:01' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | '' | '' | '' | '43' | 'No' | '' | And I close all client application windows @@ -1179,6 +1222,7 @@ Scenario: _0432046 check DebitCreditNote movements by the register "R2021 Custom | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Agreement' | 'Basis' | 'Order' | 'Project' | 'Amount' | 'Deferred calculation' | 'Customers advances closing' | | '' | '29.04.2024 10:42:01' | 'Expense' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | '' | '' | '43' | 'No' | '' | | '' | '29.04.2024 10:42:01' | 'Expense' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | '' | '' | '7,36' | 'No' | '' | + | '' | '29.04.2024 10:42:01' | 'Expense' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | '' | '' | '43' | 'No' | '' | | '' | '29.04.2024 10:42:01' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | '' | '' | '43' | 'No' | '' | And I close all client application windows @@ -1198,11 +1242,13 @@ Scenario: _0432047 check DebitCreditNote movements by the register "R5020 Partne | 'Register "R5020 Partners balance"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Partner' | 'Legal name' | 'Agreement' | 'Document' | 'Currency' | 'Multi currency movement type' | 'Transaction currency' | 'Amount' | 'Customer transaction' | 'Customer advance' | 'Vendor transaction' | 'Vendor advance' | 'Other transaction' | 'Advances closing' | | '' | '29.04.2024 10:42:01' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | '' | 'TRY' | 'Local currency' | 'TRY' | '43' | '' | '' | '43' | '' | '' | '' | + | '' | '29.04.2024 10:42:01' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | '' | 'TRY' | 'TRY' | 'TRY' | '43' | '' | '' | '43' | '' | '' | '' | | '' | '29.04.2024 10:42:01' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | '' | 'TRY' | 'en description is empty' | 'TRY' | '43' | '' | '' | '43' | '' | '' | '' | | '' | '29.04.2024 10:42:01' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | '' | 'USD' | 'Reporting currency' | 'TRY' | '7,36' | '' | '' | '7,36' | '' | '' | '' | | '' | '29.04.2024 10:42:01' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | 'TRY' | 'Local currency' | 'TRY' | '43' | '43' | '' | '' | '' | '' | '' | + | '' | '29.04.2024 10:42:01' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | 'TRY' | 'TRY' | 'TRY' | '43' | '43' | '' | '' | '' | '' | '' | | '' | '29.04.2024 10:42:01' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | 'TRY' | 'en description is empty' | 'TRY' | '43' | '43' | '' | '' | '' | '' | '' | - | '' | '29.04.2024 10:42:01' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | 'USD' | 'Reporting currency' | 'TRY' | '7,36' | '7,36' | '' | '' | '' | '' | '' | + | '' | '29.04.2024 10:42:01' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | 'USD' | 'Reporting currency' | 'TRY' | '7,36' | '7,36' | '' | '' | '' | '' | '' | And I close all client application windows Scenario: _0432048 check DebitCreditNote movements by the register "T2015 Transactions info" (CT-VT, by partner term, different partners) @@ -1217,11 +1263,11 @@ Scenario: _0432048 check DebitCreditNote movements by the register "T2015 Transa And I select "T2015 Transactions info" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Debit/Credit note 12 dated 29.04.2024 10:42:01' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "T2015 Transactions info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Company' | 'Branch' | 'Order' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Agreement' | 'Is vendor transaction' | 'Is customer transaction' | 'Transaction basis' | 'Unique ID' | 'Project' | 'Amount' | 'Is due' | 'Is paid' | - | '' | 'Main Company' | 'Front office' | '' | '29.04.2024 10:42:01' | ' ' | 'TRY' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | 'Yes' | 'No' | '' | '*' | '' | '43' | 'No' | 'Yes' | - | '' | 'Main Company' | 'Front office' | '' | '29.04.2024 10:42:01' | ' ' | 'TRY' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'No' | 'Yes' | '' | '*' | '' | '43' | 'No' | 'Yes' | + | 'Debit/Credit note 12 dated 29.04.2024 10:42:01' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "T2015 Transactions info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Company' | 'Branch' | 'Order' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Agreement' | 'Is vendor transaction' | 'Is customer transaction' | 'Transaction basis' | 'Unique ID' | 'Project' | 'Amount' | 'Is due' | 'Is paid' | + | '' | 'Main Company' | 'Front office' | '' | '29.04.2024 10:42:01' | '*' | 'TRY' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'No' | 'Yes' | '' | '*' | '' | '43' | 'No' | 'Yes' | + | '' | 'Main Company' | 'Front office' | '' | '29.04.2024 10:42:01' | '*' | 'TRY' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | 'Yes' | 'No' | '' | '*' | '' | '43' | 'No' | 'Yes' | And I close all client application windows Scenario: _0432069 check DebitCreditNote movements by the register "R5010 Reconciliation statement" (CT-VT, by partner term, different partners) @@ -1261,10 +1307,12 @@ Scenario: _0432049 check DebitCreditNote movements by the register "R1020 Advanc | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Order' | 'Agreement' | 'Project' | 'Amount' | 'Deferred calculation' | 'Vendors advances closing' | | '' | '29.04.2024 11:06:59' | 'Receipt' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Vendor (by documents) 2' | '' | '47' | 'No' | '' | | '' | '29.04.2024 11:06:59' | 'Receipt' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Vendor (by documents) 2' | '' | '8,05' | 'No' | '' | + | '' | '29.04.2024 11:06:59' | 'Receipt' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Vendor (by documents) 2' | '' | '47' | 'No' | '' | | '' | '29.04.2024 11:06:59' | 'Receipt' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Vendor (by documents) 2' | '' | '47' | 'No' | '' | | '' | '29.04.2024 11:06:59' | 'Expense' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Vendor (Advance, by documents)' | '' | '47' | 'No' | '' | | '' | '29.04.2024 11:06:59' | 'Expense' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Vendor (Advance, by documents)' | '' | '8,05' | 'No' | '' | - | '' | '29.04.2024 11:06:59' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Vendor (Advance, by documents)' | '' | '47' | 'No' | '' | + | '' | '29.04.2024 11:06:59' | 'Expense' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Vendor (Advance, by documents)' | '' | '47' | 'No' | '' | + | '' | '29.04.2024 11:06:59' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Vendor (Advance, by documents)' | '' | '47' | 'No' | '' | And I close all client application windows @@ -1284,11 +1332,13 @@ Scenario: _0432050 check DebitCreditNote movements by the register "R5020 Partne | 'Register "R5020 Partners balance"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Partner' | 'Legal name' | 'Agreement' | 'Document' | 'Currency' | 'Multi currency movement type' | 'Transaction currency' | 'Amount' | 'Customer transaction' | 'Customer advance' | 'Vendor transaction' | 'Vendor advance' | 'Other transaction' | 'Advances closing' | | '' | '29.04.2024 11:06:59' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Vendor (by documents) 2' | '' | 'TRY' | 'Local currency' | 'TRY' | '47' | '' | '' | '' | '47' | '' | '' | + | '' | '29.04.2024 11:06:59' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Vendor (by documents) 2' | '' | 'TRY' | 'TRY' | 'TRY' | '47' | '' | '' | '' | '47' | '' | '' | | '' | '29.04.2024 11:06:59' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Vendor (by documents) 2' | '' | 'TRY' | 'en description is empty' | 'TRY' | '47' | '' | '' | '' | '47' | '' | '' | | '' | '29.04.2024 11:06:59' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Vendor (by documents) 2' | '' | 'USD' | 'Reporting currency' | 'TRY' | '8,05' | '' | '' | '' | '8,05' | '' | '' | | '' | '29.04.2024 11:06:59' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'TRY' | 'Local currency' | 'TRY' | '47' | '' | '' | '' | '47' | '' | '' | + | '' | '29.04.2024 11:06:59' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'TRY' | 'TRY' | 'TRY' | '47' | '' | '' | '' | '47' | '' | '' | | '' | '29.04.2024 11:06:59' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'TRY' | 'en description is empty' | 'TRY' | '47' | '' | '' | '' | '47' | '' | '' | - | '' | '29.04.2024 11:06:59' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'USD' | 'Reporting currency' | 'TRY' | '8,05' | '' | '' | '' | '8,05' | '' | '' | + | '' | '29.04.2024 11:06:59' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'USD' | 'Reporting currency' | 'TRY' | '8,05' | '' | '' | '' | '8,05' | '' | '' | And I close all client application windows Scenario: _0432051 check DebitCreditNote movements by the register "T2014 Advances info" (VA-VA, by documents, different partners) @@ -1302,12 +1352,12 @@ Scenario: _0432051 check DebitCreditNote movements by the register "T2014 Advanc And I click "Registrations report info" button And I select "T2014 Advances info" exact value from "Register" drop-down list And I click "Generate report" button - Then "ResultTable" spreadsheet document is equal - | 'Debit/Credit note 13 dated 29.04.2024 11:06:59' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "T2014 Advances info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Company' | 'Branch' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Order' | 'Is vendor advance' | 'Is customer advance' | 'Unique ID' | 'Advance agreement' | 'Project' | 'Amount' | 'Is purchase order close' | 'Is sales order close' | 'Record type' | - | '' | 'Main Company' | 'Front office' | '29.04.2024 11:06:59' | ' ' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Yes' | 'No' | '*' | 'Vendor (Advance, by documents)' | '' | '47' | 'No' | 'No' | 'Expense' | - | '' | 'Main Company' | 'Front office' | '29.04.2024 11:06:59' | ' ' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Yes' | 'No' | '*' | 'Vendor (by documents) 2' | '' | '47' | 'No' | 'No' | 'Receipt' | + Then "ResultTable" spreadsheet document contains lines: + | 'Debit/Credit note 13 dated 29.04.2024 11:06:59' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "T2014 Advances info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Company' | 'Branch' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Order' | 'Is vendor advance' | 'Is customer advance' | 'Unique ID' | 'Advance agreement' | 'Project' | 'Amount' | 'Is purchase order close' | 'Is sales order close' | 'Record type' | + | '' | 'Main Company' | 'Front office' | '29.04.2024 11:06:59' | '*' | 'TRY' | 'Vendor (Advance, by documents)' | 'Vendor (Advance, by documents)' | '' | 'Yes' | 'No' | '*' | 'Vendor (Advance, by documents)' | '' | '47' | 'No' | 'No' | 'Expense' | + | '' | 'Main Company' | 'Front office' | '29.04.2024 11:06:59' | '*' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Yes' | 'No' | '*' | 'Vendor (by documents) 2' | '' | '47' | 'No' | 'No' | 'Receipt' | And I close all client application windows Scenario: _0432070 check DebitCreditNote movements by the register "R5010 Reconciliation statement" (VA-VA, by documents, different partners) @@ -1347,10 +1397,12 @@ Scenario: _0432052 check DebitCreditNote movements by the register "R2020 Advanc | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Order' | 'Agreement' | 'Project' | 'Amount' | 'Deferred calculation' | 'Customers advances closing' | | '' | '29.04.2024 11:15:01' | 'Receipt' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Basic Partner terms, TRY' | '' | '49' | 'No' | '' | | '' | '29.04.2024 11:15:01' | 'Receipt' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Basic Partner terms, TRY' | '' | '8,39' | 'No' | '' | + | '' | '29.04.2024 11:15:01' | 'Receipt' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Basic Partner terms, TRY' | '' | '49' | 'No' | '' | | '' | '29.04.2024 11:15:01' | 'Receipt' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'Basic Partner terms, TRY' | '' | '49' | 'No' | '' | | '' | '29.04.2024 11:15:01' | 'Expense' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | '' | 'Basic Partner terms, TRY' | '' | '49' | 'No' | '' | | '' | '29.04.2024 11:15:01' | 'Expense' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | '' | 'Basic Partner terms, TRY' | '' | '8,39' | 'No' | '' | - | '' | '29.04.2024 11:15:01' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | '' | 'Basic Partner terms, TRY' | '' | '49' | 'No' | '' | + | '' | '29.04.2024 11:15:01' | 'Expense' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | '' | 'Basic Partner terms, TRY' | '' | '49' | 'No' | '' | + | '' | '29.04.2024 11:15:01' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | '' | 'Basic Partner terms, TRY' | '' | '49' | 'No' | '' | And I close all client application windows @@ -1370,9 +1422,11 @@ Scenario: _0432053 check DebitCreditNote movements by the register "R5020 Partne | 'Register "R5020 Partners balance"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Partner' | 'Legal name' | 'Agreement' | 'Document' | 'Currency' | 'Multi currency movement type' | 'Transaction currency' | 'Amount' | 'Customer transaction' | 'Customer advance' | 'Vendor transaction' | 'Vendor advance' | 'Other transaction' | 'Advances closing' | | '' | '29.04.2024 11:15:01' | 'Receipt' | 'Main Company' | 'Front office' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'Local currency' | 'TRY' | '49' | '' | '49' | '' | '' | '' | '' | + | '' | '29.04.2024 11:15:01' | 'Receipt' | 'Main Company' | 'Front office' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'TRY' | 'TRY' | '49' | '' | '49' | '' | '' | '' | '' | | '' | '29.04.2024 11:15:01' | 'Receipt' | 'Main Company' | 'Front office' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'en description is empty' | 'TRY' | '49' | '' | '49' | '' | '' | '' | '' | | '' | '29.04.2024 11:15:01' | 'Receipt' | 'Main Company' | 'Front office' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | 'Basic Partner terms, TRY' | '' | 'USD' | 'Reporting currency' | 'TRY' | '8,39' | '' | '8,39' | '' | '' | '' | '' | | '' | '29.04.2024 11:15:01' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'Local currency' | 'TRY' | '49' | '' | '49' | '' | '' | '' | '' | + | '' | '29.04.2024 11:15:01' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'TRY' | 'TRY' | '49' | '' | '49' | '' | '' | '' | '' | | '' | '29.04.2024 11:15:01' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | '' | 'TRY' | 'en description is empty' | 'TRY' | '49' | '' | '49' | '' | '' | '' | '' | | '' | '29.04.2024 11:15:01' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | 'Basic Partner terms, TRY' | '' | 'USD' | 'Reporting currency' | 'TRY' | '8,39' | '' | '8,39' | '' | '' | '' | '' | And I close all client application windows @@ -1388,12 +1442,12 @@ Scenario: _0432054 check DebitCreditNote movements by the register "T2014 Advanc And I click "Registrations report info" button And I select "T2014 Advances info" exact value from "Register" drop-down list And I click "Generate report" button - Then "ResultTable" spreadsheet document is equal - | 'Debit/Credit note 14 dated 29.04.2024 11:15:01' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "T2014 Advances info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Company' | 'Branch' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Order' | 'Is vendor advance' | 'Is customer advance' | 'Unique ID' | 'Advance agreement' | 'Project' | 'Amount' | 'Is purchase order close' | 'Is sales order close' | 'Record type' | - | '' | 'Main Company' | 'Front office' | '29.04.2024 11:15:01' | ' ' | 'TRY' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | '' | 'No' | 'Yes' | '*' | 'Basic Partner terms, TRY' | '' | '49' | 'No' | 'No' | 'Expense' | - | '' | 'Main Company' | 'Front office' | '29.04.2024 11:15:01' | ' ' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'No' | 'Yes' | '*' | 'Basic Partner terms, TRY' | '' | '49' | 'No' | 'No' | 'Receipt' | + Then "ResultTable" spreadsheet document contains lines: + | 'Debit/Credit note 14 dated 29.04.2024 11:15:01' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "T2014 Advances info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Company' | 'Branch' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Order' | 'Is vendor advance' | 'Is customer advance' | 'Unique ID' | 'Advance agreement' | 'Project' | 'Amount' | 'Is purchase order close' | 'Is sales order close' | 'Record type' | + | '' | 'Main Company' | 'Front office' | '29.04.2024 11:15:01' | '*' | 'TRY' | 'Vendor and Customer (by documents)' | 'Vendor and Customer (by documents)' | '' | 'No' | 'Yes' | '*' | 'Basic Partner terms, TRY' | '' | '49' | 'No' | 'No' | 'Receipt' | + | '' | 'Main Company' | 'Front office' | '29.04.2024 11:15:01' | '*' | 'TRY' | 'Customer (Advance, by documents)' | 'Customer (Advance, by documents)' | '' | 'No' | 'Yes' | '*' | 'Basic Partner terms, TRY' | '' | '49' | 'No' | 'No' | 'Expense' | And I close all client application windows Scenario: _0432071 check DebitCreditNote movements by the register "R5010 Reconciliation statement" (СA-СA, by documents, different partners) @@ -1433,10 +1487,12 @@ Scenario: _0432055 check DebitCreditNote movements by the register "R2021 Custom | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Agreement' | 'Basis' | 'Order' | 'Project' | 'Amount' | 'Deferred calculation' | 'Customers advances closing' | | '' | '29.04.2024 11:21:10' | 'Receipt' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | '' | '' | '53' | 'No' | '' | | '' | '29.04.2024 11:21:10' | 'Receipt' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | '' | '' | '9,07' | 'No' | '' | + | '' | '29.04.2024 11:21:10' | 'Receipt' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | '' | '' | '53' | 'No' | '' | | '' | '29.04.2024 11:21:10' | 'Receipt' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | '' | '' | '53' | 'No' | '' | | '' | '29.04.2024 11:21:10' | 'Expense' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | 'Sales invoice 114 dated 17.02.2024 12:00:00' | '' | '' | '53' | 'No' | '' | | '' | '29.04.2024 11:21:10' | 'Expense' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | 'Sales invoice 114 dated 17.02.2024 12:00:00' | '' | '' | '9,07' | 'No' | '' | - | '' | '29.04.2024 11:21:10' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | 'Sales invoice 114 dated 17.02.2024 12:00:00' | '' | '' | '53' | 'No' | '' | + | '' | '29.04.2024 11:21:10' | 'Expense' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | 'Sales invoice 114 dated 17.02.2024 12:00:00' | '' | '' | '53' | 'No' | '' | + | '' | '29.04.2024 11:21:10' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | 'Sales invoice 114 dated 17.02.2024 12:00:00' | '' | '' | '53' | 'No' | '' | And I close all client application windows @@ -1451,12 +1507,12 @@ Scenario: _0432056 check DebitCreditNote movements by the register "T2015 Transa And I click "Registrations report info" button And I select "T2015 Transactions info" exact value from "Register" drop-down list And I click "Generate report" button - Then "ResultTable" spreadsheet document is equal - | 'Debit/Credit note 15 dated 29.04.2024 11:21:10' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "T2015 Transactions info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Company' | 'Branch' | 'Order' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Agreement' | 'Is vendor transaction' | 'Is customer transaction' | 'Transaction basis' | 'Unique ID' | 'Project' | 'Amount' | 'Is due' | 'Is paid' | - | '' | 'Main Company' | 'Front office' | '' | '29.04.2024 11:21:10' | ' ' | 'TRY' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | 'No' | 'Yes' | 'Sales invoice 114 dated 17.02.2024 12:00:00' | '*' | '' | '53' | 'No' | 'Yes' | - | '' | 'Main Company' | 'Front office' | '' | '29.04.2024 11:21:10' | ' ' | 'TRY' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'No' | 'Yes' | '' | '*' | '' | '53' | 'Yes' | 'No' | + Then "ResultTable" spreadsheet document contains lines: + | 'Debit/Credit note 15 dated 29.04.2024 11:21:10' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "T2015 Transactions info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Company' | 'Branch' | 'Order' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Agreement' | 'Is vendor transaction' | 'Is customer transaction' | 'Transaction basis' | 'Unique ID' | 'Project' | 'Amount' | 'Is due' | 'Is paid' | + | '' | 'Main Company' | 'Front office' | '' | '29.04.2024 11:21:10' | '*' | 'TRY' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'No' | 'Yes' | '' | '*' | '' | '53' | 'Yes' | 'No' | + | '' | 'Main Company' | 'Front office' | '' | '29.04.2024 11:21:10' | '*' | 'TRY' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | 'No' | 'Yes' | 'Sales invoice 114 dated 17.02.2024 12:00:00' | '*' | '' | '53' | 'No' | 'Yes' | And I close all client application windows Scenario: _0432064 check DebitCreditNote movements by the register "R5020 Partners balance" (СT-СT, by documents and partner term, different partners) @@ -1475,11 +1531,13 @@ Scenario: _0432064 check DebitCreditNote movements by the register "R5020 Partne | 'Register "R5020 Partners balance"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Partner' | 'Legal name' | 'Agreement' | 'Document' | 'Currency' | 'Multi currency movement type' | 'Transaction currency' | 'Amount' | 'Customer transaction' | 'Customer advance' | 'Vendor transaction' | 'Vendor advance' | 'Other transaction' | 'Advances closing' | | '' | '29.04.2024 11:21:10' | 'Receipt' | 'Main Company' | 'Front office' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | 'TRY' | 'Local currency' | 'TRY' | '53' | '53' | '' | '' | '' | '' | '' | + | '' | '29.04.2024 11:21:10' | 'Receipt' | 'Main Company' | 'Front office' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | 'TRY' | 'TRY' | 'TRY' | '53' | '53' | '' | '' | '' | '' | '' | | '' | '29.04.2024 11:21:10' | 'Receipt' | 'Main Company' | 'Front office' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | 'TRY' | 'en description is empty' | 'TRY' | '53' | '53' | '' | '' | '' | '' | '' | | '' | '29.04.2024 11:21:10' | 'Receipt' | 'Main Company' | 'Front office' | 'Customer (Transactions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | 'Customer (Transacrions, by partner terms)' | '' | 'USD' | 'Reporting currency' | 'TRY' | '9,07' | '9,07' | '' | '' | '' | '' | '' | | '' | '29.04.2024 11:21:10' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | 'Sales invoice 114 dated 17.02.2024 12:00:00' | 'TRY' | 'Local currency' | 'TRY' | '53' | '53' | '' | '' | '' | '' | '' | + | '' | '29.04.2024 11:21:10' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | 'Sales invoice 114 dated 17.02.2024 12:00:00' | 'TRY' | 'TRY' | 'TRY' | '53' | '53' | '' | '' | '' | '' | '' | | '' | '29.04.2024 11:21:10' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | 'Sales invoice 114 dated 17.02.2024 12:00:00' | 'TRY' | 'en description is empty' | 'TRY' | '53' | '53' | '' | '' | '' | '' | '' | - | '' | '29.04.2024 11:21:10' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | 'Sales invoice 114 dated 17.02.2024 12:00:00' | 'USD' | 'Reporting currency' | 'TRY' | '9,07' | '9,07' | '' | '' | '' | '' | '' | + | '' | '29.04.2024 11:21:10' | 'Expense' | 'Main Company' | 'Front office' | 'Customer (Transactions, by documents)' | 'Customer (Transactions, by documents)' | 'Basic Partner terms, TRY' | 'Sales invoice 114 dated 17.02.2024 12:00:00' | 'USD' | 'Reporting currency' | 'TRY' | '9,07' | '9,07' | '' | '' | '' | '' | '' | And I close all client application windows Scenario: _0432072 check DebitCreditNote movements by the register "R5010 Reconciliation statement" (СT-СT, by documents and partner term, different partners) @@ -1519,9 +1577,11 @@ Scenario: _0432057 check DebitCreditNote movements by the register "R1021 Vendor | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Agreement' | 'Basis' | 'Order' | 'Project' | 'Amount' | 'Deferred calculation' | 'Vendors advances closing' | | '' | '29.04.2024 12:14:25' | 'Receipt' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Purchase invoice 325 dated 18.02.2024 19:37:36' | '' | '' | '54' | 'No' | '' | | '' | '29.04.2024 12:14:25' | 'Receipt' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Purchase invoice 325 dated 18.02.2024 19:37:36' | '' | '' | '9,24' | 'No' | '' | + | '' | '29.04.2024 12:14:25' | 'Receipt' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Purchase invoice 325 dated 18.02.2024 19:37:36' | '' | '' | '54' | 'No' | '' | | '' | '29.04.2024 12:14:25' | 'Receipt' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Purchase invoice 325 dated 18.02.2024 19:37:36' | '' | '' | '54' | 'No' | '' | | '' | '29.04.2024 12:14:25' | 'Expense' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'TRY' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | '' | '' | '' | '54' | 'No' | '' | | '' | '29.04.2024 12:14:25' | 'Expense' | 'Main Company' | 'Front office' | 'Reporting currency' | 'USD' | 'TRY' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | '' | '' | '' | '9,24' | 'No' | '' | + | '' | '29.04.2024 12:14:25' | 'Expense' | 'Main Company' | 'Front office' | 'TRY' | 'TRY' | 'TRY' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | '' | '' | '' | '54' | 'No' | '' | | '' | '29.04.2024 12:14:25' | 'Expense' | 'Main Company' | 'Front office' | 'en description is empty' | 'TRY' | 'TRY' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | '' | '' | '' | '54' | 'No' | '' | And I close all client application windows @@ -1537,12 +1597,12 @@ Scenario: _0432058 check DebitCreditNote movements by the register "T2015 Transa And I click "Registrations report info" button And I select "T2015 Transactions info" exact value from "Register" drop-down list And I click "Generate report" button - Then "ResultTable" spreadsheet document is equal - | 'Debit/Credit note 16 dated 29.04.2024 12:14:25' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "T2015 Transactions info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Company' | 'Branch' | 'Order' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Agreement' | 'Is vendor transaction' | 'Is customer transaction' | 'Transaction basis' | 'Unique ID' | 'Project' | 'Amount' | 'Is due' | 'Is paid' | - | '' | 'Main Company' | 'Front office' | '' | '29.04.2024 12:14:25' | ' ' | 'TRY' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | 'Yes' | 'No' | '' | '*' | '' | '54' | 'No' | 'Yes' | - | '' | 'Main Company' | 'Front office' | '' | '29.04.2024 12:14:25' | ' ' | 'TRY' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Yes' | 'No' | 'Purchase invoice 325 dated 18.02.2024 19:37:36' | '*' | '' | '54' | 'Yes' | 'No' | + Then "ResultTable" spreadsheet document contains lines + | 'Debit/Credit note 16 dated 29.04.2024 12:14:25' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "T2015 Transactions info"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Company' | 'Branch' | 'Order' | 'Date' | 'Key' | 'Currency' | 'Partner' | 'Legal name' | 'Agreement' | 'Is vendor transaction' | 'Is customer transaction' | 'Transaction basis' | 'Unique ID' | 'Project' | 'Amount' | 'Is due' | 'Is paid' | + | '' | 'Main Company' | 'Front office' | '' | '29.04.2024 12:14:25' | '*' | 'TRY' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | 'Yes' | 'No' | '' | '*' | '' | '54' | 'No' | 'Yes' | + | '' | 'Main Company' | 'Front office' | '' | '29.04.2024 12:14:25' | '*' | 'TRY' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Yes' | 'No' | 'Purchase invoice 325 dated 18.02.2024 19:37:36' | '*' | '' | '54' | 'Yes' | 'No' | And I close all client application windows Scenario: _0432063 check DebitCreditNote movements by the register "R5020 Partners balance" (СT-СT, by documents and partner term, different partners) @@ -1561,9 +1621,11 @@ Scenario: _0432063 check DebitCreditNote movements by the register "R5020 Partne | 'Register "R5020 Partners balance"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Partner' | 'Legal name' | 'Agreement' | 'Document' | 'Currency' | 'Multi currency movement type' | 'Transaction currency' | 'Amount' | 'Customer transaction' | 'Customer advance' | 'Vendor transaction' | 'Vendor advance' | 'Other transaction' | 'Advances closing' | | '' | '29.04.2024 12:14:25' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | '' | 'TRY' | 'Local currency' | 'TRY' | '54' | '' | '' | '54' | '' | '' | '' | + | '' | '29.04.2024 12:14:25' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | '' | 'TRY' | 'TRY' | 'TRY' | '54' | '' | '' | '54' | '' | '' | '' | | '' | '29.04.2024 12:14:25' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | '' | 'TRY' | 'en description is empty' | 'TRY' | '54' | '' | '' | '54' | '' | '' | '' | | '' | '29.04.2024 12:14:25' | 'Receipt' | 'Main Company' | 'Front office' | 'Vendor (Transactions, by partner term)' | 'Vendor (Transactions, by partner term)' | 'Vendor, TRY' | '' | 'USD' | 'Reporting currency' | 'TRY' | '9,24' | '' | '' | '9,24' | '' | '' | '' | | '' | '29.04.2024 12:14:25' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Purchase invoice 325 dated 18.02.2024 19:37:36' | 'TRY' | 'Local currency' | 'TRY' | '54' | '' | '' | '54' | '' | '' | '' | + | '' | '29.04.2024 12:14:25' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Purchase invoice 325 dated 18.02.2024 19:37:36' | 'TRY' | 'TRY' | 'TRY' | '54' | '' | '' | '54' | '' | '' | '' | | '' | '29.04.2024 12:14:25' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Purchase invoice 325 dated 18.02.2024 19:37:36' | 'TRY' | 'en description is empty' | 'TRY' | '54' | '' | '' | '54' | '' | '' | '' | | '' | '29.04.2024 12:14:25' | 'Expense' | 'Main Company' | 'Front office' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Vendor (Transactions, by documents)' | 'Purchase invoice 325 dated 18.02.2024 19:37:36' | 'USD' | 'Reporting currency' | 'TRY' | '9,24' | '' | '' | '9,24' | '' | '' | '' | And I close all client application windows diff --git a/features/Internal/_0400 Movements/_460SalesReportFromTradeAgentMovements.feature b/features/Internal/_0400 Movements/_460SalesReportFromTradeAgentMovements.feature index c5ea6a9a0b..f821c83c7e 100644 --- a/features/Internal/_0400 Movements/_460SalesReportFromTradeAgentMovements.feature +++ b/features/Internal/_0400 Movements/_460SalesReportFromTradeAgentMovements.feature @@ -164,15 +164,22 @@ Scenario: _046003 check Sales report from trade agent movements by the Register And I click "Registrations report" button And I select "R2040 Taxes incoming" exact value from "Register" drop-down list And I click "Generate report" button + //Outgoing Then "ResultTable" spreadsheet document is equal - | 'Sales report from trade agent 1 dated 03.11.2022 10:53:35' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "R2040 Taxes incoming"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Record type' | 'Period' | 'Resources' | '' | 'Dimensions' | '' | '' | '' | '' | - | '' | '' | '' | 'Taxable amount' | 'Tax amount' | 'Company' | 'Branch' | 'Tax' | 'Tax rate' | 'Tax movement type' | - | '' | 'Receipt' | '03.11.2022 10:53:35' | '169,49' | '30,51' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | '' | - | '' | 'Receipt' | '03.11.2022 10:53:35' | '355,93' | '64,07' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | '' | - | '' | 'Receipt' | '03.11.2022 10:53:35' | '881,36' | '158,64' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | '' | + | 'Sales report from trade agent 1 dated 03.11.2022 10:53:35' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R2040 Taxes incoming"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | '' | '' | '' | + | '' | '' | '' | 'Amount' | 'Company' | 'Branch' | 'Tax' | 'Tax rate' | 'Invoice type' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | + | '' | 'Receipt' | '03.11.2022 10:53:35' | '5,22' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Reporting currency' | 'USD' | 'TRY' | + | '' | 'Receipt' | '03.11.2022 10:53:35' | '10,97' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Reporting currency' | 'USD' | 'TRY' | + | '' | 'Receipt' | '03.11.2022 10:53:35' | '27,16' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Reporting currency' | 'USD' | 'TRY' | + | '' | 'Receipt' | '03.11.2022 10:53:35' | '30,51' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Local currency' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '03.11.2022 10:53:35' | '30,51' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'en description is empty' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '03.11.2022 10:53:35' | '64,07' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Local currency' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '03.11.2022 10:53:35' | '64,07' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'en description is empty' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '03.11.2022 10:53:35' | '158,64' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Local currency' | 'TRY' | 'TRY' | + | '' | 'Receipt' | '03.11.2022 10:53:35' | '158,64' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'en description is empty' | 'TRY' | 'TRY' | And I close all client application windows Scenario: _046004 check Sales report from trade agent movements by the Register "R4050 Stock inventory" diff --git a/features/Internal/_0400 Movements/_470SalesReportToConsignorsMovements.feature b/features/Internal/_0400 Movements/_470SalesReportToConsignorsMovements.feature index a2bfa458d0..0d17566801 100644 --- a/features/Internal/_0400 Movements/_470SalesReportToConsignorsMovements.feature +++ b/features/Internal/_0400 Movements/_470SalesReportToConsignorsMovements.feature @@ -150,15 +150,24 @@ Scenario: _047005 check Sales report to consignor movements by the Register "R1 | 'Number' | | '15' | * Check movements by the Register "R1040 Taxes outgoing" + //Incoming And I click "Registrations report info" button And I select "R1040 Taxes outgoing" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Sales report to consignor 15 dated 31.12.2022 10:00:00' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "R1040 Taxes outgoing"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Tax' | 'Tax rate' | 'Tax movement type' | 'Taxable amount' | 'Tax amount' | - | '' | '31.12.2022 10:00:00' | 'Receipt' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | '' | '-847,46' | '-152,54' | - | '' | '31.12.2022 10:00:00' | 'Receipt' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | '' | '-677,97' | '-122,03' | - | '' | '31.12.2022 10:00:00' | 'Receipt' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | '' | '-593,22' | '-106,78' | - | '' | '31.12.2022 10:00:00' | 'Receipt' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | '' | '-338,98' | '-61,02' | + | 'Sales report to consignor 15 dated 31.12.2022 10:00:00' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R1040 Taxes outgoing"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Tax' | 'Tax rate' | 'Invoice type' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Amount' | + | '' | '31.12.2022 10:00:00' | 'Receipt' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Local currency' | 'TRY' | 'TRY' | '-152,54' | + | '' | '31.12.2022 10:00:00' | 'Receipt' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Local currency' | 'TRY' | 'TRY' | '-122,03' | + | '' | '31.12.2022 10:00:00' | 'Receipt' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Local currency' | 'TRY' | 'TRY' | '-106,78' | + | '' | '31.12.2022 10:00:00' | 'Receipt' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Local currency' | 'TRY' | 'TRY' | '-61,02' | + | '' | '31.12.2022 10:00:00' | 'Receipt' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Reporting currency' | 'USD' | 'TRY' | '-26,11' | + | '' | '31.12.2022 10:00:00' | 'Receipt' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Reporting currency' | 'USD' | 'TRY' | '-20,89' | + | '' | '31.12.2022 10:00:00' | 'Receipt' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Reporting currency' | 'USD' | 'TRY' | '-18,28' | + | '' | '31.12.2022 10:00:00' | 'Receipt' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'Reporting currency' | 'USD' | 'TRY' | '-10,45' | + | '' | '31.12.2022 10:00:00' | 'Receipt' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'en description is empty' | 'TRY' | 'TRY' | '-152,54' | + | '' | '31.12.2022 10:00:00' | 'Receipt' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'en description is empty' | 'TRY' | 'TRY' | '-122,03' | + | '' | '31.12.2022 10:00:00' | 'Receipt' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'en description is empty' | 'TRY' | 'TRY' | '-106,78' | + | '' | '31.12.2022 10:00:00' | 'Receipt' | 'Main Company' | 'Distribution department' | 'VAT' | '18%' | 'Invoice' | 'en description is empty' | 'TRY' | 'TRY' | '-61,02' | And I close all client application windows \ No newline at end of file diff --git a/features/Internal/_0910 Forms/_1535AdditionalAttributes.feature b/features/Internal/_0910 Forms/_1535AdditionalAttributes.feature index e6cc49c9a7..56156af3e6 100644 --- a/features/Internal/_0910 Forms/_1535AdditionalAttributes.feature +++ b/features/Internal/_0910 Forms/_1535AdditionalAttributes.feature @@ -43,6 +43,7 @@ Scenario: _0153500 preparation When Create chart of characteristic types AddAttributeAndProperty objects When Create catalog AddAttributeAndPropertySets objects When Create catalog AddAttributeAndPropertyValues objects + When Create catalog AddAttributeAndProperty (boolean) When Create chart of characteristic types AddAttributeAndProperty objects (collection) When Create catalog Currencies objects When Create catalog Companies objects (Main company) @@ -6154,6 +6155,50 @@ Scenario: _015400670 check AddAttribute with type hyperlink And I click the button named "OK" And I close all client application windows +Scenario: _015400672 check AddAttribute with type (boolean) + And I close all client application windows + * Adding additional Add attribute (boolean) for PO + Given I open hyperlink "e1cib/list/Catalog.AddAttributeAndPropertySets" + And I go to line in "List" table + | Predefined data name | + | Document_PurchaseOrder | + And I select current line in "List" table + And in the table "Attributes" I click "Add" button + And I click choice button of the attribute named "AttributesAttribute" in "Attributes" table + And I go to line in "List" table + | 'Description' | + | 'Add attribute (boolean)' | + And I select current line in "List" table + And I finish line editing in "Attributes" table + And I click "Save and close" button + * Check + Given I open hyperlink "e1cib/list/Document.PurchaseOrder" + And I click the button named "FormCreate" + And I move to the tab named "GroupOther" + And I set checkbox named "__e19e213c0a1647deb8835dab2a35089f" + And I click the button named "FormWrite" + Then the form attribute named "__e19e213c0a1647deb8835dab2a35089f" became equal to "Yes" + And I close all client application windows + +Scenario: _015400673 check add common attribute to attribute set + And I close all client application windows + * Adding additional Add attribute (UniqueID) for Company + Given I open hyperlink "e1cib/list/Catalog.AddAttributeAndPropertySets" + And I go to line in "List" table + | Predefined data name | + | Catalog_Companies | + And I select current line in "List" table + And I move to the tab named "GroupExtensionAttributes" + And in the table "ExtensionAttributes" I click the button named "ExtensionAttributesAdd" + And I input "Author" text in the field named "ExtensionAttributesAttribute" of "ExtensionAttributes" table + And I change checkbox named "ExtensionAttributesShow" in "ExtensionAttributes" table + And I finish line editing in "ExtensionAttributes" table + And I click the button named "FormWriteAndClose" + * Check + Given I open hyperlink "e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c" + And I move to "External attributes" tab + Then the field named "Author" is filled + And I close all client application windows Scenario: _015400680 check add attributes (collection, Projects and Stores) And I close all client application windows diff --git a/features/Internal/_0910 Forms/_2000UserSettings.feature b/features/Internal/_0910 Forms/_2000UserSettings.feature index 1db0f364ca..c5a9fc7d81 100644 --- a/features/Internal/_0910 Forms/_2000UserSettings.feature +++ b/features/Internal/_0910 Forms/_2000UserSettings.feature @@ -1491,7 +1491,7 @@ Scenario: _200026 check filling in field from custom user settings in Unbundling And I click the button named "FormCreate" * Check that fields are filled in from user settings Then the form attribute named "Company" became equal to "Main Company" - Then the form attribute named "Store" became equal to "Store 03" + Then the form attribute named "Store" became equal to "Store 01" And I close all client application windows Scenario: _200027 check filling in field from custom user settings in Reconciliation statement diff --git a/features/Internal/_0910 Forms/_2063AuditLock.feature b/features/Internal/_0910 Forms/_2063AuditLock.feature index 1b89aec8ec..32bf93ecec 100644 --- a/features/Internal/_0910 Forms/_2063AuditLock.feature +++ b/features/Internal/_0910 Forms/_2063AuditLock.feature @@ -165,9 +165,8 @@ Scenario: _2063004 check audit lock (PI) And I go to line in "FileList" table | 'File' | | 'Test 1' | - And in the table "FileList" I click the button named "FileListContextMenuDelete" - Then "1C:Enterprise" window is opened - And I click "Yes" button + And I activate "File" field in "FileList" table + And in the table "FileList" I click "Delete files" button Then "1C:Enterprise" window is opened And I click the button named "OK" Then there are lines in TestClient message log @@ -215,9 +214,8 @@ Scenario: _2063007 check audit unlock And I go to line in "FileList" table | 'File' | | 'Test 1' | - And in the table "FileList" I click the button named "FileListContextMenuDelete" - Then "1C:Enterprise" window is opened - And I click "Yes" button + And I activate "File" field in "FileList" table + And in the table "FileList" I click "Delete files" button Then the number of "FileList" table lines is "равно" "0" Then user message window does not contain messages diff --git a/features/Internal/_0912 Filling documents/_2021Fillingdocument.feature b/features/Internal/_0912 Filling documents/_2021Fillingdocument.feature index a38f1eb5c8..1a81501e49 100644 --- a/features/Internal/_0912 Filling documents/_2021Fillingdocument.feature +++ b/features/Internal/_0912 Filling documents/_2021Fillingdocument.feature @@ -42,7 +42,7 @@ Scenario: _0154100 preparation ( filling documents) When Create chart of characteristic types CurrencyMovementType objects When Create catalog TaxRates objects When Create catalog Taxes objects - When Create catalog Taxes objects (for work order) + When Create catalog Taxes objects (for debit and credit note) When Create information register TaxSettings records When Create information register PricesByItemKeys records When Create catalog IntegrationSettings objects @@ -4974,7 +4974,7 @@ Scenario: _053014 check the display of details on the form Bank payment with the -Scenario: _0154131 check currency form in Bank Receipt +Scenario: _0154131 check currency form in Bank Receipt * Filling in Bank Receipt * Filling the document header Given I open hyperlink "e1cib/list/Document.BankReceipt" @@ -5092,7 +5092,7 @@ Scenario: _0154131 check currency form in Bank Receipt # | 'Local currency' | 'Legal' | 'USD' | 'TRY' | '5,6497' | '1 129,94' | '1' | And I close all client application windows -Scenario: _0154132 check currency form in Incoming payment order +Scenario: _0154132 check currency form in Incoming payment order * Filling in Incoming payment order * Filling the document header Given I open hyperlink "e1cib/list/Document.IncomingPaymentOrder" @@ -5201,7 +5201,7 @@ Scenario: _0154132 check currency form in Incoming payment order And I close all client application windows -Scenario: _0154133 check currency form in Outgoing payment order +Scenario: _0154133 check currency form in Outgoing payment order * Filling in Outgoing Payment Order * Filling the document header Given I open hyperlink "e1cib/list/Document.OutgoingPaymentOrder" @@ -5308,10 +5308,133 @@ Scenario: _0154133 check currency form in Outgoing payment order # | 'Local currency' | 'Legal' | 'USD' | 'TRY' | '5,6497' | '1 129,94' | '1' | And I close all client application windows - +Scenario: _0154101 check filling in and refilling Debit note (with VAT) + And I close all client application windows + * Open Debit note creation form + Given I open hyperlink "e1cib/list/Document.DebitNote" + And I click the button named "FormCreate" + * Filling main details + And I select from the drop-down list named "Company" by "Main Company" string + And in the table "Transactions" I click the button named "TransactionsAdd" + And I activate "Partner" field in "Transactions" table + And I select current line in "Transactions" table + And I select "Ferron BP" from "Partner" drop-down list by string in "Transactions" table + And I activate "Legal name" field in "Transactions" table + And I select "Company Ferron BP" from "Legal name" drop-down list by string in "Transactions" table + And I activate "Partner term" field in "Transactions" table + And I select "Basic Partner terms, TRY" from "Partner term" drop-down list by string in "Transactions" table + And I activate "Amount" field in "Transactions" table + * Select VAT rate + And I activate "VAT" field in "Transactions" table + And I select current line in "Transactions" table + And I select "18%" exact value from "VAT" drop-down list in "Transactions" table + * Amount + And I select current line in "Transactions" table + And I input "15 000,00" text in "Amount" field of "Transactions" table + And I finish line editing in "Transactions" table + * Check VAT calculation + And "Transactions" table became equal + | "Partner" | "Amount" | "Legal name" | "Partner term" | "Tax amount" | "Currency" | "VAT" | "Net amount" | + | "Ferron BP" | "15 000,00" | "Company Ferron BP" | "Basic Partner terms, TRY" | "2 288,14" | "TRY" | "18%" | "12 711,86" | + * Change Net amount and check VAT and Amount calculation + And I select current line in "Transactions" table + And I input "15 000,00" text in "Net amount" field of "Transactions" table + And I finish line editing in "Transactions" table + And "Transactions" table became equal + | "Partner" | "Amount" | "Legal name" | "Partner term" | "Tax amount" | "Currency" | "VAT" | "Net amount" | + | "Ferron BP" | "17 700,00" | "Company Ferron BP" | "Basic Partner terms, TRY" | "2 700,00" | "TRY" | "18%" | "15 000,00" | + * Change Vat rate and check amount and net amount calculation + And I activate "VAT" field in "Transactions" table + And I select current line in "Transactions" table + And I select "8%" exact value from "VAT" drop-down list in "Transactions" table + And "Transactions" table became equal + | "Partner" | "Amount" | "Legal name" | "Partner term" | "Tax amount" | "Currency" | "VAT" | "Net amount" | + | "Ferron BP" | "16 200,00" | "Company Ferron BP" | "Basic Partner terms, TRY" | "1 200,00" | "TRY" | "8%" | "15 000,00" | + * Change amount and check net amount and tax amount calculation + And I activate "Amount" field in "Transactions" table + And I select current line in "Transactions" table + And I input "20 000,00" text in "Amount" field of "Transactions" table + And I finish line editing in "Transactions" table + And "Transactions" table became equal + | "Partner" | "Amount" | "Legal name" | "Partner term" | "Tax amount" | "Currency" | "VAT" | "Net amount" | + | "Ferron BP" | "20 000,00" | "Company Ferron BP" | "Basic Partner terms, TRY" | "1 481,48" | "TRY" | "8%" | "18 518,52" | + * Save and check tax + And I click "Save" button + And "Transactions" table became equal + | "Partner" | "Amount" | "Legal name" | "Partner term" | "Tax amount" | "Currency" | "VAT" | "Net amount" | + | "Ferron BP" | "20 000,00" | "Company Ferron BP" | "Basic Partner terms, TRY" | "1 481,48" | "TRY" | "8%" | "18 518,52" | + And I close all client application windows + + +Scenario: _0154102 check filling in and refilling Credit note (with VAT) + And I close all client application windows + * Open Credit note creation form + Given I open hyperlink "e1cib/list/Document.CreditNote" + And I click the button named "FormCreate" + * Filling main details + And I select from the drop-down list named "Company" by "Main Company" string + And in the table "Transactions" I click the button named "TransactionsAdd" + And I activate "Partner" field in "Transactions" table + And I select current line in "Transactions" table + And I select "Ferron BP" from "Partner" drop-down list by string in "Transactions" table + And I activate "Legal name" field in "Transactions" table + And I select "Company Ferron BP" from "Legal name" drop-down list by string in "Transactions" table + And I activate "Partner term" field in "Transactions" table + And I select "Basic Partner terms, TRY" from "Partner term" drop-down list by string in "Transactions" table + And I activate "Amount" field in "Transactions" table + * Select VAT rate + And I activate "VAT" field in "Transactions" table + And I select current line in "Transactions" table + And I select "18%" exact value from "VAT" drop-down list in "Transactions" table + * Amount + And I select current line in "Transactions" table + And I input "15 000,00" text in "Amount" field of "Transactions" table + And I finish line editing in "Transactions" table + * Check VAT calculation + And "Transactions" table became equal + | "Partner" | "Amount" | "Legal name" | "Partner term" | "Tax amount" | "Currency" | "VAT" | "Net amount" | + | "Ferron BP" | "15 000,00" | "Company Ferron BP" | "Basic Partner terms, TRY" | "2 288,14" | "TRY" | "18%" | "12 711,86" | + * Change Net amount and check VAT and Amount calculation + And I select current line in "Transactions" table + And I input "15 000,00" text in "Net amount" field of "Transactions" table + And I finish line editing in "Transactions" table + And "Transactions" table became equal + | "Partner" | "Amount" | "Legal name" | "Partner term" | "Tax amount" | "Currency" | "VAT" | "Net amount" | + | "Ferron BP" | "17 700,00" | "Company Ferron BP" | "Basic Partner terms, TRY" | "2 700,00" | "TRY" | "18%" | "15 000,00" | + * Change Vat rate and check amount and net amount calculation + And I activate "VAT" field in "Transactions" table + And I select current line in "Transactions" table + And I select "8%" exact value from "VAT" drop-down list in "Transactions" table + And "Transactions" table became equal + | "Partner" | "Amount" | "Legal name" | "Partner term" | "Tax amount" | "Currency" | "VAT" | "Net amount" | + | "Ferron BP" | "16 200,00" | "Company Ferron BP" | "Basic Partner terms, TRY" | "1 200,00" | "TRY" | "8%" | "15 000,00" | + * Change amount and check net amount and tax amount calculation + And I activate "Amount" field in "Transactions" table + And I select current line in "Transactions" table + And I input "20 000,00" text in "Amount" field of "Transactions" table + And I finish line editing in "Transactions" table + And "Transactions" table became equal + | "Partner" | "Amount" | "Legal name" | "Partner term" | "Tax amount" | "Currency" | "VAT" | "Net amount" | + | "Ferron BP" | "20 000,00" | "Company Ferron BP" | "Basic Partner terms, TRY" | "1 481,48" | "TRY" | "8%" | "18 518,52" | + * Save and check tax + And I click "Save" button + And "Transactions" table became equal + | "Partner" | "Amount" | "Legal name" | "Partner term" | "Tax amount" | "Currency" | "VAT" | "Net amount" | + | "Ferron BP" | "20 000,00" | "Company Ferron BP" | "Basic Partner terms, TRY" | "1 481,48" | "TRY" | "8%" | "18 518,52" | + And I close all client application windows + + + + + + + + + + Scenario: _0154150 check function DontCalculateRow in the Purchase order - * Open the Purchase order creation form + * Open Purchase order creation form Given I open hyperlink "e1cib/list/Document.PurchaseOrder" And I click the button named "FormCreate" * Check filling in legal name if the partner has only one @@ -8273,8 +8396,8 @@ Scenario: _0154187 check edit currency in the StockAdjustmentAsSurplus | 'Description' | | 'Revenue' | And I select current line in "List" table - And I activate "Amount" field in "ItemList" table - And I input "100,00" text in "Amount" field of "ItemList" table + And I activate "Total amount" field in "ItemList" table + And I input "100,00" text in "Total amount" field of "ItemList" table And I finish line editing in "ItemList" table * Change unit And I click choice button of "Unit" attribute in "ItemList" table @@ -8284,8 +8407,8 @@ Scenario: _0154187 check edit currency in the StockAdjustmentAsSurplus And I select current line in "List" table * Check And "ItemList" table became equal - | '#' | 'Revenue type' | 'Amount' | 'Item' | 'Basis document' | 'Item key' | 'Profit loss center' | 'Physical inventory' | 'Serial lot numbers' | 'Unit' | 'Quantity' | - | '1' | 'Revenue' | '100,00' | 'Dress' | '' | 'XS/Blue' | 'Distribution department' | '' | '' | 'box Dress (8 pcs)' | '1,000' | + | '#' | 'Revenue type' | 'Total amount' | 'Item' | 'Basis document' | 'Item key' | 'Profit loss center' | 'Physical inventory' | 'Serial lot numbers' | 'Unit' | 'Quantity' | + | '1' | 'Revenue' | '100,00' | 'Dress' | '' | 'XS/Blue' | 'Distribution department' | '' | '' | 'box Dress (8 pcs)' | '1,000' | * Edit currency And in the table "ItemList" I click "Edit currencies" button Then "Edit currencies" window is opened diff --git a/features/Internal/_0920 SerialLotNumbers/_0920SerialLotNumber.feature b/features/Internal/_0920 SerialLotNumbers/_0920SerialLotNumber.feature index 708621d3f0..2d7daeae04 100644 --- a/features/Internal/_0920 SerialLotNumbers/_0920SerialLotNumber.feature +++ b/features/Internal/_0920 SerialLotNumbers/_0920SerialLotNumber.feature @@ -2006,9 +2006,9 @@ Scenario: _0920091 check serial lot number controls in the Stock adjustment as s And I finish line editing in "SerialLotNumbers" table And I click "Ok" button And "ItemList" table became equal - | '#' | 'Revenue type' | 'Amount' | 'Item' | 'Basis document' | 'Item key' | 'Profit loss center' | 'Physical inventory' | 'Serial lot numbers' | 'Unit' | 'Quantity' | 'Amount tax' | - | '1' | 'Revenue' | '' | 'Trousers' | '' | '38/Yellow' | 'Distribution department' | '' | '99098809009999; 99098809009008' | 'pcs' | '4,000' | '' | - | '2' | 'Revenue' | '' | 'Boots' | '' | '38/18SD' | 'Distribution department' | '' | '' | 'pcs' | '2,000' | '' | + | '#' | 'Revenue type' | 'Total amount' | 'Item' | 'Basis document' | 'Item key' | 'Profit loss center' | 'Physical inventory' | 'Serial lot numbers' | 'Unit' | 'Quantity' | 'Tax amount' | + | '1' | 'Revenue' | '' | 'Trousers' | '' | '38/Yellow' | 'Distribution department' | '' | '99098809009999; 99098809009008' | 'pcs' | '4,000' | '' | + | '2' | 'Revenue' | '' | 'Boots' | '' | '38/18SD' | 'Distribution department' | '' | '' | 'pcs' | '2,000' | '' | * Change serial/lot numbers quantity to 3 And I go to line in "ItemList" table | 'Item' | 'Item key' | diff --git a/features/Internal/_1100 Landed cost/BathBalance_005_4.mxl b/features/Internal/_1100 Landed cost/BathBalance_005_4.mxl index d5049b804414459d8ddc3ab4b06c0fcccaa6bdb7..1f201f82b3986112d3685e41a4533b2b3b9a1a10 100644 GIT binary patch delta 4141 zcmZ{nc~Di?9mkbcN9AEyj4bZ~%I3la-aYs6cu(Ajy9nZjg1aK_3Ldgiq;}Ow+w(i$b8Sr1d4GK0x#xGjzt8=h zyZmllN5H#x1HyBr&KWaqO1EC!x_5JQd-BfJ3ZG#brnnUTxEFoAz$8y^XK=d5GAt{u zGN@0b;jT3NbTZI?`DpLp02R?0=R z<@xBoscOEmub?YM9{SO`{$aiwCwx9(SmsyqO)c`%m{*+iR*3X|B}%Rl^obm^4hn{r zN#*%#!D;IFfDn)L6tpMA*%O9zJv@wN7n$^jka#*@XVIuogL;RX)E?@lNtq^n8S13B zBTSkU25r&$nN*%n>E~ASjr}}SHOr)@{hY!7!+I&gPqSZj(Y|<-PDy3MFQl%DF==Ff zjQ2}r!+ZTrH9ssoo!oOwIuZU7D=+O45l_K6CKW_1>h7bHz1;LD!b$J7o8*mz?$Y{U zq*F&kMWv~TZBePz*(&IMl!I<(2L_u~h9Uf4sq4G#eoAt>^s+LiOD(&mHOPf=q05dq z>vF4zUeRgPcwErRXa{|8Jg_H>RehQ4N_1R+FcoZ{7{<;TD2p5urPe--0k#zj-4V;! z9C14~RYfEZ0QUX?4l+UzQkgm`-a*dk zjvmVQ1@!WG6#AX`S<*QqAzQIDB*48h0q#kO?0P8Kq>YJi{bi!1itJCa)QaOt(K_OB z64v+!MXQ-wtsR5xh=jqY=bphHMfOLjT)?~`@mxSob7lzR@V}IyK-oGJwl}qgB?C#& zl4KO{dNPob3?S_@kWgL;20W5dfV5HTjTAc~G!>_{Ar(mXq%zWov;=h>HmA+iJh5(g zt#*UwEv-FFyF@cgoZk0M@I(smR0_`4JzdZT0v?eTc$RB@)3PIac;Hd&0ncrz%wwjj z5@q=W)uk6mJO0ibh&3bVKt;n*kpeI?d%X|$;by_=K zvv(|h49Zh821s2}*>1{MJ7L>ctnC^L6z@3b?r|J(GRUM~j02KqJdj$Yvd6#2b9n^K zn!r39`CtNg22X@%xz-yK)plhI3Ymlwl}rLphgA0RPv&e{GNOJmJUS+WBR(5inr%m1 z&&D|ooC2O&sqFE1iYie^&R%I1BEf!=gRAG&T;MFxdNG%AIO1Qqz?nZ4I5(uSRZ^aP z^5uD0dm|4R!PB4%rr8k}rlCB2rvqoBRQBkcj`F0!a9f_?=Y zFBSB=Wlp7{7_CE9v0IHlElyQBdO7ABmZMX+zdTwUAF=|S!lo4%zbD7+AG*?1^W`hk zs5RE4j+K~CScSLNmQ{Ijo4Oa9^lTMsJbpE{hqQjWnzxA~QrBSD8`ogFK3{{#VQYC8 zIHG3DQ-QycCAOm&)2IfhfR`7rfR#hB|v&w0^8B0(1ubQ z>622}WNrXb>jp$T+@LOuGWoD9gGWsn65Y`nyU~tVzY!ik)0$R}$jWj&mOm=DOEhy6 zyiROFmd~{g+idgHZH8CZX7Ehdg2=;L>;n8oA8~I*mMX2cx7rcTZ79+9ZSZ=q4Ut1D z@Z6~qR9%rPOB5pi1#HL7m9rg*TD3mh&PW{LtprMo*1uFDGOLOca>Su3oYt?ZkSKWv zbn6Zq>DCS)4cQ5#`kjclyOZxOlai}V*+W~@RL%Xmpw4Ra)``2IrBcsTTXc07-xc!V zP-7{rt`SOqTjNsm)^5IA1Xb;JDgCL|h&?XpZ_=_oZgu?T9`xwRd*RcxH$gV$^6uH2 zs_w3_wYa;^)Z*@Xs&#Z7#tl;W?zmrv#yqp$qx$I+^_J3a?~7J__;jh9qYs~c06srBfJ?{Gz;EU(8Hpp_Jj~lIsDBG=Dq4W_>lQm<%IiR>(E7gC@FRA_ zvLitH@ev@U9EDf&QHdnK-i{9HE@#`|=vc*>axnq^J8{o+vxp^1{r{B9UdD%YQvPKOpA6 V$LxP`aW5R)RPx>MZ^>`|{{V_)GkpL6 delta 3791 zcmZXXYfx3!7030aB`7|?fIRL6(+g45Bln(t?uCm4jfkQ|g{b%lDk%7X5Q#~Q2n7Wn z2>4`$04m1nM2ShQjY*r-+RW4swlmS_2h-8Xq=_1*NzXc^wf29vAJTEgA8W6* z*Z#53J?wqY{=v25iYs<@!J?_tW(^1*FmOP`fW9*y)`cwFvhAP8eiKgpkJ=O%&s4zN?#~f-JX6xLoVF{091cG$fil)v;Mft-MXhox<*O(ID zF!V;zk{1i7r(cs4tXajSB z;Ss}cnUbFv?bG=K(T=b^=D&I|9NJVC7q)N*>ob^x@+}sG?!G?ltO1Sg(pHJ|7r{c@fWJN{_={_zX0JFzK6y0j++8ebU(pFpc7rnLI_3AFN$c4T*`gDFct7@er|d1DfF++ldb z&`w2uQ>v}=U!(@~*5r*1==kli$$DD`j$5Gn>==i2uNZpABd%tO$FIl3Bhi9K6H`2H zSy(490Uk|;mkg8AkgrOE$Hg>w1bp!5_NC}g%eTH_y-uwk>z+4^wh=F9ipNPCeIgY+ z)-%Q9s=_*B9C)lZJZBgcK)xivd&u>_4ZtHc2#;Ms?8o&WJl3XT-7|*a8HkIR;&CJc z9zO`dqk<`YFNCm;I};uihQBoY;Y8%;O@zlUCc?v$1&_uo?8hfrcrHty#JVR8`werm z;ju3p&*iV#@K`tr9%m+Dok5e~vC!}h!@n`*_n7h&evhM1!DG-Ac&wd*{Wv!T9{D-& z=rp`(XitSl!&G?uaVk7=bK%jOi*@cXWq)#~f$fH$GsPoqIz0AHhsQmp)EDPrKThSr zBVz_Uwi;eGOqvOg=Vrp=qnYrq^Wo8vk9BS^rLX-oxXJJWQ#{Vk9`++@K0KBgzGZlyDSf6D!Q)sFJR%mrqj~|>Im?v35evb^hR2yQ|L#I~ zEL;SSvrMV?F2;V;EXIEPdoetoeirO9{E{hsR53iL7#{bT(r3vMtaE}X@qNSTOA)`y zl=;_}!XtMXJWepBet1c;KB&t|cnv;?&zIm}eylV>AJnBxIh0S9%0aE@L1~(fiI7L*XkDbbkH{w~mi;EaP_!Czm1LR_5bzMSm%iK8og)OTD6l<;nU`zFqF)L)oFZ zD}DO3d}k$2&xeMyRw3?Y%4vFQm0zEld8_4cw(0n4y>l#{w;qF&*h}yKMiM8;rVn_;rZOFN~4Rs-$l=({>by# z|JzL2?@4RHorc$#@_bUO@qAjVeN-1~)7RCg3%!s`Co3J={X&7R8@3L8iw%1X?=q!N z&WrFk`XW4BFQLBRC9KoK6pud}X1Uy#kLjub^-E z2C&HR2vhp>ZGcB%4Lp8UgSvm!V4eJp=-Xv@%P>%jd{ZqvZq~vhw+{8~b=Z$T)xl%U zkJ0x%LsvcG0;YHztcS;U_3&8Ifc%>cSf`&U`!Q`3NQPf9Wxj7SJoasd$DPfno7{-^ zh8k_YbUM`E7*G984&^q<1(z?rO>P~3#<5&V$8Jf}aoZMK^Y#|M=KQU=v>x7y`aX`O zPxdys)Y{at&BO1NO`mM@>o~MMpm}J!TyAZ8q&Y>uH;bC(y|L;2W}83virhQg{JB=N z#_&BuSBsnT4i&bf>HMh{eVL`0R;A;Ot@2(u^t)Efk7<+lNl}@mL+`Z7d_@o28oZ%jl1OUnxgRCazAru!EU*~DLSHKMSV=kKeviS@AvER_yfWAe492M@cjRGu64^Y>E;2C zu6GV%{^o;;dfr7tPY;jJS5(=f^!SCIbgJ%B6g=dP`rel~JA%Cs_N%=XKm&2xg5&6CnCn`iMjPvdc( z$KNJ-Vy0#D%#735UU!GNR3`Pm@l*QfST&U$uczR#IP&z)rncVZ(^+rk^A{P*|Gj@+ U@BapD`KjI-I=GJiM;(U#0~ye_OaK4? diff --git a/features/Internal/_1100 Landed cost/BathBalance_006_51.mxl b/features/Internal/_1100 Landed cost/BathBalance_006_51.mxl index 607833de5dfb6bd1b5cba293b548daa04e34bbaa..80bb9f1efb57c48ec9ee0a6249bd26958c3635d9 100644 GIT binary patch delta 5913 zcmai&c~sTa7RLo!pa#mIO!p!QPUsK0zw^8IGUSA&q6`j9Dhi`)iPhbp=Z37mG$bqv-kP!Yg(%of82e~{qB7}d!K!N z{LZ<#v-7sf&VeZtr;Z+z+^I_^w@zN2ZeO^xI#$y)U7QK5@`QRXz3GN$KR5Vdtq%6C zLH@CSIAF6Inqh>Ocy}w&Y$aM8eB~Jn)m?8wS8p9obhCIEu|hNSrZ>6`P=0;AHo|w^ z1^mS;+D(Vjmvo5t4sq9YXiL;#vv)9b*(~6?8mh|{5ZXP+)D?7(X5FjZb$Gg$fXE(} zU^T%#0?oVIYGKo4#CBgD%6o*E?tkuKpnK^;0mFTC*dHL^fDiLQ#{_?=>sTtl!#CLU znB;3mkGwSkT6}}yPn!*J_ajz}oaz@2AKG=O^BV#mR0?qOkA^{3DfhQPP;VVh`CHs# zVX>bM-}{Hq$e5lMcs)ypik>$5{-2%(c%0KAvzNu^!7RY1cO10#vcd<0bnpzYlf!)Z z>2XfLI{_hPU6Gr9at2!A^}af62z1c*zsv9OEdpYK6wQX9a40x0;QgQx?m|L$u|Z;R zh?{_fG97l4)z(voPh4YKNC*p8hOqDoS#=RQ_*i&shQ-3d28&@v>~6J43x(Na;Vku5 zm++3&ZVIzQSy)dN3h#u5a=HNH|qNRnbS^d4?!g{YjBSsT(zi4L_;&6W}&V?bq z?vIWbH+_Ijg^+Dqkr)`P-ycCY%pIZB4-GU!2uL5uxf~d1H7Wj07KR-f86n5|3^V{D zbJVN?`VHa?7Y)L^a3x+Q3thSmc4atqFlTsvFlQL7dBersznx)$=E|^HeCE|FpT%kJGudn{?GWI=n*`vWE#`cQXVm6g=76;@&d)R{q{Ht}|RA z-ZpqHi=FFKL>A7~VvnGW@8!tAMQn=^Q0d@B{KUbF80F+*7dt5n6u#z+lKEqlfibuh zuuaQjc=vR~5CRGlVmXVtSlrnt^o--(Ge3@mi(>^`jAPa=@ywb@7S3`wo|ohM_;jR2 zm$FBh_RU9`He@K%77lgQym=@?^cu#r#lx8P#xR1w1&$id-o?Wi;u={95imjtM+zty z!4dyBg45DQa#|H5nfCLMs(GZ#;sh?)^#l}R^EgH^M9nA{?dPMo62@r6!IG^f3nAVd z?V`0l#@$`=7(?8Aj3E-oxP;YXIIYjda9Uz4S{QNtSk(vbj#Yh-C?IDXSGHjsx+3d0 zWTC_8MAZjUxGRy9>PY0uW{&5iTE`PYU6O!q6S!b=Cot>v3C!w9atSvjarW&=%o>)= ztP7H{vY+M%xSULVfbRwqQrM*`g=ue+g|xO*lU9edsSI%=m1##$WZGjBRlz0+_;w;k z96gC4D#*f!A5U@#qbGC39g{h&JCixB=~I}taf<2#89P3WOIDMHLagmiX$&zd-9_7& z&Jh1i=RO#p!7EvnK@gb#tqksiv6&2UGLs>Evq<=9rhvRGj(94I)B1rdOl$m9)d#gx zsSnU$z%=fICDXXFm&if~uj#~!?_$~0IjPp^T-mT}PHICoA=G6*Znm5;gE?zvFy~J* zOp$=pnasIoCUbs47EbHTQB^gdJSUBwT(SoKx$Kgg%cLjCLYKR_uBwiEoLB7F<4o$6 z$E1t$Tvff4$EEg~#SqiU!ie>=T*7Z>arvjt=Cod!&1psCa}TV_rygj}&o!$s>j@O$ z`oH=F0}L)8()N4-#RXjas|ARH&jG(ehRQ7@0DRv(U8n#A_{`yymXVcECg8(4Dxwrd z7AbE5E6Bo#SBfw>6#CCquPudhY5g(s?YXL|0*1~*3t69@$3fnkr(Un5Fk-%{s(_92 zF%^vb1z8w5Wq}J}?*eB1aRIZ=dQufjz_lkyh;QP73wi4Ng`EAFg(mB+Mfe`rF;76o zB66EYLbpE{BHR`5D2 z56)Q^LdUG8dqeK)S(mcj#=6G!QFOTKQA#8jZ)T}FTs4+PL(u}cm}NFPTrDZH((&d} znN=RHuz9^Vr~}Tl4e|ga4_8MwsKb@##%NL&Zd4v;H-Wwb^#71 zJ&UoiU5-D?!n@C68@6wk&)4!)dWZ7U;q7vs(7K&zi^#$-=e83q9#uQ<;Mn;)nD+7x zcJ|q6LgSKD6l z?%mIO{MLTj<9Tv$+yQmP(r`fFKE>wnuCtgoBh%_=ljGpAIty*`ukQ^d9AsVjLE7Y~ zyM54*n_NKJA-aaaq4S3#=my2>a5UYZEI6z-`CEt87PTC~O^(W|C_o19WEZnH7c!_oB9M=_yo^5feV9UhfdG}qwuQ}xEwe*`6U0pX(kKDLQc`T z^*Jq|=oCjhcZwId^J!c+6izwq64ssOi0&`&^l7Aj<#ho9jyK}w z!JofrWZF?@n0DtGlUBfuGuSdH9R4EH9wZCLJevptBW5-+?V%>7{i=y+N1RncS>x?z znfCTsrcG}~3nR8Rhr0_W+-M#k2P%?vh&hLgTPGbip9^t|lU6c*mxT;#!5L9AuSGY< z-fA)240&59m*#w+^;hm4`5>-B)SO3D4Dq+~4l_i`ODaT4$OCt6_by13b8ss=7qmKg z{#NBIz<$9n$7(Jt_b}w;sAfQ~i}^W*fu^C!>rT5SFGU@i{IF{d&2VZ?v|==QF%zp9 zv05CC={7WV>En4omvIH|PpC0aviHmX4%r;H^ zIkZ@toY*EOlD9{iUV`P&e^qCPyO&FUJ4Ed7hM03@2ZnGuZBCQGCKELo;_h>QP-7>~ zIB>fX4n3}>IAs{S!x8(-Fh5V@L4_SsuU3xW{J08O0+T_mg}4uc3U;5+-gN!yOm{aM U47p~t&@WUqd5NuLy80~nKXR&_dH?_b delta 4500 zcmZvgc~n)`6~+asIDmkH3=gS39Ab0jy?gI_@^C^?5kbK?AP%5LMC(-4IAFvnD2M}u zjew{);K1a7fZ`ZqHBN0-?XqhnX_j?JYN~ccTV099YWF$cS^kmb@{ix$XP>>l@1A=P z?_4)+^SEE=5jZL-Wyr9REn2s5YtgR7k7qvn*rn;3uGa^ac+yXvdc$qc?r!3O9BqO+ zMqb<#W$&Ze9oB5`w%M9JTZ^J6o-QhFb6?J>ZEI;|IGmc@X!ujxo~Y~Ql|wiEb^6-N zP9AM^>gOFoRbB?=c?V10QtZ+`Smx)px5@E8x7Q_gpAZl3NnHl|bF5Rbk44VA>to6| z))%bxwfI5%tvTJKyvskz>)xw*#2kA)K!5HRyPU-W0gcAis__I=S1R zMIA%vTBSkf72EnFPG+9mZBnIw1m{iqO@K~s*lk9D<*n1JTz5Snl;`Ob*vY~3bXv(= z;j7c#PVaL1d1VyE2BLxjowDKu$N%utDK;on#uQ|wPU{SM5EM;InJK{`^c8cz;uFRG zAt5rK#}xTnid`&-=UFT=f68LYd|0SOa;{=CQ}l1y*@5xS$Tust46{;MfI$<(lI6U+ zVd&fYw_ujyWv1xk*9GILiq(qGyFe$VD|{U43Y}+)gRRJKwZg|Uj>Y{94hOe}V?FML zPn9~0yFuqO#dh5>FNG<59O!P7^{skb>HPL`>}rotIj2)kyNs7Be$&&NZdCcw z*XwlZ{~qS#Glh?@6npeS{86uPxh~gwO_RMQ{|@?9iq92e-iM!p_u=CS=%E`19m@}r zy^m{BtEe|xCo1k#e8?2HZ8>-t?%ik8F`>GP@(xjdc@%o)!VJt`HSDn>iQ;*U(R#{CDVbsK>G?gQZ?V<2=InZlQQG&owZf+^}BN5g00Aoy$? zgg(K8;bXyIJfEKiLnkE$`ExPQ={f{H7BGd*8O7E^mG7a@sT>NOmc!Jx9fm%C8HRjV zEd0$=JgwMzIG#)DaID97!_ild16L{DV2b+*8UdeKBhdf$2>6VNhfZNUeEcUKK2j3Y z{UjjYZX|q6R6L~kd?eN*eiVG%90mQbL~yQRGgJ6znFJphN$7tg2|jG2p_9!N>vcmh z_yfeVn4-Sv1NaOa1E1Mr(C6M5_=p^f=W<~zbh?g1e#1EEJRAofk>lYnNAad&STc0x zB}3=SWav01pwIRR$Uk5TpUxEU6UCb;crHCAVm%H|gw9LF;gb*-GsXSfodlmTlhOas zWcX}11v(R_z{i;>@X<9@-A^j=x0u3*H4V&EJfDX3=r|QV%BMp2fuds?;qs4C^zZ#Y*B8~jNglLlj@lwexo>Q4&ohi#E*_i zPv(r1^OnsOKRPB|QuLdLIE^X#)Xs~Ld9V5Czi_@T~jzE(_F1RrIK;N!(2^iNw19~T!x$M+-jO;fB> ze9093yJO;M?1c$f@iu)CxGQ}}*V2)iL@^g1@FoCTi_#OE5;kQ zqQ6@Kn8*}5??tfryPrQjV=YZFh%`0rSLJJ3_f<1 zA^)fh>k+*jJ}zv>c>8knpR8EL6n&nR!$hOF@>uhrTMV%p;c379Zco^&Nb0iewN6@EE z@g-BfXGiTaUvt!y^gV_?OOA>6#H8!T#P5wkqw7&$Q4b%F6kW&RBj-4L{PQ^K6B^*- zXajU!HNZzgBl>Jte83d_9Zm32+5{i}YeJt7Pgvb`7i~Dvll+5Bx^u!po_RWHCqpH( z6u&rWk$L}SyBuHA?4VY82K~J`_?`cM@Fq8k2Av9(H3g>}vgR36)J!@Z`i^gUQE}lk zDtyj3p>js4Foml@XP31y_&+ip0uQ94zp8O02ccgmjD0& delta 61 zcmZ4Un{mx=#tom#nM}p0uQ94zpLDYpR_00;^ GJxl;D!Wh&5 diff --git a/features/Internal/_1100 Landed cost/LandedCost.feature b/features/Internal/_1100 Landed cost/LandedCost.feature index b0e3ef1580..b34ef39ec3 100644 --- a/features/Internal/_1100 Landed cost/LandedCost.feature +++ b/features/Internal/_1100 Landed cost/LandedCost.feature @@ -1682,6 +1682,9 @@ Scenario: _010 change Stock adjustment as surplus, Stock adjustment as write-off | 'Description' | | 'Main Company' | And I select current line in "List" table + And I select current line in "ItemList" table + And I select "0%" exact value from "VAT" drop-down list in "ItemList" table + And I finish line editing in "ItemList" table And I click "Post and close" button * Repeated posting document CalculationMovementCosts №1, №3 Given I open hyperlink "e1cib/list/Document.CalculationMovementCosts" @@ -2328,9 +2331,9 @@ Scenario: _024 check Stock adjustment as surplus movements by register R5021 Rev | 'Register "R5021 Revenues"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | 'Period' | 'Resources' | '' | 'Dimensions' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | '' | 'Amount' | 'Amount with taxes' | 'Company' | 'Branch' | 'Profit loss center' | 'Revenue type' | 'Item key' | 'Currency' | 'Additional analytic' | 'Multi currency movement type' | 'Project' | - | '' | '01.08.2021 09:42:37' | '154,08' | '' | 'Main Company' | '' | 'Front office' | 'Revenue' | '39/18SD' | 'USD' | '' | 'Reporting currency' | '' | - | '' | '01.08.2021 09:42:37' | '900' | '' | 'Main Company' | '' | 'Front office' | 'Revenue' | '39/18SD' | 'TRY' | '' | 'Local currency' | '' | - | '' | '01.08.2021 09:42:37' | '900' | '' | 'Main Company' | '' | 'Front office' | 'Revenue' | '39/18SD' | 'TRY' | '' | 'en description is empty' | '' | + | '' | '01.08.2021 09:42:37' | '130,58' | '154,08' | 'Main Company' | '' | 'Front office' | 'Revenue' | '39/18SD' | 'USD' | '' | 'Reporting currency' | '' | + | '' | '01.08.2021 09:42:37' | '762,71' | '900' | 'Main Company' | '' | 'Front office' | 'Revenue' | '39/18SD' | 'TRY' | '' | 'Local currency' | '' | + | '' | '01.08.2021 09:42:37' | '762,71' | '900' | 'Main Company' | '' | 'Front office' | 'Revenue' | '39/18SD' | 'TRY' | '' | 'en description is empty' | '' | And I close all client application windows diff --git a/features/Internal/_1500 Source of origin/SourceOfOrigin.feature b/features/Internal/_1500 Source of origin/SourceOfOrigin.feature index 24a4c82f88..ce3889bd68 100644 --- a/features/Internal/_1500 Source of origin/SourceOfOrigin.feature +++ b/features/Internal/_1500 Source of origin/SourceOfOrigin.feature @@ -524,8 +524,11 @@ Scenario: _150049 check filling source of origin in the StockAdjustmentAsSurplus | 'Description' | | 'Revenue' | And I select current line in "List" table - And I input "50,00" text in "Amount" field of "ItemList" table - And I input "10,00" text in "Amount tax" field of "ItemList" table + And I input "50,00" text in "Total amount" field of "ItemList" table + And I finish line editing + And "ItemList" table became equal + | "Revenue type" | "Item" | "Item key" | "Profit loss center" | "Unit" | "Tax amount" | "Source of origins" | "Quantity" | "Price" | "VAT" | "Net amount" | "Total amount" | + | "Revenue" | "Dress" | "XS/Blue" | "Distribution department" | "pcs" | "7,63" | "Source of origin 5" | "2,000" | "21,19" | "18%" | "42,37" | "50,00" | And I finish line editing in "ItemList" table * Second item And in the table "ItemList" I click the button named "ItemListAdd" @@ -577,14 +580,13 @@ Scenario: _150049 check filling source of origin in the StockAdjustmentAsSurplus | 'Description' | | 'Revenue' | And I select current line in "List" table - And I input "50,00" text in "Amount" field of "ItemList" table - And I input "10,00" text in "Amount tax" field of "ItemList" table + And I input "50,00" text in "Total amount" field of "ItemList" table And I finish line editing in "ItemList" table * Check And "ItemList" table contains lines - | 'Revenue type' | 'Amount' | 'Item' | 'Item key' | 'Profit loss center' | 'Serial lot numbers' | 'Unit' | 'Source of origins' | 'Quantity' | 'Price' | 'Amount tax' | - | 'Revenue' | '50,00' | 'Dress' | 'XS/Blue' | 'Distribution department' | '' | 'pcs' | 'Source of origin 5' | '2,000' | '25,00' | '10,00' | - | 'Revenue' | '50,00' | 'Product 3 with SLN' | 'UNIQ' | 'Distribution department' | '09987897977895' | 'pcs' | 'Source of origin 6' | '2,000' | '25,00' | '10,00' | + | 'Revenue type' | 'Total amount' | 'Item' | 'Item key' | 'Profit loss center' | 'Serial lot numbers' | 'Unit' | 'Source of origins' | 'Quantity' | 'Price' | 'Tax amount' | 'Net amount' | 'VAT' | + | 'Revenue' | '50,00' | 'Dress' | 'XS/Blue' | 'Distribution department' | '' | 'pcs' | 'Source of origin 5' | '2,000' | '21,19' | '7,63' | '42,37' | '18%' | + | 'Revenue' | '50,00' | 'Product 3 with SLN' | 'UNIQ' | 'Distribution department' | '09987897977895' | 'pcs' | 'Source of origin 6' | '2,000' | '21,19' | '7,63' | '42,37' | '18%' | * Post And I click the button named "FormPost" And I delete "$$StockAdjustmentAsSurplus1$$" variable @@ -605,10 +607,10 @@ Scenario: _150049 check filling source of origin in the StockAdjustmentAsSurplus And I input "2202283714" text in the field named "Barcode" And I move to the next attribute And "ItemList" table contains lines - | 'Revenue type' | 'Amount' | 'Item' | 'Item key' | 'Profit loss center' | 'Serial lot numbers' | 'Unit' | 'Source of origins' | 'Quantity' | 'Price' | 'Amount tax' | - | 'Revenue' | '50,00' | 'Dress' | 'XS/Blue' | 'Distribution department' | '' | 'pcs' | 'Source of origin 5' | '2,000' | '25,00' | '10,00' | - | 'Revenue' | '50,00' | 'Product 3 with SLN' | 'UNIQ' | 'Distribution department' | '09987897977895' | 'pcs' | 'Source of origin 6' | '2,000' | '25,00' | '10,00' | - | '' | '' | 'Dress' | 'M/Brown' | '' | '' | 'pcs' | 'Source of origin 5' | '1,000' | '' | '' | + | 'Revenue type' | 'Total amount' | 'Item' | 'Item key' | 'Profit loss center' | 'Serial lot numbers' | 'Unit' | 'Source of origins' | 'Quantity' | 'Price' | 'Tax amount' | + | 'Revenue' | '50,00' | 'Dress' | 'XS/Blue' | 'Distribution department' | '' | 'pcs' | 'Source of origin 5' | '2,000' | '21,19' | '7,63' | + | 'Revenue' | '50,00' | 'Product 3 with SLN' | 'UNIQ' | 'Distribution department' | '09987897977895' | 'pcs' | 'Source of origin 6' | '2,000' | '21,19' | '7,63' | + | '' | '' | 'Dress' | 'M/Brown' | '' | '' | 'pcs' | 'Source of origin 5' | '1,000' | '' | '' | And I close all client application windows diff --git a/features/Internal/_2000 LoadInfo/_2010LoadDataForm.feature b/features/Internal/_2000 LoadInfo/_2010LoadDataForm.feature index 4957493881..46b7bcbc59 100644 --- a/features/Internal/_2000 LoadInfo/_2010LoadDataForm.feature +++ b/features/Internal/_2000 LoadInfo/_2010LoadDataForm.feature @@ -714,8 +714,8 @@ Scenario: _020134 load data in the Stock adjustment as surplus And I set checkbox "Price" And I click "Next" button Then the form attribute named "Field_Price" became equal to "Yes" - Then the form attribute named "Field_Amount" became equal to "No" - Then the form attribute named "Field_AmountTax" became equal to "No" + Then the form attribute named "Field_TotalAmount" became equal to "No" + Then the form attribute named "Field_TaxAmount" became equal to "No" And I close all client application windows Scenario: _020135 load data in the Stock adjustment as write off diff --git a/features/Internal/_2990 PhysicalInventory/_2990PhysicalInventory.feature b/features/Internal/_2990 PhysicalInventory/_2990PhysicalInventory.feature index d6b9e1d658..5f1f20c57e 100644 --- a/features/Internal/_2990 PhysicalInventory/_2990PhysicalInventory.feature +++ b/features/Internal/_2990 PhysicalInventory/_2990PhysicalInventory.feature @@ -1337,12 +1337,12 @@ Scenario: _2990030 check filling in Stock adjustment as surplus based on Physica And I click "Ok" button * Check filling And "ItemList" table became equal - | '#' | 'Revenue type' | 'Amount' | 'Item' | 'Basis document' | 'Item key' | 'Profit loss center' | 'Physical inventory' | 'Serial lot numbers' | 'Unit' | 'Quantity' | - | '1' | '' | '' | 'Dress' | '$$PhysicalInventory3$$' | 'XS/Blue' | '' | '$$PhysicalInventory3$$' | '' | 'pcs' | '103,000' | - | '2' | '' | '' | 'Product 2 with SLN' | '$$PhysicalInventory3$$' | 'UNIQ' | '' | '$$PhysicalInventory3$$' | '45678899' | 'pcs' | '2,000' | - | '3' | '' | '' | 'Boots' | '$$PhysicalInventory3$$' | '36/18SD' | '' | '$$PhysicalInventory3$$' | '' | 'pcs' | '2,000' | - | '4' | '' | '' | 'Product 1 with SLN' | '$$PhysicalInventory3$$' | 'ODS' | '' | '$$PhysicalInventory3$$' | '677899' | 'pcs' | '4,000' | - | '5' | '' | '' | 'Dress' | '$$PhysicalInventory3$$' | 'S/Yellow' | '' | '$$PhysicalInventory3$$' | '' | 'pcs' | '110,000' | + | '#' | 'Revenue type' | 'Total amount' | 'Item' | 'Basis document' | 'Item key' | 'Profit loss center' | 'Physical inventory' | 'Serial lot numbers' | 'Unit' | 'Quantity' | + | '1' | '' | '' | 'Dress' | '$$PhysicalInventory3$$' | 'XS/Blue' | '' | '$$PhysicalInventory3$$' | '' | 'pcs' | '103,000' | + | '2' | '' | '' | 'Product 2 with SLN' | '$$PhysicalInventory3$$' | 'UNIQ' | '' | '$$PhysicalInventory3$$' | '45678899' | 'pcs' | '2,000' | + | '3' | '' | '' | 'Boots' | '$$PhysicalInventory3$$' | '36/18SD' | '' | '$$PhysicalInventory3$$' | '' | 'pcs' | '2,000' | + | '4' | '' | '' | 'Product 1 with SLN' | '$$PhysicalInventory3$$' | 'ODS' | '' | '$$PhysicalInventory3$$' | '677899' | 'pcs' | '4,000' | + | '5' | '' | '' | 'Dress' | '$$PhysicalInventory3$$' | 'S/Yellow' | '' | '$$PhysicalInventory3$$' | '' | 'pcs' | '110,000' | And I close all client application windows Scenario: _2990032 check filling in Stock adjustment as write off based on Physical Inventory with Serial lot numbers @@ -1576,8 +1576,8 @@ Scenario: _2990055 check filling price and sum in the Stock adjustment as surplu And I finish line editing in "ItemList" table * Check amount calculation And "ItemList" table became equal - | 'Amount' | 'Item' | 'Item key' | 'Quantity' | 'Price' | 'Amount tax' | - | '5 000,00' | 'Dress' | 'XS/Blue' | '500,000' | '10,00' | '' | + | "#" | "Item" | "Item key" | "Unit" | "Tax amount" | "Quantity" | "Price" | "VAT" | "Net amount" | "Total amount" | + | "1" | "Dress" | "XS/Blue" | "pcs" | "900,00" | "500,000" | "10,00" | "18%" | "5 000,00" | "5 900,00" | * Price calculation And in the table "ItemList" I click the button named "ItemListAdd" And I click choice button of "Item" attribute in "ItemList" table @@ -1592,33 +1592,33 @@ Scenario: _2990055 check filling price and sum in the Stock adjustment as surplu And I select current line in "List" table And I activate "Quantity" field in "ItemList" table And I input "400,000" text in "Quantity" field of "ItemList" table - And I activate field named "ItemListAmount" in "ItemList" table - And I input "4 400,00" text in the field named "ItemListAmount" of "ItemList" table + And I activate field named "ItemListTotalAmount" in "ItemList" table + And I input "4 400,00" text in "Total amount" field of "ItemList" table And I finish line editing in "ItemList" table * Check price calculation And "ItemList" table contains lines - | 'Amount' | 'Item' | 'Item key' | 'Quantity' | 'Price' | - | '4 400,00' | 'Dress' | 'S/Yellow' | '400,000' | '11,00' | + | 'Total amount' | 'Item' | 'Item key' | 'Quantity' | 'Price' | 'Net amount' | 'Tax amount' | + | '4 400,00' | 'Dress' | 'S/Yellow' | '400,000' | '9,32' | '3 728,81' | '671,19' | * Change quantity and check amount And I go to line in "ItemList" table - | '#' | 'Amount' | 'Item' | 'Item key' | 'Price' | 'Quantity' | - | '1' | '5 000,00' | 'Dress' | 'XS/Blue' | '10,00' | '500,000' | + | '#' | 'Total amount'| 'Item' | 'Item key' | 'Price' | 'Quantity' | + | '1' | '5 900,00' | 'Dress' | 'XS/Blue' | '10,00' | '500,000' | And I select current line in "ItemList" table And I input "550,00" text in "Quantity" field of "ItemList" table And I finish line editing in "ItemList" table And "ItemList" table contains lines - | 'Amount' | 'Item' | 'Item key' | 'Quantity' | 'Price' | 'Amount tax' | - | '5 500,00' | 'Dress' | 'XS/Blue' | '550,000' | '10,00' | '' | + | 'Total amount'| 'Item' | 'Item key' | 'Quantity' | 'Price' | 'Tax amount' | + | '6 490,00' | 'Dress' | 'XS/Blue' | '550,000' | '10,00' | '990,00' | * Change amount and check price And I go to line in "ItemList" table | 'Item' | 'Item key' | | 'Dress' | 'XS/Blue' | And I select current line in "ItemList" table - And I input "10 000,00" text in the field named "ItemListAmount" of "ItemList" table + And I input "10 000,00" text in "Total amount" field of "ItemList" table And I finish line editing in "ItemList" table And "ItemList" table contains lines - | 'Amount' | 'Item' | 'Item key' | 'Quantity' | 'Price' | 'Amount tax' | - | '10 000,00' | 'Dress' | 'XS/Blue' | '550,000' | '18,18' | '' | + | 'Total amount' | 'Item' | 'Item key' | 'Quantity' | 'Price' | 'Tax amount' | + | '10 000,00' | 'Dress' | 'XS/Blue' | '550,000' | '15,41' | '1 525,42' | * Change price and check amount And I go to line in "ItemList" table | 'Item' | 'Item key' | @@ -1627,8 +1627,8 @@ Scenario: _2990055 check filling price and sum in the Stock adjustment as surplu And I input "22,00" text in "Price" field of "ItemList" table And I finish line editing in "ItemList" table And "ItemList" table contains lines - | 'Amount' | 'Item' | 'Item key' | 'Quantity' | 'Price' | 'Amount tax' | - | '12 100,00' | 'Dress' | 'XS/Blue' | '550,000' | '22,00' | '' | + | 'Total amount' | 'Item' | 'Item key' | 'Quantity' | 'Price' | 'Tax amount' | 'Net amount' | 'VAT' | + | '14 278,00' | 'Dress' | 'XS/Blue' | '550,000' | '22,00' | '2 178,00' | '12 100,00' | '18%' | And I close all client application windows diff --git a/features/Internal/_3000 Other/_6005EditDocumentsMovements.feature b/features/Internal/_3000 Other/_6005EditDocumentsMovements.feature index 6bef373a11..8b786bcb9a 100644 --- a/features/Internal/_3000 Other/_6005EditDocumentsMovements.feature +++ b/features/Internal/_3000 Other/_6005EditDocumentsMovements.feature @@ -113,13 +113,13 @@ Scenario: _605703 change movements for PI | 'Yes' | 'Vendor Ferron, TRY' | '23 454,40' | 'Purchase invoice 12 dated 07.09.2020 17:53:38' | 'Main Company' | 'USD' | 'Reporting currency' | 'No' | 'Company Ferron BP' | '3' | 'Ferron BP' | '07.09.2020 17:53:38' | 'Expense' | 'TRY' | And I activate field named "R1021B_VendorsTransactionsCompany" in "R1021B_VendorsTransactions" table * Change movements for R1040B_TaxesOutgoing - And I move to "R1040B_TaxesOutgoing (3)" tab + And I move to "R1040B_TaxesOutgoing *" tab And I go to line in "R1040B_TaxesOutgoing" table - | 'Active' | 'Company' | 'LineNumber' | 'Period' | 'RecordType' | 'Tax' | 'TaxableAmount' | 'TaxAmount' | 'TaxRate' | - | 'Yes' | 'Main Company' | '2' | '07.09.2020 17:53:38' | 'Receipt' | 'VAT' | '35 593,22' | '6 406,78' | '18%' | - And I activate "TaxableAmount" field in "R1040B_TaxesOutgoing" table + | 'Active' | 'Company' | 'Period' | 'RecordType' | 'Tax' | 'Amount' | 'TaxRate' | + | 'Yes' | 'Main Company' | '07.09.2020 17:53:38' | 'Receipt' | 'VAT' | '3 050,85' | '18%' | + And I activate "Amount" field in "R1040B_TaxesOutgoing" table And I select current line in "R1040B_TaxesOutgoing" table - And I input "35 593,23" text in "TaxableAmount" field of "R1040B_TaxesOutgoing" table + And I input "35 593,23" text in "Amount" field of "R1040B_TaxesOutgoing" table And I finish line editing in "R1040B_TaxesOutgoing" table * Change movements for R5020B_PartnersBalance And I move to "R5020B_PartnersBalance (4)" tab @@ -172,7 +172,8 @@ Scenario: _605703 change movements for PI And I click "Write movements" button Then there are lines in TestClient message log |'Failed to save: "R5020 Partners balance"!'| - And I click "Write movements (register self-control)" button + And I click "Write movements (register self-control)" button + And I click "Write movements" button * Check Then there are lines in TestClient message log |'Movements successfully recorded'| @@ -209,15 +210,7 @@ Scenario: _605703 change movements for PI | '' | 'Yes' | 'No' | '07.09.2020 17:53:38' | 'Expense' | 'Main Company' | '' | 'Reporting currency' | 'USD' | 'TRY' | 'Company Ferron BP' | 'Ferron BP' | 'Vendor Ferron, TRY' | 'Purchase invoice 12 dated 07.09.2020 17:53:38' | '' | '' | '23 454,4' | 'No' | '' | | '' | 'Yes' | 'No' | '07.09.2020 17:53:38' | 'Expense' | 'Main Company' | '' | 'TRY' | 'TRY' | 'TRY' | 'Company Ferron BP' | 'Ferron BP' | 'Vendor Ferron, TRY' | 'Purchase invoice 12 dated 07.09.2020 17:53:38' | '' | '' | '137 000' | 'No' | '' | And I select "R1040 Taxes outgoing" exact value from "Register" drop-down list - And I click "Generate report" button - Then "ResultTable" spreadsheet document is equal - | 'Purchase invoice 12 dated 07.09.2020 17:53:38' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "R1040 Taxes outgoing !Manual edit"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'ManualEdit' | 'Potential' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Tax' | 'Tax rate' | 'Tax movement type' | 'Taxable amount' | 'Tax amount' | - | '' | 'No' | 'No' | '07.09.2020 17:53:38' | 'Receipt' | 'Main Company' | '' | 'VAT' | '18%' | '' | '16 949,15' | '3 050,85' | - | '' | 'No' | 'No' | '07.09.2020 17:53:38' | 'Receipt' | 'Main Company' | '' | 'VAT' | '18%' | '' | '63 559,32' | '11 440,68' | - | '' | 'No' | 'Yes' | '07.09.2020 17:53:38' | 'Receipt' | 'Main Company' | '' | 'VAT' | '18%' | '' | '35 593,22' | '6 406,78' | - | '' | 'Yes' | 'No' | '07.09.2020 17:53:38' | 'Receipt' | 'Main Company' | '' | 'VAT' | '18%' | '' | '35 593,23' | '6 406,78' | + And I select "R5020 Partners balance" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal @@ -262,12 +255,18 @@ Scenario: _605703 change movements for PI And I select "R1040 Taxes outgoing" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Purchase invoice 12 dated 07.09.2020 17:53:38' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "R1040 Taxes outgoing"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Tax' | 'Tax rate' | 'Tax movement type' | 'Taxable amount' | 'Tax amount' | - | '' | '07.09.2020 17:53:38' | 'Receipt' | 'Main Company' | '' | 'VAT' | '18%' | '' | '16 949,15' | '3 050,85' | - | '' | '07.09.2020 17:53:38' | 'Receipt' | 'Main Company' | '' | 'VAT' | '18%' | '' | '35 593,22' | '6 406,78' | - | '' | '07.09.2020 17:53:38' | 'Receipt' | 'Main Company' | '' | 'VAT' | '18%' | '' | '63 559,32' | '11 440,68' | + | 'Purchase invoice 12 dated 07.09.2020 17:53:38' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R1040 Taxes outgoing"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Tax' | 'Tax rate' | 'Invoice type' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Amount' | + | '' | '07.09.2020 17:53:38' | 'Receipt' | 'Main Company' | '' | 'VAT' | '18%' | 'Invoice' | 'Local currency' | 'TRY' | 'TRY' | '3 050,85' | + | '' | '07.09.2020 17:53:38' | 'Receipt' | 'Main Company' | '' | 'VAT' | '18%' | 'Invoice' | 'Local currency' | 'TRY' | 'TRY' | '6 406,78' | + | '' | '07.09.2020 17:53:38' | 'Receipt' | 'Main Company' | '' | 'VAT' | '18%' | 'Invoice' | 'Local currency' | 'TRY' | 'TRY' | '11 440,68' | + | '' | '07.09.2020 17:53:38' | 'Receipt' | 'Main Company' | '' | 'VAT' | '18%' | 'Invoice' | 'Reporting currency' | 'USD' | 'TRY' | '522,31' | + | '' | '07.09.2020 17:53:38' | 'Receipt' | 'Main Company' | '' | 'VAT' | '18%' | 'Invoice' | 'Reporting currency' | 'USD' | 'TRY' | '1 096,84' | + | '' | '07.09.2020 17:53:38' | 'Receipt' | 'Main Company' | '' | 'VAT' | '18%' | 'Invoice' | 'Reporting currency' | 'USD' | 'TRY' | '1 958,64' | + | '' | '07.09.2020 17:53:38' | 'Receipt' | 'Main Company' | '' | 'VAT' | '18%' | 'Invoice' | 'en description is empty' | 'TRY' | 'TRY' | '3 050,85' | + | '' | '07.09.2020 17:53:38' | 'Receipt' | 'Main Company' | '' | 'VAT' | '18%' | 'Invoice' | 'en description is empty' | 'TRY' | 'TRY' | '6 406,78' | + | '' | '07.09.2020 17:53:38' | 'Receipt' | 'Main Company' | '' | 'VAT' | '18%' | 'Invoice' | 'en description is empty' | 'TRY' | 'TRY' | '11 440,68' | And I select "R5020 Partners balance" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal diff --git a/features/Internal/_4000 TestWithExtension/Test pdf 1 page.pdf b/features/Internal/_4000 TestWithExtension/Test pdf 1 page.pdf new file mode 100644 index 0000000000000000000000000000000000000000..80b6ecc4bf59cc5e65d501183c347b9fc4608893 GIT binary patch literal 37051 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 literal 0 HcmV?d00001 diff --git a/features/Internal/_4000 TestWithExtension/_40017AttachFilesControl.feature b/features/Internal/_4000 TestWithExtension/_40017AttachFilesControl.feature new file mode 100644 index 0000000000..77ed0adc3d --- /dev/null +++ b/features/Internal/_4000 TestWithExtension/_40017AttachFilesControl.feature @@ -0,0 +1,375 @@ +#language: en +@tree +@Positive +@ExtensionReportForm + +Feature: Attach Files Control + +As a Developer +I want to create an image subsystem + + +Variables: +Path = "{?(ValueIsFilled(ПолучитьСохраненноеЗначениеИзКонтекстаСохраняемого("Path")), ПолучитьСохраненноеЗначениеИзКонтекстаСохраняемого("Path"), "#workingDir#")}" + +Background: + Given I launch TestClient opening script or connect the existing one + +Scenario: _4001701 preparation (Attach Files Control) + When set True value to the constant + * Load info + When Create catalog ObjectStatuses objects + When Create catalog ItemKeys objects + When Create catalog ItemTypes objects + When Create catalog Units objects + When Create catalog Items objects + When Create catalog PriceTypes objects + When Create catalog Specifications objects + When Create chart of characteristic types AddAttributeAndProperty objects + When Create catalog AddAttributeAndPropertySets objects + When Create catalog AddAttributeAndPropertyValues objects + When Create catalog Companies objects (Main company) + When Create catalog Companies objects (own Second company) + When Create catalog BusinessUnits objects + When Create catalog Stores objects + When Create catalog Partners objects (Ferron BP) + When Create catalog Partners objects (Kalipso) + When Create catalog Companies objects (partners company) + When Create catalog Countries objects + When Create information register PartnerSegments records + When Create catalog PartnerSegments objects + When Create catalog Agreements objects + When Create chart of characteristic types CurrencyMovementType objects + When Create information register PricesByItemKeys records + When Create catalog IntegrationSettings objects + When Create information register CurrencyRates records + When Create catalog InterfaceGroups objects + When Create catalog Currencies objects + When Create catalog IntegrationSettings objects (Attach File Control) + When Create catalog AttachedDocumentSettings objects + When Create catalog FileStorageVolumes objects (Attach File Control) + When Create catalog CashAccounts objects + When Create catalog PaymentTypes objects + When Create catalog Workstations objects + When Create chart of characteristic types AddAttributeAndProperty objects (Attach File Control) + When Create catalog BusinessUnits objects + When Create document PurchaseOrder objects (PO Attach File Control) + When Create document RetailReturnReceipt objects (RRR Attach File Control) + When Create catalog AccessGroups and AccessProfiles objects (audit lock) + * Access group + Given I open hyperlink "e1cib/list/Catalog.AccessGroups" + And I go to line in "List" table + | 'Description' | + | 'Audit lock control' | + And I select current line in "List" table + And I click "Save and close" button + * Default picture storage + And In the command interface I select "Settings" "Edit constants" + And I click Select button of "Default files storage volume" field + And I go to line in "List" table + | 'Description' | + | 'DEFAULT DOCUMENT STORAGE' | + And I select current line in "List" table + And I click "Save and close" button + And Delay 3 + And I close TestClient session + Given I open new TestClient session or connect the existing one + +Scenario: _4001702 check preparation + When check preparation + + +Scenario: _4001705 setting for Attached document settings + And I close all client application windows + * Create new Attached document settings for SI + Given I open hyperlink "e1cib/list/Catalog.AttachedDocumentSettings" + And I click the button named "FormCreate" + And I click Choice button of the field named "Description" + And I go to line in "DocumentsNames" table + | "Name" | "Synonym" | + | "SalesInvoice" | "Sales invoice" | + And I select current line in "DocumentsNames" table + And I click Select button of "File storage volume" field + And I go to line in "List" table + | 'Description' | + | 'DEFAULT DOCUMENT STORAGE' | + And I select current line in "List" table + And in the table "FileSettings" I click the button named "FileSettingsAdd" + And I select current line in "FileSettings" table + And I click choice button of "File presention" attribute in "FileSettings" table + And I go to line in "List" table + | 'Description' | + | 'Type' | + And I select current line in "List" table + And I set "Required" checkbox in "FileSettings" table + And I activate "Naming format" field in "FileSettings" table + And I input "%DocDate_Sales_Invoice%DocNumber" text in "Naming format" field of "FileSettings" table + And I finish line editing in "FileSettings" table + And I activate "File extension" field in "FileSettings" table + And I select current line in "FileSettings" table + And I input "*.pdf, *.jpg" text in "File extension" field of "FileSettings" table + And I finish line editing in "FileSettings" table + And I click "Save" button + * Check + And "FileSettings" table became equal + | 'Required' | 'File presention' | 'Naming format' | 'File extension' | + | 'Yes' | 'Type' | '%DocDate_Sales_Invoice%DocNumber' | '*.pdf, *.jpg' | + And I click "Save and close" button + And "List" table contains lines + | 'Description' | + | 'SalesInvoice' | + * Change Attached document setting + And I go to line in "List" table + | 'Description' | + | 'RetailReturnReceipt' | + And I select current line in "List" table + And I go to line in "FileSettings" table + | "File presention" | + | "Return receipt" | + And I select current line in "FileSettings" table + And I select external file "$Path$/features/Internal/_4000 TestWithExtension/testjpg1.jpg" + And I click choice button of "File template" attribute in "FileSettings" table + And "FileSettings" table contains lines + | 'File template' | + | 'testjpg1.jpg' | + And I click "Save and close" button + + +Scenario: _4001705 check the display of the document template in the AttachedFilesToDocumentsControl + And I open hyperlink "e1cib/app/DataProcessor.AttachedFilesToDocumentsControl" + * Check documents display + And I go to line in "DocumentList" table + | 'Document' | + | 'Retail return receipt 223 dated 08.05.2024 18:37:53' | + * Check settings + And "DocumentsAttachedFiles" table contains lines + | 'File type' | 'Required' | + | 'Return request' | 'Yes' | + | 'Return receipt' | 'No' | + * Check template + And I go to line in "DocumentsAttachedFiles" table + | 'File type' | 'Required' | + | 'Return receipt' | 'No' | + And I activate "File" field in "CurrentFilesTable" table + And I select current line in "DocumentsAttachedFiles" table + Then the field named "Picture" is filled + And I close current window + And I go to line in "DocumentsAttachedFiles" table + | 'File type' | 'Required' | + | 'Return request' | 'Yes' | + And I activate "File" field in "CurrentFilesTable" table + And I select current line in "DocumentsAttachedFiles" table + When I Check the steps for Exception + |'Then the field named "Picture" is filled'| + And I close current window + + + +Scenario: _4001711 check mandatory documents for RRR (jpg) + And I close all client application windows + * Open AttachedFilesToDocumentsControl + And I open hyperlink "e1cib/app/DataProcessor.AttachedFilesToDocumentsControl" + And I click Choice button of the field named "Period" + And I click "Clear period" button + And I input "01.01.2023" text in the field named "DateBegin" + And I input "08.05.2024" text in the field named "DateEnd" + And I click the button named "Select" + * Add file + And I go to line in "DocumentList" table + | "Document" | + | "Purchase order 222 dated 09.05.2023 13:09:34" | + And I go to line in "DocumentList" table + | 'Document' | + | 'Retail return receipt 223 dated 08.05.2024 18:37:53' | + And I go to line in "DocumentsAttachedFiles" table + | 'File type' | 'Required' | + | 'Return request' | 'Yes' | + And I select external file "$Path$/features/Internal/_4000 TestWithExtension/testjpg1.jpg" + And Delay 10 + And I click the button named "AddNewDocument" + And "CurrentFilesTable" table contains lines: + | 'File' | + | 'testjpg1.jpg' | + +Scenario: _4001712 check attached file in document + And I close all client application windows + And I open hyperlink "e1cib/list/Document.RetailReturnReceipt" + Then "Retail return receipts" window is opened + And I go to line in "List" table + | 'Number' | 'Partner' | + | '223' | 'Ferron BP' | + And I select current line in "List" table + And I click "Attached files" button + Then "Attach file" window is opened + And I activate "File" field in "FileList" table + And "FileList" table contains lines: + | 'File' | + | 'testjpg1.jpg' | + +Scenario: _4001713 check optional documents for RRR (pdf) + And I close all client application windows + * Open AttachedFilesToDocumentsControl + And I open hyperlink "e1cib/app/DataProcessor.AttachedFilesToDocumentsControl" + And I click Choice button of the field named "Period" + And I click "Clear period" button + And I input "01.01.2023" text in the field named "DateBegin" + And I input "08.05.2024" text in the field named "DateEnd" + And I click the button named "Select" + * Add file + And I go to line in "DocumentList" table + | "Document" | + | "Purchase order 222 dated 09.05.2023 13:09:34" | + And I go to line in "DocumentList" table + | 'Document' | + | 'Retail return receipt 223 dated 08.05.2024 18:37:53' | + And I go to line in "DocumentsAttachedFiles" table + | 'File type' | 'Required' | + | 'Return receipt' | 'No' | + And I select external file "$Path$/features/Internal/_4000 TestWithExtension/Test pdf 1 page.pdf" + And Delay 10 + And I click the button named "AddNewDocument" + And "CurrentFilesTable" table contains lines: + | 'File' | + | 'Test pdf 1 page.pdf' | + * Open pdf file + And I go to line in "CurrentFilesTable" table + | 'File' | 'Print form' | + | 'Test pdf 1 page.pdf' | 'Return receipt' | + And I select current line in "CurrentFilesTable" table + Then "Test pdf * page.pdf" window is opened + And I close all client application windows + + +Scenario: _4001715 check Date, Company and Branch filters + And I close all client application windows + * Open AttachedFilesToDocumentsControl + And I open hyperlink "e1cib/app/DataProcessor.AttachedFilesToDocumentsControl" + And I click Choice button of the field named "Period" + And I click "Clear period" button + And I input "01.01.2023" text in the field named "DateBegin" + And I input "08.05.2024" text in the field named "DateEnd" + And I click the button named "Select" + * Add filters for Period, Company and Business units + And I click Choice button of the field named "Period" + And I click "Clear period" button + And I input "01.01.2023" text in the field named "DateBegin" + And I input "31.12.2023" text in the field named "DateEnd" + And I click the button named "Select" + And I click Choice button of the field named "Company" + And I go to line in "List" table + | 'Description' | + | 'Main Company' | + And I click "Select" button + And I click Choice button of the field named "Branch" + Then "Value list" window is opened + And I click the button named "Add" + And I click choice button of the attribute named "Value" in "ValueList" table + Then "Business units" window is opened + And I go to line in "List" table + | 'Description' | + | 'Front office' | + And I click "Select" button + And I click the button named "OK" + And "DocumentList" table became equal + | 'Document' | 'Branch' | + | 'Purchase order 221 dated 09.05.2023 12:29:59' | 'Front office' | + * Change Business units and check filter + And I click Choice button of the field named "Branch" + And I select current line in "ValueList" table + And I click choice button of the attribute named "Value" in "ValueList" table + And I go to line in "List" table + | 'Description' | + | 'Distribution department' | + And I select current line in "List" table + And I finish line editing in "ValueList" table + And I click the button named "OK" + And "DocumentList" table became equal + | 'Document' | 'Branch' | + | 'Purchase order 222 dated 09.05.2023 13:09:34' | 'Distribution department' | + | 'Purchase order 224 dated 09.05.2023 13:10:09' | 'Distribution department' | + * Change company and check filter + And I select from the drop-down list named "Company" by "Second Company" string + And in the table "DocumentList" I click "Fill documents" button + Then the number of "DocumentList" table lines is "равно" "0" + * Change filters + And I select from the drop-down list named "Company" by "Main Company" string + And I click Clear button of the field named "Branch" + And I click Choice button of the field named "Period" + And I click "Clear period" button + And I input "01.01.2023" text in the field named "DateBegin" + And I input "08.05.2024" text in the field named "DateEnd" + And I click the button named "Select" + And "DocumentList" table contains lines + | 'Document' | 'Branch' | + | 'Retail return receipt 223 dated 08.05.2024 18:37:53' | '' | + | 'Purchase order 221 dated 09.05.2023 12:29:59' | 'Front office' | + | 'Purchase order 222 dated 09.05.2023 13:09:34' | 'Distribution department' | + | 'Purchase order 223 dated 09.05.2023 13:09:53' | '' | + | 'Purchase order 224 dated 09.05.2023 13:10:09' | 'Distribution department' | + And I close all client application windows + + +Scenario: _4001720 check audit lock from AttachedFilesToDocumentsControl data proc + And I close all client application windows + * Open AttachedFilesToDocumentsControl + And I open hyperlink "e1cib/app/DataProcessor.AttachedFilesToDocumentsControl" + And I click Choice button of the field named "Period" + And I click "Clear period" button + And I input "01.01.2023" text in the field named "DateBegin" + And I input "08.05.2024" text in the field named "DateEnd" + And I click the button named "Select" + * Check mode + And I set checkbox "Check mode" + And I go to line in "DocumentList" table + | 'Document' | + | 'Retail return receipt 223 dated 08.05.2024 18:37:53' | + And in the table "DocumentList" I click "Lock selected" button + And I go to line in "DocumentList" table + | 'Branch' | 'Document' | + | 'Front office' | 'Purchase order 221 dated 09.05.2023 12:29:59' | + And in the table "DocumentList" I click "Lock selected" button + * Check + And in the table "DocumentList" I click "Only unlocked" button + And "DocumentList" table does not contain lines + | 'Document' | + | 'Retail return receipt 223 dated 08.05.2024 18:37:53' | + | 'Purchase order 221 dated 09.05.2023 12:29:59' | + And in the table "DocumentList" I click "Only unlocked" button + * Try unlock without permission + And I go to line in "DocumentList" table + | 'Document' | + | 'Retail return receipt 223 dated 08.05.2024 18:37:53' | + And in the table "DocumentList" I click "Unlock selected" button + Then there are lines in TestClient message log + |'Access is denied'| + And I close all client application windows + + +Scenario: _4001720 check audit unlock from AttachedFilesToDocumentsControl data proc + And I close all client application windows + * Preparation + Given I open hyperlink "e1cib/data/Catalog.AccessGroups?ref=b7b6cb8aa66608cf11eed54b0e7af6b7" + And in the table "Profiles" I click "Add" button + And I select "Audit unlock" from "Profile" drop-down list by string in "Profiles" table + And I finish line editing in "Profiles" table + And I click "Save and close" button + And I close TestClient session + Given I open new TestClient session or connect the existing one + * Open AttachedFilesToDocumentsControl + And I open hyperlink "e1cib/app/DataProcessor.AttachedFilesToDocumentsControl" + * Check mode + And I click Choice button of the field named "Period" + And I click "Clear period" button + And I input "01.01.2023" text in the field named "DateBegin" + And I input "08.05.2024" text in the field named "DateEnd" + And I click the button named "Select" + And I set checkbox "Check mode" + And I go to line in "DocumentList" table + | 'Document' | + | 'Retail return receipt 223 dated 08.05.2024 18:37:53' | + And in the table "DocumentList" I click "Unlock selected" button + And in the table "DocumentList" I click "Only unlocked" button + And "DocumentList" table contains lines + | 'Document' | + | 'Retail return receipt 223 dated 08.05.2024 18:37:53' | + And I close all client application windows \ No newline at end of file diff --git a/features/Internal/_4000 TestWithExtension/test.docx b/features/Internal/_4000 TestWithExtension/test.docx new file mode 100644 index 0000000000000000000000000000000000000000..d7680d9f32d0e299328f54b679b81b8ac6dd32cd GIT binary patch literal 11959 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 V0ISDuy{~Y94zO2Uqy6pb{{db=eq8_n literal 0 HcmV?d00001 diff --git a/features/Internal/_4000 TestWithExtension/testjpg1.jpg b/features/Internal/_4000 TestWithExtension/testjpg1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e341645bff9d32a08925ed0bf17a7a776ae6ba40 GIT binary patch literal 23817 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 b{>H%H82B3le`DZp4E&9Oe=`g~nZN!oV7a&e literal 0 HcmV?d00001 diff --git a/features/Internal/_4000 TestWithExtension/testjpg2.jpg b/features/Internal/_4000 TestWithExtension/testjpg2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b9ea86732af4895a4e9f761e8a8078900256c108 GIT binary patch literal 24890 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 literal 0 HcmV?d00001 diff --git a/features/Internal/_4000 TestWithExtension/testpng.png b/features/Internal/_4000 TestWithExtension/testpng.png new file mode 100644 index 0000000000000000000000000000000000000000..fa3fea4c0c0e927a178a4a9316eec028bd20f1b7 GIT binary patch literal 5657 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 literal 0 HcmV?d00001 diff --git a/features/Internal/_4000 TestWithExtension/testtemplate.png b/features/Internal/_4000 TestWithExtension/testtemplate.png new file mode 100644 index 0000000000000000000000000000000000000000..98f8ed7e5c7bd87a57e7e5a0a8c14f270d6fa00e GIT binary patch literal 6860 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 literal 0 HcmV?d00001 diff --git a/features/Internal/_4000 TestWithExtension/testtemplate2.png b/features/Internal/_4000 TestWithExtension/testtemplate2.png new file mode 100644 index 0000000000000000000000000000000000000000..6464d674caf11af7f04f45b579b22447908608ef GIT binary patch literal 6636 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 literal 0 HcmV?d00001 diff --git a/features/Internal/_9600 AccessRightsSystem/_9601AccessRightsSystemRegisters.feature b/features/Internal/_9600 AccessRightsSystem/_9601AccessRightsSystemRegisters.feature index 598607dbe7..9853738f0e 100644 --- a/features/Internal/_9600 AccessRightsSystem/_9601AccessRightsSystemRegisters.feature +++ b/features/Internal/_9600 AccessRightsSystem/_9601AccessRightsSystemRegisters.feature @@ -435,11 +435,6 @@ Scenario: 961069 check R5022T_Expenses register access (admin) Given I open hyperlink "e1cib/list/AccumulationRegister.R5022T_Expenses" Then the number of "List" table lines is "равно" "9" -Scenario: 961070 check R5041B_TaxesPayable register access (admin) - And I close all client application windows - Given I open hyperlink "e1cib/list/AccumulationRegister.R5041B_TaxesPayable" - Then the number of "List" table lines is "равно" "3" - // Scenario: 961071 check R6010B_BatchWiseBalance register access (admin) // And I close all client application windows // Given I open hyperlink "e1cib/list/AccumulationRegister.R6010B_BatchWiseBalance" @@ -1102,11 +1097,6 @@ Scenario: 962069 check R5022T_Expenses register access (LimitedAccess) Given I open hyperlink "e1cib/list/AccumulationRegister.R5022T_Expenses" Then the number of "List" table lines is "равно" "4" -Scenario: 962070 check R5041B_TaxesPayable register access (LimitedAccess) - And I close all client application windows - Given I open hyperlink "e1cib/list/AccumulationRegister.R5041B_TaxesPayable" - Then the number of "List" table lines is "равно" "2" - // Scenario: 962071 check R6010B_BatchWiseBalance register access (LimitedAccess) // And I close all client application windows // Given I open hyperlink "e1cib/list/AccumulationRegister.R6010B_BatchWiseBalance" diff --git a/features/Internal/_9770 Salary/_09770 Salary.feature b/features/Internal/_9770 Salary/_09770 Salary.feature index 7b0776b57c..7d9603c13f 100644 --- a/features/Internal/_9770 Salary/_09770 Salary.feature +++ b/features/Internal/_9770 Salary/_09770 Salary.feature @@ -63,6 +63,7 @@ Scenario: _097700 preparation (Сheck payroll) When Create catalog Partners, Companies, Agreements for Tax authority * Data for salary When Create catalog EmployeePositions objects + When Create information register T9545S_VacationDaysLimits records When Create catalog Partners objects (Employee for salary) When Create catalog AccrualAndDeductionTypes objects When Create information register T9500S_AccrualAndDeductionValues records @@ -196,6 +197,36 @@ Scenario: _097706 check Employee sick leave | 'Number' | | '$NumberEmployeeSickLeave$' | +Scenario: _097717 calculate deserved vacations + And I close all client application windows + * October (Main Company) + Given I open hyperlink "e1cib/list/Document.CalculationDeservedVacations" + And I click the button named "FormCreate" + And I select from the drop-down list named "Company" by "Main Company" string + And I input "01.11.2023 12:00:00" text in the field named "Date" + And I input "01.10.2023" text in "Begin date" field + And I input "31.10.2023" text in "End date" field + And I click "Save" button + And I save the value of "Number" field as "NumberDeservedVacation" + And I click "Post and close" button + * Check + And "List" table contains lines + | 'Number' | + | '$NumberDeservedVacation$' | + * November + And I click the button named "FormCreate" + And I select from the drop-down list named "Company" by "Main Company" string + And I input "01.12.2023 12:00:00" text in the field named "Date" + And I input "01.11.2023" text in "Begin date" field + And I input "30.11.2023" text in "End date" field + And I click "Save" button + And I save the value of "Number" field as "NumberDeservedVacation1" + And I click "Post and close" button + * Check + And "List" table contains lines + | 'Number' | + | '$NumberDeservedVacation1$' | + Scenario: _097707 check Employee vacation And I close all client application windows * Create EmployeeVacation (Arina Brown, Anna Petrova) @@ -230,6 +261,10 @@ Scenario: _097707 check Employee vacation And I select from the drop-down list named "Branch" by "shop 01" string And I click "Post" button And I save the value of "Number" field as "NumberEmployeeVacation" + And "EmployeeList" table became equal + | "Employee" | "Begin date" | "End date" | "Paid days" | "Own cost days" | "Total" | + | "Arina Brown" | "06.11.2023" | "15.11.2023" | "10" | "0" | "10" | + | "Anna Petrova" | "04.11.2023" | "08.11.2023" | "5" | "0" | "5" | And I click "Post and close" button * Check And "List" table contains lines @@ -958,6 +993,7 @@ Scenario: _097721 check of payroll calculation (position and salary change in th | "Documents.EmployeeHiring.FindByNumber(6).GetObject().Write(DocumentWriteMode.Posting);" | And I execute 1C:Enterprise script at server | "Documents.EmployeeTransfer.FindByNumber(2).GetObject().Write(DocumentWriteMode.Posting);" | + And Delay 2 And I execute 1C:Enterprise script at server | "Documents.EmployeeVacation.FindByNumber(3).GetObject().Write(DocumentWriteMode.Posting);" | * Check Time Sheet diff --git a/features/Internal/_9780 MultiCurrencyRevaluation/_9780MultiCurrencyRevaluation.feature b/features/Internal/_9780 MultiCurrencyRevaluation/_9780MultiCurrencyRevaluation.feature index 5a745146e3..662e7a97dc 100644 --- a/features/Internal/_9780 MultiCurrencyRevaluation/_9780MultiCurrencyRevaluation.feature +++ b/features/Internal/_9780 MultiCurrencyRevaluation/_9780MultiCurrencyRevaluation.feature @@ -410,11 +410,11 @@ Scenario: _0978021 revaluation of currency balance (vendor) - exchange rate decr | 'Partner' | 'Total' | '' | '' | '' | 'Total' | '' | '' | '' | 'Total' | '' | '' | '' | 'Total' | '' | '' | '' | | 'Partner terms' | 'Opening' | 'Receipt' | 'Expense' | 'Balance' | 'Opening' | 'Receipt' | 'Expense' | 'Balance' | 'Opening' | 'Receipt' | 'Expense' | 'Balance' | 'Opening' | 'Receipt' | 'Expense' | 'Balance' | | 'Basis' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Total' | '' | '16 949,16' | '58 965,96' | '-42 016,80' | '' | '2 000,00' | '7 000,00' | '-5 000,00' | '' | '1 840,00' | '6 440,00' | '-4 600,00' | '' | '' | '' | '' | - | 'USD' | '' | '16 949,16' | '58 965,96' | '-42 016,80' | '' | '2 000,00' | '7 000,00' | '-5 000,00' | '' | '1 840,00' | '6 440,00' | '-4 600,00' | '' | '2 000,00' | '7 000,00' | '-5 000,00' | - | 'Ferron BP' | '' | '16 949,16' | '58 965,96' | '-42 016,80' | '' | '2 000,00' | '7 000,00' | '-5 000,00' | '' | '1 840,00' | '6 440,00' | '-4 600,00' | '' | '2 000,00' | '7 000,00' | '-5 000,00' | - | 'Vendor Ferron, USD' | '' | '16 949,16' | '58 965,96' | '-42 016,80' | '' | '2 000,00' | '7 000,00' | '-5 000,00' | '' | '1 840,00' | '6 440,00' | '-4 600,00' | '' | '2 000,00' | '7 000,00' | '-5 000,00' | - | '' | '' | '16 949,16' | '58 965,96' | '-42 016,80' | '' | '2 000,00' | '7 000,00' | '-5 000,00' | '' | '1 840,00' | '6 440,00' | '-4 600,00' | '' | '2 000,00' | '7 000,00' | '-5 000,00' | + | 'Total' | '' | '16 949,15' | '58 965,96' | '-42 016,81' | '' | '2 000,00' | '7 000,00' | '-5 000,00' | '' | '1 840,00' | '6 440,00' | '-4 600,00' | '' | '' | '' | '' | + | 'USD' | '' | '16 949,15' | '58 965,96' | '-42 016,81' | '' | '2 000,00' | '7 000,00' | '-5 000,00' | '' | '1 840,00' | '6 440,00' | '-4 600,00' | '' | '2 000,00' | '7 000,00' | '-5 000,00' | + | 'Ferron BP' | '' | '16 949,15' | '58 965,96' | '-42 016,81' | '' | '2 000,00' | '7 000,00' | '-5 000,00' | '' | '1 840,00' | '6 440,00' | '-4 600,00' | '' | '2 000,00' | '7 000,00' | '-5 000,00' | + | 'Vendor Ferron, USD' | '' | '16 949,15' | '58 965,96' | '-42 016,81' | '' | '2 000,00' | '7 000,00' | '-5 000,00' | '' | '1 840,00' | '6 440,00' | '-4 600,00' | '' | '2 000,00' | '7 000,00' | '-5 000,00' | + | '' | '' | '16 949,15' | '58 965,96' | '-42 016,81' | '' | '2 000,00' | '7 000,00' | '-5 000,00' | '' | '1 840,00' | '6 440,00' | '-4 600,00' | '' | '2 000,00' | '7 000,00' | '-5 000,00' | And I close all client application windows @@ -434,7 +434,7 @@ Scenario: _0978022 revaluation of currency balance - USD to TRY falls, USD to EU | 'Register "R1021 Vendors transactions"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Multi currency movement type' | 'Currency' | 'Transaction currency' | 'Legal name' | 'Partner' | 'Agreement' | 'Basis' | 'Order' | 'Project' | 'Amount' | 'Deferred calculation' | 'Vendors advances closing' | | '' | '03.02.2023 23:59:00' | 'Receipt' | 'Main Company' | 'Front office' | 'Reporting currency Euro' | 'EUR' | 'USD' | 'Company Ferron BP' | 'Ferron BP' | 'Vendor Ferron, USD' | '' | '' | '' | '20' | 'No' | '' | - | '' | '03.02.2023 23:59:00' | 'Expense' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'USD' | 'Company Ferron BP' | 'Ferron BP' | 'Vendor Ferron, USD' | '' | '' | '' | '142,44' | 'No' | '' | + | '' | '03.02.2023 23:59:00' | 'Expense' | 'Main Company' | 'Front office' | 'Local currency' | 'TRY' | 'USD' | 'Company Ferron BP' | 'Ferron BP' | 'Vendor Ferron, USD' | '' | '' | '' | '142,43' | 'No' | '' | And I close all client application windows Scenario: _0978023 revaluation of currency balance - USD to TRY falls, USD to EUR rise - (R2021 Customer transactions) @@ -492,7 +492,7 @@ Scenario: _0978025 revaluation of currency balance - USD to TRY falls, USD to EU | 'Foreign currency revaluation 3 dated 03.02.2023 23:59:00' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | 'Register "R5020 Partners balance"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | 'Period' | 'RecordType' | 'Company' | 'Branch' | 'Partner' | 'Legal name' | 'Agreement' | 'Document' | 'Currency' | 'Multi currency movement type' | 'Transaction currency' | 'Amount' | 'Customer transaction' | 'Customer advance' | 'Vendor transaction' | 'Vendor advance' | 'Other transaction' | 'Advances closing' | - | '' | '03.02.2023 23:59:00' | 'Receipt' | 'Main Company' | 'Front office' | 'Ferron BP' | 'Company Ferron BP' | 'Vendor Ferron, USD' | '' | 'TRY' | 'Local currency' | 'USD' | '142,44' | '' | '' | '142,44' | '' | '' | '' | + | '' | '03.02.2023 23:59:00' | 'Receipt' | 'Main Company' | 'Front office' | 'Ferron BP' | 'Company Ferron BP' | 'Vendor Ferron, USD' | '' | 'TRY' | 'Local currency' | 'USD' | '142,43' | '' | '' | '142,43' | '' | '' | '' | | '' | '03.02.2023 23:59:00' | 'Receipt' | 'Main Company' | 'Front office' | 'Kalipso' | 'Company Kalipso' | 'Personal Partner terms, $' | 'Sales invoice 2 dated 02.02.2023 12:00:00' | 'EUR' | 'Reporting currency Euro' | 'USD' | '20' | '20' | '' | '' | '' | '' | '' | | '' | '03.02.2023 23:59:00' | 'Expense' | 'Main Company' | 'Front office' | 'Ferron BP' | 'Company Ferron BP' | 'Vendor Ferron, USD' | '' | 'EUR' | 'Reporting currency Euro' | 'USD' | '20' | '' | '' | '20' | '' | '' | '' | | '' | '03.02.2023 23:59:00' | 'Expense' | 'Main Company' | 'Front office' | 'Kalipso' | 'Company Kalipso' | 'Personal Partner terms, $' | 'Sales invoice 2 dated 02.02.2023 12:00:00' | 'TRY' | 'Local currency' | 'USD' | '142,43' | '142,43' | '' | '' | '' | '' | '' | @@ -514,7 +514,7 @@ Scenario: _0978026 revaluation of currency balance - USD to TRY falls, USD to EU | 'Register "R5021 Revenues"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | '' | | '' | 'Period' | 'Company' | 'Branch' | 'Profit loss center' | 'Revenue type' | 'Item key' | 'Currency' | 'Additional analytic' | 'Multi currency movement type' | 'Project' | 'Amount' | 'Amount with taxes' | | '' | '03.02.2023 23:59:00' | 'Main Company' | 'Front office' | 'Front office' | 'Revenue' | '' | 'TRY' | '' | 'Local currency' | '' | '53,09' | '' | - | '' | '03.02.2023 23:59:00' | 'Main Company' | 'Front office' | 'Front office' | 'Revenue' | '' | 'TRY' | '' | 'Local currency' | '' | '142,44' | '' | + | '' | '03.02.2023 23:59:00' | 'Main Company' | 'Front office' | 'Front office' | 'Revenue' | '' | 'TRY' | '' | 'Local currency' | '' | '142,43' | '' | | '' | '03.02.2023 23:59:00' | 'Main Company' | 'Front office' | 'Front office' | 'Revenue' | '' | 'EUR' | '' | 'Reporting currency Euro' | '' | '1' | '' | | '' | '03.02.2023 23:59:00' | 'Main Company' | 'Front office' | 'Front office' | 'Revenue' | '' | 'EUR' | '' | 'Reporting currency Euro' | '' | '1' | '' | | '' | '03.02.2023 23:59:00' | 'Main Company' | 'Front office' | 'Front office' | 'Revenue' | '' | 'EUR' | '' | 'Reporting currency Euro' | '' | '6,26' | '' | diff --git a/features/Internal/_9910 Accounting/_9910AccountingSettings.feature b/features/Internal/_9910 Accounting/_9910AccountingSettings.feature index d52fdc7c33..1dbb1fcfd6 100644 --- a/features/Internal/_9910 Accounting/_9910AccountingSettings.feature +++ b/features/Internal/_9910 Accounting/_9910AccountingSettings.feature @@ -540,7 +540,7 @@ Scenario: _0991002 filling accounting operation | 'PurchaseInvoice_DR_R1040B_TaxesOutgoing_CR_R1021B_VendorsTransactions' | 'PurchaseInvoice DR (R1040B_TaxesOutgoing) CR (R1021B_VendorsTransactions)' | | 'RetailSalesReceipt_DR_R5022T_Expenses_CR_R4050B_StockInventory' | 'RetailSalesReceipt DR (R5022T_Expenses) CR (R4050B_StockInventory)' | | 'SalesInvoice_DR_R2021B_CustomersTransactions_CR_R5021T_Revenues' | 'SalesInvoice DR (R2021B_CustomersTransactions) CR (R5021T_Revenues)' | - | 'SalesInvoice_DR_R5021T_Revenues_CR_R2040B_TaxesIncoming' | 'SalesInvoice DR (R5021T_Revenues) CR (R2040B_TaxesIncoming)' | + | 'SalesInvoice_DR_R2021B_CustomersTransactions_CR_R2040B_TaxesIncoming' | 'SalesInvoice DR (R2021B_CustomersTransactions) CR (R2040B_TaxesIncoming)' | | 'SalesInvoice_DR_R5022T_Expenses_CR_R4050B_StockInventory' | 'SalesInvoice DR (R5022T_Expenses) CR (R4050B_StockInventory)' | | 'SalesInvoice_DR_R2020B_AdvancesFromCustomers_CR_R2021B_CustomersTransactions' | 'SalesInvoice DR (R2020B_AdvancesFromCustomers) CR (R2021B_CustomersTransactions)' | | 'ForeignCurrencyRevaluation_DR_R2020B_AdvancesFromCustomers_CR_R5021T_Revenues' | 'ForeignCurrencyRevaluation DR (R2020B_AdvancesFromCustomers) CR (R5021T_Revenues)' | @@ -679,8 +679,8 @@ Scenario: _0991003 create ledger type And I select current line in "OperationsTree" table And I input "01.01.2021" text in "Period" field of "OperationsTree" table And I go to line in "OperationsTree" table - | 'Presentation' | 'Use' | - | 'SalesInvoice DR (R5021T_Revenues) CR (R2040B_TaxesIncoming)' | 'No' | + | 'Presentation' | 'Use' | + | 'SalesInvoice DR (R2021B_CustomersTransactions) CR (R2040B_TaxesIncoming)' | 'No' | And I activate "Period" field in "OperationsTree" table And I select current line in "OperationsTree" table And I input "01.01.2021" text in "Period" field of "OperationsTree" table @@ -727,7 +727,7 @@ Scenario: _0991003 create ledger type | 'RetailSalesReceipt DR (R5022T_Expenses) CR (R4050B_StockInventory)' | 'Yes' | '01.01.2021' | | 'Sales invoice' | 'No' | '' | | 'SalesInvoice DR (R2021B_CustomersTransactions) CR (R5021T_Revenues)' | 'Yes' | '01.01.2021' | - | 'SalesInvoice DR (R5021T_Revenues) CR (R2040B_TaxesIncoming)' | 'Yes' | '01.01.2021' | + | 'SalesInvoice DR (R2021B_CustomersTransactions) CR (R2040B_TaxesIncoming)' | 'Yes' | '01.01.2021' | | 'SalesInvoice DR (R5022T_Expenses) CR (R4050B_StockInventory)' | 'Yes' | '01.01.2021' | | 'SalesInvoice DR (R2020B_AdvancesFromCustomers) CR (R2021B_CustomersTransactions)' | 'Yes' | '01.01.2021' | | 'Foreign currency revaluation' | 'No' | '' | @@ -2024,9 +2024,10 @@ Scenario: _0991041 check account priority for service (ExpenseType, CostRevenueC And I click "Post" button And in the table "ItemList" I click "Edit accounting" button And "AccountingAnalytics" table contains lines - | 'Debit' | 'Partner' | 'Business unit' | 'Partner term' | 'Credit' | 'Operation' | - | '4010' | '' | '' | '' | '9100' | 'SalesInvoice DR (R2021B_CustomersTransactions) CR (R5021T_Revenues)' | - | '9100' | 'VAT' | '' | '' | '5302' | 'SalesInvoice DR (R5021T_Revenues) CR (R2040B_TaxesIncoming)' | + | "Debit" | "Partner" | "Business unit" | "Partner term" | "Credit" | "Operation" | + | "5202" | "Customer 2 (2 partner term)" | "" | "Individual partner term 1 (by partner term)" | "4010" | "SalesInvoice DR (R2020B_AdvancesFromCustomers) CR (R2021B_CustomersTransactions)" | + | "4010" | "" | "" | "" | "9100" | "SalesInvoice DR (R2021B_CustomersTransactions) CR (R5021T_Revenues)" | + | "4010" | "VAT" | "" | "" | "5302" | "SalesInvoice DR (R2021B_CustomersTransactions) CR (R2040B_TaxesIncoming)" | And I close current window * Check account (CostRevenueCenter filled, RevenueType filled) And I select "Expence and revenue 1" from "Revenue type" drop-down list by string in "ItemList" table @@ -2034,9 +2035,10 @@ Scenario: _0991041 check account priority for service (ExpenseType, CostRevenueC And I click "Post" button And in the table "ItemList" I click "Edit accounting" button And "AccountingAnalytics" table contains lines - | 'Debit' | 'Partner' | 'Business unit' | 'Partner term' | 'Credit' | 'Operation' | - | '4010' | 'Business unit 2' | '' | '' | '9102' | 'SalesInvoice DR (R2021B_CustomersTransactions) CR (R5021T_Revenues)' | - | '9102' | 'VAT' | '' | 'Business unit 2' | '5302' | 'SalesInvoice DR (R5021T_Revenues) CR (R2040B_TaxesIncoming)' | + | "Debit" | "Partner" | "Business unit" | "Partner term" | "Credit" | "Operation" | + | "5202" | "Customer 2 (2 partner term)" | "" | "Individual partner term 1 (by partner term)" | "4010" | "SalesInvoice DR (R2020B_AdvancesFromCustomers) CR (R2021B_CustomersTransactions)" | + | "4010" | "Business unit 2" | "" | "" | "9102" | "SalesInvoice DR (R2021B_CustomersTransactions) CR (R5021T_Revenues)" | + | "4010" | "VAT" | "" | "Business unit 2" | "5302" | "SalesInvoice DR (R2021B_CustomersTransactions) CR (R2040B_TaxesIncoming)" | And I close current window * Check account (CostRevenueCenter empty, RevenueType filled) And I input "" text in "Profit loss center" field of "ItemList" table @@ -2047,19 +2049,21 @@ Scenario: _0991041 check account priority for service (ExpenseType, CostRevenueC And I click "Post" button And in the table "ItemList" I click "Edit accounting" button And "AccountingAnalytics" table contains lines - | 'Debit' | 'Partner' | 'Business unit' | 'Partner term' | 'Credit' | 'Operation' | - | '4010' | '' | '' | '' | '9100' | 'SalesInvoice DR (R2021B_CustomersTransactions) CR (R5021T_Revenues)' | - | '9100' | 'VAT' | '' | '' | '5302' | 'SalesInvoice DR (R5021T_Revenues) CR (R2040B_TaxesIncoming)' | + | "Debit" | "Partner" | "Business unit" | "Partner term" | "Credit" | "Operation" | + | "5202" | "Customer 2 (2 partner term)" | "" | "Individual partner term 1 (by partner term)" | "4010" | "SalesInvoice DR (R2020B_AdvancesFromCustomers) CR (R2021B_CustomersTransactions)" | + | "4010" | "" | "" | "" | "9100" | "SalesInvoice DR (R2021B_CustomersTransactions) CR (R5021T_Revenues)" | + | "4010" | "VAT" | "" | "" | "5302" | "SalesInvoice DR (R2021B_CustomersTransactions) CR (R2040B_TaxesIncoming)" | And I close current window * Select another CostRevenueCenter and check account And I select "Business unit 3" from "Profit loss center" drop-down list by string in "ItemList" table And I input "Expence and revenue 1" text in "Revenue type" field of "ItemList" table And I click "Post" button And in the table "ItemList" I click "Edit accounting" button - And "AccountingAnalytics" table contains lines - | 'Debit' | 'Partner' | 'Business unit' | 'Partner term' | 'Credit' | 'Operation' | - | '4010' | 'Business unit 3' | '' | '' | '9101' | 'SalesInvoice DR (R2021B_CustomersTransactions) CR (R5021T_Revenues)' | - | '9101' | 'VAT' | '' | 'Business unit 3' | '5302' | 'SalesInvoice DR (R5021T_Revenues) CR (R2040B_TaxesIncoming)' | + And "AccountingAnalytics" table became equal + | "Debit" | "Partner" | "Business unit" | "Partner term" | "Credit" | "Operation" | + | "5202" | "Customer 2 (2 partner term)" | "" | "Individual partner term 1 (by partner term)" | "4010" | "SalesInvoice DR (R2020B_AdvancesFromCustomers) CR (R2021B_CustomersTransactions)" | + | "4010" | "Business unit 3" | "" | "" | "9101" | "SalesInvoice DR (R2021B_CustomersTransactions) CR (R5021T_Revenues)" | + | "4010" | "VAT" | "" | "Business unit 3" | "5302" | "SalesInvoice DR (R2021B_CustomersTransactions) CR (R2040B_TaxesIncoming)" | And I close current window * Check account (CostRevenueCenter filled, RevenueType empty) And I select "Business unit 2" from "Profit loss center" drop-down list by string in "ItemList" table @@ -2070,7 +2074,7 @@ Scenario: _0991041 check account priority for service (ExpenseType, CostRevenueC And "AccountingAnalytics" table contains lines | 'Debit' | 'Partner' | 'Business unit' | 'Partner term' | 'Credit' | 'Operation' | | '4010' | 'Business unit 2' | '' | '' | '9100' | 'SalesInvoice DR (R2021B_CustomersTransactions) CR (R5021T_Revenues)' | - | '9100' | 'VAT' | '' | 'Business unit 2' | '5302' | 'SalesInvoice DR (R5021T_Revenues) CR (R2040B_TaxesIncoming)' | + | '4010' | 'VAT' | '' | 'Business unit 2' | '5302' | 'SalesInvoice DR (R2021B_CustomersTransactions) CR (R2040B_TaxesIncoming)' | And I close all client application windows Scenario: _0991058 create journal entry for one PI @@ -2606,7 +2610,7 @@ Scenario: _0991090 check Sales invoice accounting movements (product and service | 'Debit' | 'Partner' | 'Business unit' | 'Partner term' | 'Credit' | 'Operation' | | '5202' | 'Customer 1 (3 partner terms)' | '' | 'Partner term with customer (by document + credit limit)' | '4010' | 'SalesInvoice DR (R2020B_AdvancesFromCustomers) CR (R2021B_CustomersTransactions)' | | '4010' | 'Business unit 1' | '' | '' | '9100' | 'SalesInvoice DR (R2021B_CustomersTransactions) CR (R5021T_Revenues)' | - | '9100' | 'VAT' | '' | 'Business unit 1' | '5302' | 'SalesInvoice DR (R5021T_Revenues) CR (R2040B_TaxesIncoming)' | + | '4010' | 'VAT' | '' | 'Business unit 1' | '5302' | 'SalesInvoice DR (R2021B_CustomersTransactions) CR (R2040B_TaxesIncoming)' | | '420.1' | 'Item with item key' | 'Business unit 1' | 'S/Color 1' | '3540' | 'SalesInvoice DR (R5022T_Expenses) CR (R4050B_StockInventory)' | Then the number of "AccountingAnalytics" table lines is "равно" "4" And I close current window @@ -2614,12 +2618,12 @@ Scenario: _0991090 check Sales invoice accounting movements (product and service And I click "Journal entry" button And I click "Save" button And "RegisterRecords" table contains lines - | 'Period' | 'Account Dr' | 'Amount' | 'DebitQuantity' | 'Activity' | 'Credit currency' | 'Ext. Dim. Debit' | 'Debit amount' | 'Extra dimension2 Dr' | 'Credit quantity' | 'Extra dimension3 Dr' | 'Debit currency' | 'Account Cr' | 'Ext. Dim. Credit' | 'Operation' | 'Extra dimension2 Cr' | 'Credit amount' | 'Extra dimension3 Cr' | - | '30.03.2023 12:23:56' | '4010' | '380,00' | '' | 'Yes' | 'TRY' | 'Customer 1 (3 partner terms)' | '380' | 'Partner term with customer (by document + credit limit)' | '' | 'Business unit 1' | 'TRY' | '9100' | 'Business unit 1' | 'SalesInvoice DR (R2021B_CustomersTransactions) CR (R5021T_Revenues)' | '' | '380' | '' | - | '30.03.2023 12:23:56' | '9100' | '63,33' | '' | 'Yes' | 'TRY' | 'Business unit 1' | '63,33' | '' | '' | '' | 'TRY' | '5302' | 'VAT' | 'SalesInvoice DR (R5021T_Revenues) CR (R2040B_TaxesIncoming)' | 'Business unit 1' | '63,33' | '' | - | '30.03.2023 12:23:56' | '420.1' | '100,00' | '' | 'Yes' | 'TRY' | 'Item with item key' | '100' | 'Business unit 1' | '2' | 'Purchase of goods for sale' | 'TRY' | '3540' | 'Item with item key' | 'SalesInvoice DR (R5022T_Expenses) CR (R4050B_StockInventory)' | 'S/Color 1' | '100' | 'Business unit 1' | - | '30.03.2023 12:23:56' | '4010' | '100,00' | '' | 'Yes' | 'TRY' | 'Customer 1 (3 partner terms)' | '100' | 'Partner term with customer (by document + credit limit)' | '' | 'Business unit 1' | 'TRY' | '9100' | 'Business unit 1' | 'SalesInvoice DR (R2021B_CustomersTransactions) CR (R5021T_Revenues)' | '' | '100' | '' | - | '30.03.2023 12:23:56' | '9100' | '16,67' | '' | 'Yes' | 'TRY' | 'Business unit 1' | '16,67' | '' | '' | '' | 'TRY' | '5302' | 'VAT' | 'SalesInvoice DR (R5021T_Revenues) CR (R2040B_TaxesIncoming)' | 'Business unit 1' | '16,67' | '' | + | "Period" | "Account Dr" | "Amount" | "DebitQuantity" | "Activity" | "Credit currency" | "Ext. Dim. Debit" | "Debit amount" | "Extra dimension2 Dr" | "Credit quantity" | "Extra dimension3 Dr" | "Debit currency" | "Account Cr" | "Ext. Dim. Credit" | "Operation" | "Extra dimension2 Cr" | "Credit amount" | "Extra dimension3 Cr" | + | "30.03.2023 12:23:56" | "4010" | "63,33" | "" | "Yes" | "TRY" | "Customer 1 (3 partner terms)" | "63,33" | "Partner term with customer (by document + credit limit)" | "" | "Business unit 1" | "TRY" | "5302" | "VAT" | "SalesInvoice DR (R2021B_CustomersTransactions) CR (R2040B_TaxesIncoming)" | "Business unit 1" | "63,33" | "" | + | "30.03.2023 12:23:56" | "4010" | "16,67" | "" | "Yes" | "TRY" | "Customer 1 (3 partner terms)" | "16,67" | "Partner term with customer (by document + credit limit)" | "" | "Business unit 1" | "TRY" | "5302" | "VAT" | "SalesInvoice DR (R2021B_CustomersTransactions) CR (R2040B_TaxesIncoming)" | "Business unit 1" | "16,67" | "" | + | "30.03.2023 12:23:56" | "4010" | "316,67" | "" | "Yes" | "TRY" | "Customer 1 (3 partner terms)" | "316,67" | "Partner term with customer (by document + credit limit)" | "" | "Business unit 1" | "TRY" | "9100" | "Business unit 1" | "SalesInvoice DR (R2021B_CustomersTransactions) CR (R5021T_Revenues)" | "" | "316,67" | "" | + | "30.03.2023 12:23:56" | "4010" | "83,33" | "" | "Yes" | "TRY" | "Customer 1 (3 partner terms)" | "83,33" | "Partner term with customer (by document + credit limit)" | "" | "Business unit 1" | "TRY" | "9100" | "Business unit 1" | "SalesInvoice DR (R2021B_CustomersTransactions) CR (R5021T_Revenues)" | "" | "83,33" | "" | + | "30.03.2023 12:23:56" | "420.1" | "100,00" | "" | "Yes" | "TRY" | "Item with item key" | "100" | "Business unit 1" | "2" | "Purchase of goods for sale" | "TRY" | "3540" | "Item with item key" | "SalesInvoice DR (R5022T_Expenses) CR (R4050B_StockInventory)" | "S/Color 1" | "100" | "Business unit 1" | Then the number of "RegisterRecords" table lines is "равно" "5" And I close all client application windows @@ -2638,20 +2642,20 @@ Scenario: _0991091 check Sales invoice accounting movements (product) | 'Debit' | 'Partner' | 'Business unit' | 'Partner term' | 'Credit' | 'Operation' | | '5202' | 'Customer 2 (2 partner term)' | '' | 'Individual partner term 1 (by partner term)' | '4010' | 'SalesInvoice DR (R2020B_AdvancesFromCustomers) CR (R2021B_CustomersTransactions)' | | '4010' | 'Business unit 1' | '' | '' | '9100' | 'SalesInvoice DR (R2021B_CustomersTransactions) CR (R5021T_Revenues)' | - | '9100' | 'VAT' | '' | 'Business unit 1' | '5302' | 'SalesInvoice DR (R5021T_Revenues) CR (R2040B_TaxesIncoming)' | + | '4010' | 'VAT' | '' | 'Business unit 1' | '5302' | 'SalesInvoice DR (R2021B_CustomersTransactions) CR (R2040B_TaxesIncoming)' | | '420.1' | 'Item with item key' | 'Business unit 1' | 'S/Color 1' | '3540' | 'SalesInvoice DR (R5022T_Expenses) CR (R4050B_StockInventory)' | And I close current window * Check JE And I click "Journal entry" button And I click "Save" button And "RegisterRecords" table contains lines - | 'Period' | 'Account Dr' | 'Amount' | 'DebitQuantity' | 'Activity' | 'Credit currency' | 'Ext. Dim. Debit' | 'Debit amount' | 'Extra dimension2 Dr' | 'Credit quantity' | 'Extra dimension3 Dr' | 'Debit currency' | 'Account Cr' | 'Ext. Dim. Credit' | 'Operation' | 'Extra dimension2 Cr' | 'Credit amount' | 'Extra dimension3 Cr' | - | '24.02.2023 10:14:47' | '4010' | '760,00' | '' | 'Yes' | 'TRY' | 'Customer 2 (2 partner term)' | '760' | 'Individual partner term 1 (by partner term)' | '' | 'Business unit 1' | 'TRY' | '9100' | 'Business unit 1' | 'SalesInvoice DR (R2021B_CustomersTransactions) CR (R5021T_Revenues)' | '' | '760' | '' | - | '24.02.2023 10:14:47' | '9100' | '126,67' | '' | 'Yes' | 'TRY' | 'Business unit 1' | '126,67' | '' | '' | '' | 'TRY' | '5302' | 'VAT' | 'SalesInvoice DR (R5021T_Revenues) CR (R2040B_TaxesIncoming)' | 'Business unit 1' | '126,67' | '' | - | '24.02.2023 10:14:47' | '420.1' | '200,00' | '' | 'Yes' | 'TRY' | 'Item with item key' | '200' | 'Business unit 1' | '4' | 'Purchase of goods for sale' | 'TRY' | '3540' | 'Item with item key' | 'SalesInvoice DR (R5022T_Expenses) CR (R4050B_StockInventory)' | 'S/Color 1' | '200' | 'Business unit 1' | - | '24.02.2023 10:14:47' | '4010' | '450,00' | '' | 'Yes' | 'TRY' | 'Customer 2 (2 partner term)' | '450' | 'Individual partner term 1 (by partner term)' | '' | 'Business unit 1' | 'TRY' | '9100' | 'Business unit 1' | 'SalesInvoice DR (R2021B_CustomersTransactions) CR (R5021T_Revenues)' | '' | '450' | '' | - | '24.02.2023 10:14:47' | '9100' | '75,00' | '' | 'Yes' | 'TRY' | 'Business unit 1' | '75' | '' | '' | '' | 'TRY' | '5302' | 'VAT' | 'SalesInvoice DR (R5021T_Revenues) CR (R2040B_TaxesIncoming)' | 'Business unit 1' | '75' | '' | - | '24.02.2023 10:14:47' | '420.1' | '50,00' | '' | 'Yes' | 'TRY' | 'Item without item key (pcs)' | '50' | 'Business unit 1' | '1' | 'Purchase of goods for sale' | 'TRY' | '3540' | 'Item without item key (pcs)' | 'SalesInvoice DR (R5022T_Expenses) CR (R4050B_StockInventory)' | 'Item without item key' | '50' | 'Business unit 1' | + | "Period" | "Account Dr" | "#" | "Amount" | "DebitQuantity" | "Activity" | "Credit currency" | "Ext. Dim. Debit" | "Debit amount" | "Extra dimension2 Dr" | "Credit quantity" | "Extra dimension3 Dr" | "Debit currency" | "Account Cr" | "Ext. Dim. Credit" | "Operation" | "Extra dimension2 Cr" | "Credit amount" | "Extra dimension3 Cr" | + | "24.02.2023 10:14:47" | "4010" | "1" | "126,67" | "" | "Yes" | "TRY" | "Customer 2 (2 partner term)" | "126,67" | "Individual partner term 1 (by partner term)" | "" | "Business unit 1" | "TRY" | "5302" | "VAT" | "SalesInvoice DR (R2021B_CustomersTransactions) CR (R2040B_TaxesIncoming)" | "Business unit 1" | "126,67" | "" | + | "24.02.2023 10:14:47" | "4010" | "2" | "75,00" | "" | "Yes" | "TRY" | "Customer 2 (2 partner term)" | "75" | "Individual partner term 1 (by partner term)" | "" | "Business unit 1" | "TRY" | "5302" | "VAT" | "SalesInvoice DR (R2021B_CustomersTransactions) CR (R2040B_TaxesIncoming)" | "Business unit 1" | "75" | "" | + | "24.02.2023 10:14:47" | "4010" | "3" | "633,33" | "" | "Yes" | "TRY" | "Customer 2 (2 partner term)" | "633,33" | "Individual partner term 1 (by partner term)" | "" | "Business unit 1" | "TRY" | "9100" | "Business unit 1" | "SalesInvoice DR (R2021B_CustomersTransactions) CR (R5021T_Revenues)" | "" | "633,33" | "" | + | "24.02.2023 10:14:47" | "4010" | "4" | "375,00" | "" | "Yes" | "TRY" | "Customer 2 (2 partner term)" | "375" | "Individual partner term 1 (by partner term)" | "" | "Business unit 1" | "TRY" | "9100" | "Business unit 1" | "SalesInvoice DR (R2021B_CustomersTransactions) CR (R5021T_Revenues)" | "" | "375" | "" | + | "24.02.2023 10:14:47" | "420.1" | "5" | "200,00" | "" | "Yes" | "TRY" | "Item with item key" | "200" | "Business unit 1" | "4" | "Purchase of goods for sale" | "TRY" | "3540" | "Item with item key" | "SalesInvoice DR (R5022T_Expenses) CR (R4050B_StockInventory)" | "S/Color 1" | "200" | "Business unit 1" | + | "24.02.2023 10:14:47" | "420.1" | "6" | "50,00" | "" | "Yes" | "TRY" | "Item without item key (pcs)" | "50" | "Business unit 1" | "1" | "Purchase of goods for sale" | "TRY" | "3540" | "Item without item key (pcs)" | "SalesInvoice DR (R5022T_Expenses) CR (R4050B_StockInventory)" | "Item without item key" | "50" | "Business unit 1" | Then the number of "RegisterRecords" table lines is "равно" "6" And I close all client application windows @@ -2669,10 +2673,10 @@ Scenario: _0991093 check Sales return accounting movements (product) And I click "Journal entry" button And I click "Save" button And "RegisterRecords" table contains lines - | 'Period' | 'Account Dr' | 'Amount' | 'DebitQuantity' | 'Activity' | 'Credit currency' | 'Ext. Dim. Debit' | 'Debit amount' | 'Extra dimension2 Dr' | 'Credit quantity' | 'Extra dimension3 Dr' | 'Debit currency' | 'Account Cr' | 'Ext. Dim. Credit' | 'Operation' | 'Extra dimension2 Cr' | 'Credit amount' | 'Extra dimension3 Cr' | - | '02.03.2023 15:00:00' | '9100' | '31,67' | '' | 'Yes' | 'TRY' | 'Business unit 1' | '31,67' | '' | '' | '' | 'TRY' | '5301' | 'VAT' | 'SalesReturn DR (R5021T_Revenues) CR (R1040B_TaxesOutgoing)' | 'Business unit 1' | '31,67' | '' | - | '02.03.2023 15:00:00' | '9100' | '190,00' | '' | 'Yes' | 'TRY' | 'Business unit 1' | '190' | '' | '' | '' | 'TRY' | '4010' | 'Customer 2 (2 partner term)' | 'SalesReturn DR (R5021T_Revenues) CR (R2021B_CustomersTransactions)' | 'Individual partner term 1 (by partner term)' | '190' | 'Business unit 1' | - | '02.03.2023 15:00:00' | '420.1' | '-50,00' | '' | 'Yes' | 'TRY' | 'Item with item key' | '-50' | 'Business unit 1' | '-1' | 'Purchase of goods for sale' | 'TRY' | '3540' | 'Item with item key' | 'SalesReturn DR (R5022T_Expenses) CR (R4050B_StockInventory)' | 'S/Color 1' | '-50' | 'Business unit 1' | + | "Period" | "Account Dr" | "#" | "Amount" | "DebitQuantity" | "Activity" | "Credit currency" | "Ext. Dim. Debit" | "Debit amount" | "Extra dimension2 Dr" | "Credit quantity" | "Extra dimension3 Dr" | "Debit currency" | "Account Cr" | "Ext. Dim. Credit" | "Operation" | "Extra dimension2 Cr" | "Credit amount" | "Extra dimension3 Cr" | + | "02.03.2023 15:00:00" | "5304" | "1" | "31,67" | "" | "Yes" | "TRY" | "" | "31,67" | "" | "" | "" | "TRY" | "4010" | "Customer 2 (2 partner term)" | "SalesReturn DR (R1040B_TaxesOutgoing) CR (R2021B_CustomersTransactions)" | "Individual partner term 1 (by partner term)" | "31,67" | "Business unit 1" | + | "02.03.2023 15:00:00" | "9100" | "2" | "158,33" | "" | "Yes" | "TRY" | "Business unit 1" | "158,33" | "" | "" | "" | "TRY" | "4010" | "Customer 2 (2 partner term)" | "SalesReturn DR (R5021T_Revenues) CR (R2021B_CustomersTransactions)" | "Individual partner term 1 (by partner term)" | "158,33" | "Business unit 1" | + | "02.03.2023 15:00:00" | "420.1" | "3" | "-50,00" | "" | "Yes" | "TRY" | "Item with item key" | "-50" | "Business unit 1" | "-1" | "Purchase of goods for sale" | "TRY" | "3540" | "Item with item key" | "SalesReturn DR (R5022T_Expenses) CR (R4050B_StockInventory)" | "S/Color 1" | "-50" | "Business unit 1" | Then the number of "RegisterRecords" table lines is "равно" "3" And I close all client application windows @@ -2689,9 +2693,9 @@ Scenario: _0991094 check Sales return accounting movements (service) And I click "Journal entry" button And I click "Save" button And "RegisterRecords" table became equal - | 'Period' | 'Account Dr' | '#' | 'Amount' | 'DebitQuantity' | 'Activity' | 'Credit currency' | 'Ext. Dim. Debit' | 'Debit amount' | 'Extra dimension2 Dr' | 'Credit quantity' | 'Extra dimension3 Dr' | 'Debit currency' | 'Account Cr' | 'Ext. Dim. Credit' | 'Operation' | 'Extra dimension2 Cr' | 'Credit amount' | 'Extra dimension3 Cr' | - | '20.03.2024 11:27:09' | '9100' | '1' | '1,67' | '' | 'Yes' | 'TRY' | 'Business unit 2' | '1,67' | '' | '' | '' | 'TRY' | '5301' | 'VAT' | 'SalesReturn DR (R5021T_Revenues) CR (R1040B_TaxesOutgoing)' | 'Business unit 2' | '1,67' | '' | - | '20.03.2024 11:27:09' | '9100' | '2' | '10,00' | '' | 'Yes' | 'TRY' | 'Business unit 2' | '10' | '' | '' | '' | 'TRY' | '4010' | 'Customer 2 (2 partner term)' | 'SalesReturn DR (R5021T_Revenues) CR (R2021B_CustomersTransactions)' | 'Individual partner term 1 (by partner term)' | '10' | 'Business unit 2' | + | "Period" | "Account Dr" | "#" | "Amount" | "DebitQuantity" | "Activity" | "Credit currency" | "Ext. Dim. Debit" | "Debit amount" | "Extra dimension2 Dr" | "Credit quantity" | "Extra dimension3 Dr" | "Debit currency" | "Account Cr" | "Ext. Dim. Credit" | "Operation" | "Extra dimension2 Cr" | "Credit amount" | "Extra dimension3 Cr" | + | "20.03.2024 11:27:09" | "5304" | "1" | "1,67" | "" | "Yes" | "TRY" | "" | "1,67" | "" | "" | "" | "TRY" | "4010" | "Customer 2 (2 partner term)" | "SalesReturn DR (R1040B_TaxesOutgoing) CR (R2021B_CustomersTransactions)" | "Individual partner term 1 (by partner term)" | "1,67" | "Business unit 2" | + | "20.03.2024 11:27:09" | "9100" | "2" | "8,33" | "" | "Yes" | "TRY" | "Business unit 2" | "8,33" | "" | "" | "" | "TRY" | "4010" | "Customer 2 (2 partner term)" | "SalesReturn DR (R5021T_Revenues) CR (R2021B_CustomersTransactions)" | "Individual partner term 1 (by partner term)" | "8,33" | "Business unit 2" | Then the number of "RegisterRecords" table lines is "равно" "2" And I close all client application windows @@ -2708,9 +2712,9 @@ Scenario: _0991095 check Purchase return accounting movements (product) And I click "Journal entry" button And I click "Save" button And "RegisterRecords" table became equal - | 'Period' | 'Account Dr' | 'Amount' | 'DebitQuantity' | 'Activity' | 'Credit currency' | 'Ext. Dim. Debit' | 'Debit amount' | 'Extra dimension2 Dr' | 'Credit quantity' | 'Extra dimension3 Dr' | 'Debit currency' | 'Account Cr' | 'Ext. Dim. Credit' | 'Operation' | 'Extra dimension2 Cr' | 'Credit amount' | 'Extra dimension3 Cr' | - | '24.02.2023 17:01:27' | '5201' | '183,33' | '' | 'Yes' | 'TRY' | 'Vendor 1 (1 partner term)' | '183,33' | 'Partner term with vendor 1' | '2' | 'Business unit 1' | 'TRY' | '3540' | 'Item with item key' | 'PurchaseReturn DR (R1021B_VendorsTransactions) CR (R4050B_StockInventory)' | 'S/Color 1' | '183,33' | 'Business unit 1' | - | '24.02.2023 17:01:27' | '5302' | '36,67' | '' | 'Yes' | 'TRY' | 'VAT' | '36,67' | 'Business unit 1' | '' | '' | 'TRY' | '5201' | 'Vendor 1 (1 partner term)' | 'PurchaseReturn DR (R2040B_TaxesIncoming) CR (R1021B_VendorsTransactions)' | 'Partner term with vendor 1' | '36,67' | 'Business unit 1' | + | "Period" | "Account Dr" | "#" | "Amount" | "DebitQuantity" | "Activity" | "Credit currency" | "Ext. Dim. Debit" | "Debit amount" | "Extra dimension2 Dr" | "Credit quantity" | "Extra dimension3 Dr" | "Debit currency" | "Account Cr" | "Ext. Dim. Credit" | "Operation" | "Extra dimension2 Cr" | "Credit amount" | "Extra dimension3 Cr" | + | "24.02.2023 17:01:27" | "5201" | "1" | "36,67" | "" | "Yes" | "TRY" | "Vendor 1 (1 partner term)" | "36,67" | "Partner term with vendor 1" | "" | "Business unit 1" | "TRY" | "5303" | "" | "PurchaseReturn DR (R1021B_VendorsTransactions) CR (R2040B_TaxesIncoming)" | "" | "36,67" | "" | + | "24.02.2023 17:01:27" | "5201" | "2" | "183,33" | "" | "Yes" | "TRY" | "Vendor 1 (1 partner term)" | "183,33" | "Partner term with vendor 1" | "2" | "Business unit 1" | "TRY" | "3540" | "Item with item key" | "PurchaseReturn DR (R1021B_VendorsTransactions) CR (R4050B_StockInventory)" | "S/Color 1" | "183,33" | "Business unit 1" | Then the number of "RegisterRecords" table lines is "равно" "2" And I close all client application windows @@ -2727,11 +2731,11 @@ Scenario: _0991096 check Purchase return accounting movements (service and produ And I click "Journal entry" button And I click "Save" button And "RegisterRecords" table became equal - | 'Period' | 'Account Dr' | 'Amount' | 'DebitQuantity' | 'Activity' | 'Credit currency' | 'Ext. Dim. Debit' | 'Debit amount' | 'Extra dimension2 Dr' | 'Credit quantity' | 'Extra dimension3 Dr' | 'Debit currency' | 'Account Cr' | 'Ext. Dim. Credit' | 'Operation' | 'Extra dimension2 Cr' | 'Credit amount' | 'Extra dimension3 Cr' | - | '20.03.2024 11:28:01' | '5201' | '166,67' | '' | 'Yes' | 'TRY' | 'Vendor 6' | '166,67' | 'Partner term with vendor (advance payment by document)' | '1' | '' | 'TRY' | '3540' | 'Item with item key' | 'PurchaseReturn DR (R1021B_VendorsTransactions) CR (R4050B_StockInventory)' | 'S/Color 1' | '166,67' | '' | - | '20.03.2024 11:28:01' | '5201' | '41,67' | '' | 'Yes' | 'TRY' | 'Vendor 6' | '41,67' | 'Partner term with vendor (advance payment by document)' | '' | 'Business unit 2' | 'TRY' | '3250' | '' | 'PurchaseReturn DR (R1021B_VendorsTransactions) CR (R4050B_StockInventory)' | 'Own company 2' | '41,67' | 'Business unit 2' | - | '20.03.2024 11:28:01' | '5302' | '33,33' | '' | 'Yes' | 'TRY' | 'VAT' | '33,33' | '' | '' | '' | 'TRY' | '5201' | 'Vendor 6' | 'PurchaseReturn DR (R2040B_TaxesIncoming) CR (R1021B_VendorsTransactions)' | 'Partner term with vendor (advance payment by document)' | '33,33' | '' | - | '20.03.2024 11:28:01' | '5302' | '8,33' | '' | 'Yes' | 'TRY' | 'VAT' | '8,33' | 'Business unit 2' | '' | '' | 'TRY' | '5201' | 'Vendor 6' | 'PurchaseReturn DR (R2040B_TaxesIncoming) CR (R1021B_VendorsTransactions)' | 'Partner term with vendor (advance payment by document)' | '8,33' | 'Business unit 2' | + | "Period" | "Account Dr" | "#" | "Amount" | "DebitQuantity" | "Activity" | "Credit currency" | "Ext. Dim. Debit" | "Debit amount" | "Extra dimension2 Dr" | "Credit quantity" | "Extra dimension3 Dr" | "Debit currency" | "Account Cr" | "Ext. Dim. Credit" | "Operation" | "Extra dimension2 Cr" | "Credit amount" | "Extra dimension3 Cr" | + | "20.03.2024 11:28:01" | "5201" | "1" | "33,33" | "" | "Yes" | "TRY" | "Vendor 6" | "33,33" | "Partner term with vendor (advance payment by document)" | "" | "" | "TRY" | "5303" | "" | "PurchaseReturn DR (R1021B_VendorsTransactions) CR (R2040B_TaxesIncoming)" | "" | "33,33" | "" | + | "20.03.2024 11:28:01" | "5201" | "2" | "8,33" | "" | "Yes" | "TRY" | "Vendor 6" | "8,33" | "Partner term with vendor (advance payment by document)" | "" | "Business unit 2" | "TRY" | "5303" | "" | "PurchaseReturn DR (R1021B_VendorsTransactions) CR (R2040B_TaxesIncoming)" | "" | "8,33" | "" | + | "20.03.2024 11:28:01" | "5201" | "3" | "166,67" | "" | "Yes" | "TRY" | "Vendor 6" | "166,67" | "Partner term with vendor (advance payment by document)" | "1" | "" | "TRY" | "3540" | "Item with item key" | "PurchaseReturn DR (R1021B_VendorsTransactions) CR (R4050B_StockInventory)" | "S/Color 1" | "166,67" | "" | + | "20.03.2024 11:28:01" | "5201" | "4" | "41,67" | "" | "Yes" | "TRY" | "Vendor 6" | "41,67" | "Partner term with vendor (advance payment by document)" | "" | "Business unit 2" | "TRY" | "3250" | "" | "PurchaseReturn DR (R1021B_VendorsTransactions) CR (R4050B_StockInventory)" | "Own company 2" | "41,67" | "Business unit 2" | Then the number of "RegisterRecords" table lines is "равно" "4" And I close all client application windows @@ -3000,9 +3004,8 @@ Scenario: _0991160 check Employee cash advance accounting movements (with PI) * Check accounting movements And in the table "PaymentList" I click "Edit accounting" button And "AccountingAnalytics" table became equal - | 'Debit' | 'Partner' | 'Business unit' | 'Expense and revenue type' | 'Credit' | ' ' | 'Operation' | - | '420.2' | 'Employee 1' | 'Business unit 1' | 'Other expence' | '4020.1' | '' | 'EmployeeCashAdvance DR (R5022T_Expenses) CR (R3027B_EmployeeCashAdvance)' | - | '5201' | 'Employee 1' | 'Business unit 1' | 'Business unit 1' | '4020.1' | '' | 'EmployeeCashAdvance DR (R1021B_VendorsTransactions) CR (R3027B_EmployeeCashAdvance)' | + | "Debit" | "Partner" | "Business unit" | "Partner term" | "Credit" | " " | "Operation" | + | "5201" | "Employee 1" | "Business unit 1" | "Vendor 4 (partner term) " | "4020.1" | "" | "EmployeeCashAdvance DR (R1021B_VendorsTransactions) CR (R3027B_EmployeeCashAdvance)" | And I close current window * Check JE And I click "Journal entry" button @@ -3012,7 +3015,7 @@ Scenario: _0991160 check Employee cash advance accounting movements (with PI) | '22.03.2024 11:52:17' | '5201' | '1' | '200,00' | '' | 'Yes' | 'TRY' | 'Vendor 4 (1 partner term)' | '200' | 'Vendor 4 (partner term) ' | '' | 'Business unit 1' | 'TRY' | '4020.1' | 'Employee 1' | 'EmployeeCashAdvance DR (R1021B_VendorsTransactions) CR (R3027B_EmployeeCashAdvance)' | 'Business unit 1' | '200' | '' | And I close all client application windows -Scenario: _0991161 check Employee cash advance accounting movements (without PI) +Scenario: _0991161 check Employee cash advance accounting movements (without PI, VAT) And I close all client application windows * Select EmployeeCashAdvance Given I open hyperlink "e1cib/list/Document.EmployeeCashAdvance" @@ -3026,7 +3029,6 @@ Scenario: _0991161 check Employee cash advance accounting movements (without PI) And "AccountingAnalytics" table became equal | 'Debit' | 'Partner' | 'Business unit' | 'Expense and revenue type' | 'Credit' | ' ' | 'Operation' | | '420.2' | 'Employee 1' | 'Business unit 1' | 'Other expence' | '4020.1' | '' | 'EmployeeCashAdvance DR (R5022T_Expenses) CR (R3027B_EmployeeCashAdvance)' | - | '5201' | 'Employee 1' | 'Business unit 1' | 'Business unit 1' | '4020.1' | '' | 'EmployeeCashAdvance DR (R1021B_VendorsTransactions) CR (R3027B_EmployeeCashAdvance)' | And I close current window * Check JE And I click "Journal entry" button @@ -3380,8 +3382,7 @@ Scenario: _0991198 check DepreciationCalculation movements And "RegisterRecords" table became equal | 'Period' | 'Account Dr' | '#' | 'Amount' | 'DebitQuantity' | 'Activity' | 'Credit currency' | 'Ext. Dim. Debit' | 'Debit amount' | 'Extra dimension2 Dr' | 'Credit quantity' | 'Extra dimension3 Dr' | 'Debit currency' | 'Account Cr' | 'Ext. Dim. Credit' | 'Operation' | 'Extra dimension2 Cr' | 'Credit amount' | 'Extra dimension3 Cr' | | '31.03.2024 00:00:00' | '420.3' | '1' | '4,17' | '' | 'Yes' | 'TRY' | '' | '4,17' | 'Business unit 2' | '' | 'Expence and revenue 1' | 'TRY' | '7501' | '' | 'DepreciationCalculation DR (R5022T_Expenses) CR (DepreciationFixedAsset)' | '' | '4,17' | '' | - And I close all client application windows - + And I close all client application windows Scenario: _0991199 check create JE from Data processor fix document problems And I close all client application windows @@ -3393,4 +3394,6 @@ Scenario: _0991199 check create JE from Data processor fix document problems And I input "31.03.2024" text in the field named "DateEnd" And I click the button named "Select" And in the table "DocumentList" I click "Fill documents" button - Then the number of "DocumentList" table lines is "больше" "10" + Then the number of "DocumentList" table lines is "больше" "10" + +