From f7bb3944c09cecf35502eca7b86ef111315bce5e Mon Sep 17 00:00:00 2001 From: DitriXNew Date: Tue, 10 Jan 2023 20:04:58 +0200 Subject: [PATCH] Translate --- IRP/src/AccountingRegisters/Basic/Basic.mdo | 4 +- ...T_ManualMaterialsCorretionInProduction.mdo | 2 +- .../R8010B_TradeAgentInventory.mdo | 14 +++ .../R8012B_ConsignorInventory.mdo | 14 +++ .../R8014T_ConsignorSales.mdo | 2 +- .../BillOfMaterials/BillOfMaterials.mdo | 4 +- .../BillOfMaterials/Forms/ItemForm/Form.form | 2 +- IRP/src/Catalogs/Companies/Companies.mdo | 2 +- .../Forms/ItemForm/Form.form | 2 +- .../Forms/ListForm/Form.form | 2 +- .../Forms/ChoiceForm/Form.form | 2 +- .../FillingTemplates/Forms/ListForm/Form.form | 2 +- .../SourceOfOrigins/Forms/ItemForm/Form.form | 2 +- IRP/src/ChartsOfAccounts/Basic/Basic.mdo | 6 +- IRP/src/CommonForms/EditStores/Form.form | 2 +- .../CommonForms/PickupSpecialOffers/Form.form | 2 +- IRP/src/CommonForms/PrintForm/Form.form | 2 +- IRP/src/CommonModules/Localization/Module.bsl | 2 +- .../OffersClientServer/OffersClientServer.mdo | 2 +- .../CommonModules/RowIDInfoServer/Module.bsl | 64 ++++++----- .../SerialLotNumberClient/Module.bsl | 34 +++++- .../SerialLotNumbersServer/Module.bsl | 32 ++++++ IRP/src/CommonPictures/Waiting/Waiting.mdo | 2 +- .../CreateRegExp/Forms/Form/Form.form | 4 +- .../PointOfSale/Forms/CashOut/Form.form | 2 +- .../PointOfSale/Forms/Form/Form.form | 20 ++-- .../Forms/SessionClosing/Form.form | 8 +- .../ProductionWorkspace/Forms/Form/Form.form | 4 +- .../StoreKeeperWorkspace/Forms/Form/Form.form | 2 +- .../Forms/DocumentForm/Form.form | 8 +- .../Forms/FormSelectAllocationRows/Form.form | 6 +- .../Forms/FormSelectCostRows/Form.form | 4 +- .../Forms/DocumentForm/Form.form | 8 +- .../Forms/FormSelectAllocationRows/Form.form | 6 +- .../Forms/FormSelectRevenueRows/Form.form | 4 +- .../Documents/BankReceipt/ManagerModule.bsl | 7 +- .../ChequeBondTransaction.mdo | 8 +- .../Forms/DocumentForm/Form.form | 2 +- .../ChequeBondTransactionItem.mdo | 2 +- .../Forms/DocumentForm/Form.form | 2 +- .../Forms/CreateDocuments/Form.form | 4 +- .../Documents/OpeningEntry/ManagerModule.bsl | 4 + .../PriceList/Forms/DocumentForm/Form.form | 2 +- IRP/src/Documents/PriceList/PriceList.mdo | 6 +- .../Forms/ChoiceProductionForm/Form.form | 2 +- .../Production/Forms/DocumentForm/Form.form | 2 +- IRP/src/Documents/Production/Production.mdo | 4 +- .../Forms/DocumentForm/Form.form | 2 +- .../ProductionPlanning/ProductionPlanning.mdo | 4 +- .../Forms/DocumentForm/Form.form | 2 +- .../Forms/DocumentForm/Form.form | 4 +- .../ProductionPlanningCorrection.mdo | 4 +- .../PurchaseInvoice/ManagerModule.bsl | 2 + .../PurchaseReturn/ManagerModule.bsl | 40 +------ .../RetailReturnReceipt/ManagerModule.bsl | 12 +- .../RetailSalesReceipt/ManagerModule.bsl | 9 +- .../Documents/SalesInvoice/ManagerModule.bsl | 14 ++- .../Templates/SalesOrderPrint/Template.mxlx | 4 +- .../Forms/DocumentForm/Form.form | 4 +- .../ManagerModule.bsl | 5 +- .../SalesReportFromTradeAgent.mdo | 2 +- .../Forms/DocumentForm/Form.form | 4 +- .../Forms/FillSales/Form.form | 2 +- .../SalesReportToConsignor.mdo | 2 +- .../Documents/SalesReturn/ManagerModule.bsl | 19 +++- .../StockAdjustmentAsSurplus.mdo | 2 +- .../StockAdjustmentAsWriteOff.mdo | 4 +- .../WorkOrder/Forms/DocumentForm/Form.form | 8 +- IRP/src/Documents/WorkOrder/WorkOrder.mdo | 8 +- .../WorkSheet/Forms/DocumentForm/Form.form | 2 +- IRP/src/Documents/WorkSheet/WorkSheet.mdo | 6 +- .../ExternalFunctionType.mdo | 2 +- IRP/src/Enums/JobStatus/JobStatus.mdo | 4 +- .../TradeAgentFeeTypes/TradeAgentFeeTypes.mdo | 2 +- .../JobQueue/Forms/RecordForm/Form.form | 2 +- .../JobQueue/JobQueue.mdo | 4 +- .../PricesByItemKeys/PricesByItemKeys.mdo | 2 +- .../PricesByItems/PricesByItems.mdo | 2 +- .../PricesByProperties/PricesByProperties.mdo | 2 +- .../T6095S_WriteOffBatchesInfo.mdo | 4 +- .../T7010S_BillOfMaterials.mdo | 2 +- .../_0404SalesInvoiceMovements.feature | 34 +++--- .../_407PurchaseInvoiceMovements.feature | 20 ++-- .../_413SalesReturnMovements.feature | 28 ++--- .../_416PurchaseReturnMovements.feature | 16 +-- .../_424RetailSalesReceiptMovements.feature | 16 +-- .../_425RetailReturnReceiptMovements.feature | 16 +-- .../_429OpeningEntryMovements.feature | 30 ++--- .../_434BankReceiptMovements.feature | 6 + ...SalesReportFromTradeAgentMovements.feature | 16 +-- .../_0920SerialLotNumber.feature | 103 ++++++++++++++++++ 91 files changed, 509 insertions(+), 290 deletions(-) diff --git a/IRP/src/AccountingRegisters/Basic/Basic.mdo b/IRP/src/AccountingRegisters/Basic/Basic.mdo index 07cacf4336..b30ba18c2c 100644 --- a/IRP/src/AccountingRegisters/Basic/Basic.mdo +++ b/IRP/src/AccountingRegisters/Basic/Basic.mdo @@ -91,7 +91,7 @@ ru - Валюты + Валюта tr @@ -112,7 +112,7 @@ ru - Сумма оплаты + Сумма tr diff --git a/IRP/src/AccumulationRegisters/R7040T_ManualMaterialsCorretionInProduction/R7040T_ManualMaterialsCorretionInProduction.mdo b/IRP/src/AccumulationRegisters/R7040T_ManualMaterialsCorretionInProduction/R7040T_ManualMaterialsCorretionInProduction.mdo index 09265b691e..76c72b0a1c 100644 --- a/IRP/src/AccumulationRegisters/R7040T_ManualMaterialsCorretionInProduction/R7040T_ManualMaterialsCorretionInProduction.mdo +++ b/IRP/src/AccumulationRegisters/R7040T_ManualMaterialsCorretionInProduction/R7040T_ManualMaterialsCorretionInProduction.mdo @@ -58,7 +58,7 @@ tr - Üretim reçete miktarı + Reçete miktarı DefinedType.typeQuantity diff --git a/IRP/src/AccumulationRegisters/R8010B_TradeAgentInventory/R8010B_TradeAgentInventory.mdo b/IRP/src/AccumulationRegisters/R8010B_TradeAgentInventory/R8010B_TradeAgentInventory.mdo index e32fdf7032..b183aaed3a 100644 --- a/IRP/src/AccumulationRegisters/R8010B_TradeAgentInventory/R8010B_TradeAgentInventory.mdo +++ b/IRP/src/AccumulationRegisters/R8010B_TradeAgentInventory/R8010B_TradeAgentInventory.mdo @@ -133,4 +133,18 @@ Use true + + LegalName + + en + Legal name + + + CatalogRef.Companies + + + + Use + true + \ No newline at end of file diff --git a/IRP/src/AccumulationRegisters/R8012B_ConsignorInventory/R8012B_ConsignorInventory.mdo b/IRP/src/AccumulationRegisters/R8012B_ConsignorInventory/R8012B_ConsignorInventory.mdo index 51b24f1935..7c8b2c8d7a 100644 --- a/IRP/src/AccumulationRegisters/R8012B_ConsignorInventory/R8012B_ConsignorInventory.mdo +++ b/IRP/src/AccumulationRegisters/R8012B_ConsignorInventory/R8012B_ConsignorInventory.mdo @@ -155,4 +155,18 @@ Use true + + LegalName + + en + Legal name + + + CatalogRef.Companies + + + + Use + true + \ No newline at end of file diff --git a/IRP/src/AccumulationRegisters/R8014T_ConsignorSales/R8014T_ConsignorSales.mdo b/IRP/src/AccumulationRegisters/R8014T_ConsignorSales/R8014T_ConsignorSales.mdo index 749b69414d..883b981a52 100644 --- a/IRP/src/AccumulationRegisters/R8014T_ConsignorSales/R8014T_ConsignorSales.mdo +++ b/IRP/src/AccumulationRegisters/R8014T_ConsignorSales/R8014T_ConsignorSales.mdo @@ -295,7 +295,7 @@ ru - Единица измерения + Ед. изм. tr diff --git a/IRP/src/Catalogs/BillOfMaterials/BillOfMaterials.mdo b/IRP/src/Catalogs/BillOfMaterials/BillOfMaterials.mdo index 5a0cdaee6d..e7b663f61a 100644 --- a/IRP/src/Catalogs/BillOfMaterials/BillOfMaterials.mdo +++ b/IRP/src/Catalogs/BillOfMaterials/BillOfMaterials.mdo @@ -133,7 +133,7 @@ ru - Единица измерения + Ед. изм. tr @@ -347,7 +347,7 @@ ru - Единица измерения + Ед. изм. tr diff --git a/IRP/src/Catalogs/BillOfMaterials/Forms/ItemForm/Form.form b/IRP/src/Catalogs/BillOfMaterials/Forms/ItemForm/Form.form index 5cb6e50efe..b28f22c818 100644 --- a/IRP/src/Catalogs/BillOfMaterials/Forms/ItemForm/Form.form +++ b/IRP/src/Catalogs/BillOfMaterials/Forms/ItemForm/Form.form @@ -2271,7 +2271,7 @@ <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> <key>tr</key> diff --git a/IRP/src/Catalogs/Companies/Companies.mdo b/IRP/src/Catalogs/Companies/Companies.mdo index 8ef2aa0d8d..bcd80ff3e0 100644 --- a/IRP/src/Catalogs/Companies/Companies.mdo +++ b/IRP/src/Catalogs/Companies/Companies.mdo @@ -351,7 +351,7 @@ </synonym> <synonym> <key>ru</key> - <value>Код налога</value> + <value>ИНН</value> </synonym> <synonym> <key>tr</key> diff --git a/IRP/src/Catalogs/ExternalFunctions/Forms/ItemForm/Form.form b/IRP/src/Catalogs/ExternalFunctions/Forms/ItemForm/Form.form index 22c3cf59bf..dacb93a298 100644 --- a/IRP/src/Catalogs/ExternalFunctions/Forms/ItemForm/Form.form +++ b/IRP/src/Catalogs/ExternalFunctions/Forms/ItemForm/Form.form @@ -109,7 +109,7 @@ <key>ru</key> - <value>Наименование</value> + <value>Комментарий</value> <key>tr</key> diff --git a/IRP/src/Catalogs/ExternalFunctions/Forms/ListForm/Form.form b/IRP/src/Catalogs/ExternalFunctions/Forms/ListForm/Form.form index b04e10c507..935643b208 100644 --- a/IRP/src/Catalogs/ExternalFunctions/Forms/ListForm/Form.form +++ b/IRP/src/Catalogs/ExternalFunctions/Forms/ListForm/Form.form @@ -798,7 +798,7 @@ <key>tr</key> - <value>Start</value> + <value>Başlat</value> true true diff --git a/IRP/src/Catalogs/FillingTemplates/Forms/ChoiceForm/Form.form b/IRP/src/Catalogs/FillingTemplates/Forms/ChoiceForm/Form.form index a76ad6f8b2..a6ea128aec 100644 --- a/IRP/src/Catalogs/FillingTemplates/Forms/ChoiceForm/Form.form +++ b/IRP/src/Catalogs/FillingTemplates/Forms/ChoiceForm/Form.form @@ -118,7 +118,7 @@ <key>ru</key> - <value>Наименование</value> + <value>Комментарий</value> <key>tr</key> diff --git a/IRP/src/Catalogs/FillingTemplates/Forms/ListForm/Form.form b/IRP/src/Catalogs/FillingTemplates/Forms/ListForm/Form.form index 8cd3cef578..4adb7abd04 100644 --- a/IRP/src/Catalogs/FillingTemplates/Forms/ListForm/Form.form +++ b/IRP/src/Catalogs/FillingTemplates/Forms/ListForm/Form.form @@ -118,7 +118,7 @@ <key>ru</key> - <value>Наименование</value> + <value>Комментарий</value> <key>tr</key> diff --git a/IRP/src/Catalogs/SourceOfOrigins/Forms/ItemForm/Form.form b/IRP/src/Catalogs/SourceOfOrigins/Forms/ItemForm/Form.form index d915e03a6b..58e2cae000 100644 --- a/IRP/src/Catalogs/SourceOfOrigins/Forms/ItemForm/Form.form +++ b/IRP/src/Catalogs/SourceOfOrigins/Forms/ItemForm/Form.form @@ -104,7 +104,7 @@ </presentation> <presentation> <key>ru</key> - <value>Manual</value> + <value>Вручную</value> </presentation> <presentation> <key>tr</key> diff --git a/IRP/src/ChartsOfAccounts/Basic/Basic.mdo b/IRP/src/ChartsOfAccounts/Basic/Basic.mdo index 22cb78af4d..6abdc46755 100644 --- a/IRP/src/ChartsOfAccounts/Basic/Basic.mdo +++ b/IRP/src/ChartsOfAccounts/Basic/Basic.mdo @@ -193,7 +193,7 @@ </synonym> <synonym> <key>ru</key> - <value>Валюты</value> + <value>Валюта</value> </synonym> <synonym> <key>tr</key> @@ -237,7 +237,7 @@ </synonym> <synonym> <key>ru</key> - <value>Валюты</value> + <value>Валюта</value> </synonym> <synonym> <key>tr</key> @@ -259,7 +259,7 @@ </synonym> <synonym> <key>ru</key> - <value>Сумма оплаты</value> + <value>Сумма</value> </synonym> <synonym> <key>tr</key> diff --git a/IRP/src/CommonForms/EditStores/Form.form b/IRP/src/CommonForms/EditStores/Form.form index 28a8159464..2fbd395fbe 100644 --- a/IRP/src/CommonForms/EditStores/Form.form +++ b/IRP/src/CommonForms/EditStores/Form.form @@ -1391,7 +1391,7 @@ <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> <key>tr</key> diff --git a/IRP/src/CommonForms/PickupSpecialOffers/Form.form b/IRP/src/CommonForms/PickupSpecialOffers/Form.form index 8e1f3d04ef..672dfc9022 100644 --- a/IRP/src/CommonForms/PickupSpecialOffers/Form.form +++ b/IRP/src/CommonForms/PickupSpecialOffers/Form.form @@ -772,7 +772,7 @@ <key>ru</key> - <value>Сумма оплаты</value> + <value>Сумма</value> <key>tr</key> diff --git a/IRP/src/CommonForms/PrintForm/Form.form b/IRP/src/CommonForms/PrintForm/Form.form index 0bd10303fa..cc76c87c8b 100644 --- a/IRP/src/CommonForms/PrintForm/Form.form +++ b/IRP/src/CommonForms/PrintForm/Form.form @@ -2718,7 +2718,7 @@ <key>ru</key> - <value>Отправка маила</value> + <value>Отправить маил</value> <key>tr</key> diff --git a/IRP/src/CommonModules/Localization/Module.bsl b/IRP/src/CommonModules/Localization/Module.bsl index 97cc04f0af..e8c4114e92 100644 --- a/IRP/src/CommonModules/Localization/Module.bsl +++ b/IRP/src/CommonModules/Localization/Module.bsl @@ -1257,7 +1257,7 @@ Function Strings(Lang) Export |ru='Оплата (+)'; |tr='Ödeme (+)'", Lang)); Strings.Insert("InfoMessage_SessionIsClosed", NStr("en='Session is closed'; - |ru='Сессия закрыта'; + |ru='Смена закрыта'; |tr='Vardya kapandı'", Lang)); Strings.Insert("InfoMessage_Sales", NStr("en='Sales'; |ru='Продажа'; diff --git a/IRP/src/CommonModules/OffersClientServer/OffersClientServer.mdo b/IRP/src/CommonModules/OffersClientServer/OffersClientServer.mdo index f3556db46f..081a4f19e9 100644 --- a/IRP/src/CommonModules/OffersClientServer/OffersClientServer.mdo +++ b/IRP/src/CommonModules/OffersClientServer/OffersClientServer.mdo @@ -7,7 +7,7 @@ </synonym> <synonym> <key>ru</key> - <value>Специальные предложения клиент сервер</value> + <value>Скидки клиент сервер</value> </synonym> <synonym> <key>tr</key> diff --git a/IRP/src/CommonModules/RowIDInfoServer/Module.bsl b/IRP/src/CommonModules/RowIDInfoServer/Module.bsl index 619a8654be..bf7ee870a1 100644 --- a/IRP/src/CommonModules/RowIDInfoServer/Module.bsl +++ b/IRP/src/CommonModules/RowIDInfoServer/Module.bsl @@ -2275,34 +2275,44 @@ Function ExtractData_FromSO(BasisesTable, DataReceiver, AddInfo = Undefined) | Document.SalesOrder.SpecialOffers AS SpecialOffers | INNER JOIN BasisesTable AS BasisesTable | ON BasisesTable.Basis = SpecialOffers.Ref - | AND BasisesTable.BasisKey = SpecialOffers.Key - |; - | - |/////////////////////////////////////////////////////////////////////////////// - |SELECT DISTINCT - | UNDEFINED AS Ref, - | Payments.PaymentType, - | Payments.PaymentTerminal, - | Payments.Account, - | Payments.Amount, - | Payments.Percent, - | Payments.Commission, - | Payments.BankTerm, - | Payments.Key + | AND BasisesTable.BasisKey = SpecialOffers.Key"; + + QueryPaymentsAmount = New Query(); + QueryPaymentsAmount.Text = + "SELECT + | SUM(R3026B_SalesOrdersCustomerAdvance.Amount) AS Amount, + | VALUE(Catalog.PaymentTypes.EmptyRef) AS PaymentType |FROM - | Document.SalesOrder.Payments AS Payments - | INNER JOIN BasisesTable AS BasisesTable - | ON BasisesTable.Basis = Payments.Ref + | AccumulationRegister.R3026B_SalesOrdersCustomerAdvance AS R3026B_SalesOrdersCustomerAdvance + |WHERE + | R3026B_SalesOrdersCustomerAdvance.Order IN (&Orders) + | AND (R3026B_SalesOrdersCustomerAdvance.Recorder REFS Document.CashReceipt + | OR R3026B_SalesOrdersCustomerAdvance.Recorder REFS Document.BankReceipt) |GROUP BY - | Payments.Key, - | Payments.Account, - | Payments.Amount, - | Payments.BankTerm, - | Payments.Commission, - | Payments.PaymentTerminal, - | Payments.PaymentType, - | Payments.Percent"; - + | VALUE(Catalog.PaymentTypes.EmptyRef) + |HAVING + | SUM(R3026B_SalesOrdersCustomerAdvance.Amount) > 0"; + + QueryPaymentsAmount.SetParameter("Orders", BasisesTable.UnloadColumn("Basis")); + + QueryPaymentsType = New Query(); + QueryPaymentsType.Text = + "SELECT + | MAX(PaymentTypes.Ref) AS PaymentType + |FROM + | Catalog.PaymentTypes AS PaymentTypes + |WHERE + | NOT PaymentTypes.DeletionMark + | AND PaymentTypes.Type = VALUE(Enum.PaymentTypes.Advance)"; + PaymentsTypeSelection = QueryPaymentsType.Execute().Select(); + PaymentType = Catalogs.PaymentTypes.EmptyRef(); + If PaymentsTypeSelection.Next() Then + PaymentType = PaymentsTypeSelection.PaymentType; + EndIf; + + TablePayments = QueryPaymentsAmount.Execute().Unload(); + TablePayments.FillValues(PaymentType, "PaymentType"); + Query.SetParameter("BasisesTable", BasisesTable); QueryResults = Query.ExecuteBatch(); @@ -2310,7 +2320,7 @@ Function ExtractData_FromSO(BasisesTable, DataReceiver, AddInfo = Undefined) TableItemList = QueryResults[2].Unload(); TableTaxList = QueryResults[3].Unload(); TableSpecialOffers = QueryResults[4].Unload(); - TablePayments = QueryResults[5].Unload(); + //TablePayments = QueryResults[5].Unload(); Tables = New Structure(); Tables.Insert("RowIDInfo" , TableRowIDInfo); diff --git a/IRP/src/CommonModules/SerialLotNumberClient/Module.bsl b/IRP/src/CommonModules/SerialLotNumberClient/Module.bsl index 7828732225..76c05582c4 100644 --- a/IRP/src/CommonModules/SerialLotNumberClient/Module.bsl +++ b/IRP/src/CommonModules/SerialLotNumberClient/Module.bsl @@ -144,7 +144,39 @@ Procedure DeleteUnusedSerialLotNumbers(Object, KeyForDelete = Undefined) Export For Each Row In ArrayOfUnusedRows Do Object.SerialLotNumbers.Delete(Row); EndDo; - Else + + ArrayOfItemKeys = New Array(); + For Each Row In Object.ItemList Do + NewRow = New Structure("Key, ItemKey, SerialLotNumbers", Row.Key, Row.ItemKey, New Array()); + For Each RowSLN In Object.SerialLotNumbers.FindRows(New Structure("Key", Row.Key)) Do + NewRow.SerialLotNumbers.Add(New Structure("SerialLotNumber", RowSLN.SerialLotNUmber)); + EndDo; + If NewRow.SerialLotNumbers.Count() Then + ArrayOfItemKeys.Add(NewRow); + EndIf; + EndDo; + If ArrayOfItemKeys.Count() Then + ArrayOfWrongSerialLotNumbers = SerialLotNumbersServer.GetWrongSerialLotNumbers(ArrayOfItemKeys); + ArrayForDelete = New Array(); + + For Each RowSNL In Object.SerialLotNumbers Do + IsWrongSerialLotNumber = False; + For Each Row In ArrayOfWrongSerialLotNumbers Do + If Row.Key = RowSNL.Key And Row.SerialLotNumber = RowSNL.SerialLotNumber Then + IsWrongSerialLotNumber = True; + EndIf; + EndDo; + If IsWrongSerialLotNumber Then + ArrayForDelete.Add(RowSNL); + EndIf; + EndDo; + + For Each Row In ArrayForDelete Do + Object.SerialLotNumbers.Delete(Row); + EndDo; + EndIf; + + Else // Ke <> Undefined ArrayRowsForDelete = Object.SerialLotNumbers.FindRows(New Structure("Key", KeyForDelete)); For Each Row In ArrayRowsForDelete Do Object.SerialLotNumbers.Delete(Row); diff --git a/IRP/src/CommonModules/SerialLotNumbersServer/Module.bsl b/IRP/src/CommonModules/SerialLotNumbersServer/Module.bsl index 1ce5a87f23..fdb1042469 100644 --- a/IRP/src/CommonModules/SerialLotNumbersServer/Module.bsl +++ b/IRP/src/CommonModules/SerialLotNumbersServer/Module.bsl @@ -285,3 +285,35 @@ Procedure SetUnique(Object) Export EndIf; EndDo; EndProcedure + + +Function GetWrongSerialLotNumbers(ArrayOfItemKeys) Export + ArrayOfWrongSerialLotNumbers = New Array(); + + For Each Row In ArrayOfItemKeys Do + For Each RowSLN In Row.SerialLotNumbers Do + If Not ValueIsFilled(RowSLN.SerialLotNumber) Then + ArrayOfWrongSerialLotNumbers.Add(New Structure("Key, SerialLotNumber")); + Continue; + EndIf; + IsWrongSerialLotNumber = True; + Owner = RowSLN.SerialLotNumber.SerialLotNumberOwner; + If Not ValueIsFilled(Owner) Then + IsWrongSerialLotNumber = False; + ElsIf Owner = Row.ItemKey Then + IsWrongSerialLotNumber = False; + ElsIf Owner = Row.ItemKey.Item Then + IsWrongSerialLotNumber = False; + ElsIf Owner = Row.ItemKey.Item.ItemType Then + IsWrongSerialLotNumber = False; + EndIf; + If IsWrongSerialLotNumber Then + ArrayOfWrongSerialLotNumbers.Add(New Structure("Key, SerialLotNumber", Row.Key, RowSLN.SerialLotNumber)); + EndIf; + EndDo; + EndDo; + + Return ArrayOfWrongSerialLotNumbers; +EndFUnction + + diff --git a/IRP/src/CommonPictures/Waiting/Waiting.mdo b/IRP/src/CommonPictures/Waiting/Waiting.mdo index f1c329a9d2..425665db26 100644 --- a/IRP/src/CommonPictures/Waiting/Waiting.mdo +++ b/IRP/src/CommonPictures/Waiting/Waiting.mdo @@ -7,7 +7,7 @@ </synonym> <synonym> <key>ru</key> - <value>Ожидание2</value> + <value>В ожидании</value> </synonym> <synonym> <key>tr</key> diff --git a/IRP/src/DataProcessors/CreateRegExp/Forms/Form/Form.form b/IRP/src/DataProcessors/CreateRegExp/Forms/Form/Form.form index 2a1bbd1df2..4d8b48571e 100644 --- a/IRP/src/DataProcessors/CreateRegExp/Forms/Form/Form.form +++ b/IRP/src/DataProcessors/CreateRegExp/Forms/Form/Form.form @@ -315,11 +315,11 @@ <key>ru</key> - <value>Manual</value> + <value>Вручную</value> <key>tr</key> - <value>Manual</value> + <value>Manuel</value> true true diff --git a/IRP/src/DataProcessors/PointOfSale/Forms/CashOut/Form.form b/IRP/src/DataProcessors/PointOfSale/Forms/CashOut/Form.form index eec8f6ed4b..d6d2bcc803 100644 --- a/IRP/src/DataProcessors/PointOfSale/Forms/CashOut/Form.form +++ b/IRP/src/DataProcessors/PointOfSale/Forms/CashOut/Form.form @@ -1053,7 +1053,7 @@ <key>ru</key> - <value>Наименование</value> + <value>Комментарий</value> <key>tr</key> diff --git a/IRP/src/DataProcessors/PointOfSale/Forms/Form/Form.form b/IRP/src/DataProcessors/PointOfSale/Forms/Form/Form.form index 57c3a8a9fd..b83cf99c64 100644 --- a/IRP/src/DataProcessors/PointOfSale/Forms/Form/Form.form +++ b/IRP/src/DataProcessors/PointOfSale/Forms/Form/Form.form @@ -855,7 +855,7 @@ <key>ru</key> - <value>Специальные предложения</value> + <value>Скидки</value> <key>tr</key> @@ -2367,7 +2367,7 @@ <key>ru</key> - <value>Группа команд сеанса</value> + <value>Группа команд смены</value> <key>tr</key> @@ -3763,7 +3763,7 @@ <key>ru</key> - <value>Элементы формы</value> + <value>Номенклатура</value> <key>tr</key> @@ -3998,7 +3998,7 @@ <key>ru</key> - <value>Дополнительный</value> + <value>Дополнительно</value> <key>tr</key> @@ -4194,7 +4194,7 @@ <key>ru</key> - <value>Специальное предложения</value> + <value>Скидка</value> <key>tr</key> @@ -6657,7 +6657,7 @@ <key>ru</key> - <value>Валюты</value> + <value>Валюта</value> <key>tr</key> @@ -6682,7 +6682,7 @@ <key>ru</key> - <value>Сумма оплаты</value> + <value>Сумма</value> <key>tr</key> @@ -7251,7 +7251,7 @@ elemanı seç</value> <key>ru</key> - <value>Открытая сессия</value> + <value>Открыть смену</value> <key>tr</key> @@ -7280,7 +7280,7 @@ elemanı seç</value> <key>ru</key> - <value>Закрыть сессию</value> + <value>Закрыть кассовую смену</value> <key>tr</key> @@ -7309,7 +7309,7 @@ elemanı seç</value> <key>ru</key> - <value>Отменить сессию</value> + <value>Отменить смену</value> <key>tr</key> diff --git a/IRP/src/DataProcessors/PointOfSale/Forms/SessionClosing/Form.form b/IRP/src/DataProcessors/PointOfSale/Forms/SessionClosing/Form.form index 50acda6466..5c4379830d 100644 --- a/IRP/src/DataProcessors/PointOfSale/Forms/SessionClosing/Form.form +++ b/IRP/src/DataProcessors/PointOfSale/Forms/SessionClosing/Form.form @@ -16,7 +16,7 @@ Data needs to be corrected!</value> <key>ru</key> - <value>Документы текущей сессии, которые не могут быть проведены. + <value>Документы текущей кассовой смены, которые не могут быть проведены. Данные необходимо исправить!</value> @@ -4279,7 +4279,7 @@ WHERE <key>ru</key> - <value>Закрыть сессию</value> + <value>Закрыть кассовую смену</value> <key>tr</key> @@ -4362,7 +4362,7 @@ WHERE <key>ru</key> - <value>Предыдущая страница</value> + <value>Предыдущая</value> <key>tr</key> @@ -4391,7 +4391,7 @@ WHERE <key>ru</key> - <value>В текущую</value> + <value>Следующая</value> <key>tr</key> diff --git a/IRP/src/DataProcessors/ProductionWorkspace/Forms/Form/Form.form b/IRP/src/DataProcessors/ProductionWorkspace/Forms/Form/Form.form index d8476f1347..87363e8e25 100644 --- a/IRP/src/DataProcessors/ProductionWorkspace/Forms/Form/Form.form +++ b/IRP/src/DataProcessors/ProductionWorkspace/Forms/Form/Form.form @@ -272,7 +272,7 @@ </inputHint> <inputHint> <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> </inputHint> <inputHint> <key>tr</key> @@ -1384,7 +1384,7 @@ <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> <key>tr</key> diff --git a/IRP/src/DataProcessors/StoreKeeperWorkspace/Forms/Form/Form.form b/IRP/src/DataProcessors/StoreKeeperWorkspace/Forms/Form/Form.form index 4ed5d34c08..5e169747e5 100644 --- a/IRP/src/DataProcessors/StoreKeeperWorkspace/Forms/Form/Form.form +++ b/IRP/src/DataProcessors/StoreKeeperWorkspace/Forms/Form/Form.form @@ -1571,7 +1571,7 @@ <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> <key>tr</key> diff --git a/IRP/src/Documents/AdditionalCostAllocation/Forms/DocumentForm/Form.form b/IRP/src/Documents/AdditionalCostAllocation/Forms/DocumentForm/Form.form index 145076a3c0..3211a75618 100644 --- a/IRP/src/Documents/AdditionalCostAllocation/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/AdditionalCostAllocation/Forms/DocumentForm/Form.form @@ -854,7 +854,7 @@ <key>ru</key> - <value>Специальные предложения</value> + <value>Представление</value> <key>tr</key> @@ -1444,7 +1444,7 @@ <key>ru</key> - <value>Специальные предложения</value> + <value>Представление</value> <key>tr</key> @@ -4421,7 +4421,7 @@ <key>ru</key> - <value>Специальные предложения</value> + <value>Представление</value> <key>tr</key> @@ -4731,7 +4731,7 @@ <key>ru</key> - <value>Специальные предложения</value> + <value>Представление</value> <key>tr</key> diff --git a/IRP/src/Documents/AdditionalCostAllocation/Forms/FormSelectAllocationRows/Form.form b/IRP/src/Documents/AdditionalCostAllocation/Forms/FormSelectAllocationRows/Form.form index 70ce81f2d1..2743ebd63e 100644 --- a/IRP/src/Documents/AdditionalCostAllocation/Forms/FormSelectAllocationRows/Form.form +++ b/IRP/src/Documents/AdditionalCostAllocation/Forms/FormSelectAllocationRows/Form.form @@ -142,7 +142,7 @@ <key>ru</key> - <value>Специальные предложения</value> + <value>Представление</value> <key>tr</key> @@ -1328,7 +1328,7 @@ <key>ru</key> - <value>Специальные предложения</value> + <value>Представление</value> <key>tr</key> @@ -2203,7 +2203,7 @@ WHERE <key>ru</key> - <value>Специальные предложения</value> + <value>Представление</value> <key>tr</key> diff --git a/IRP/src/Documents/AdditionalCostAllocation/Forms/FormSelectCostRows/Form.form b/IRP/src/Documents/AdditionalCostAllocation/Forms/FormSelectCostRows/Form.form index 1989d276d4..ee5bba11fa 100644 --- a/IRP/src/Documents/AdditionalCostAllocation/Forms/FormSelectCostRows/Form.form +++ b/IRP/src/Documents/AdditionalCostAllocation/Forms/FormSelectCostRows/Form.form @@ -225,7 +225,7 @@ <key>ru</key> - <value>Специальные предложения</value> + <value>Представление</value> <key>tr</key> @@ -860,7 +860,7 @@ <key>ru</key> - <value>Специальные предложения</value> + <value>Представление</value> <key>tr</key> diff --git a/IRP/src/Documents/AdditionalRevenueAllocation/Forms/DocumentForm/Form.form b/IRP/src/Documents/AdditionalRevenueAllocation/Forms/DocumentForm/Form.form index 695a5203aa..29b3b529b8 100644 --- a/IRP/src/Documents/AdditionalRevenueAllocation/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/AdditionalRevenueAllocation/Forms/DocumentForm/Form.form @@ -855,7 +855,7 @@ <key>ru</key> - <value>Специальные предложения</value> + <value>Представление</value> <key>tr</key> @@ -1445,7 +1445,7 @@ <key>ru</key> - <value>Специальные предложения</value> + <value>Представление</value> <key>tr</key> @@ -4425,7 +4425,7 @@ <key>ru</key> - <value>Специальные предложения</value> + <value>Представление</value> <key>tr</key> @@ -4735,7 +4735,7 @@ <key>ru</key> - <value>Специальные предложения</value> + <value>Представление</value> <key>tr</key> diff --git a/IRP/src/Documents/AdditionalRevenueAllocation/Forms/FormSelectAllocationRows/Form.form b/IRP/src/Documents/AdditionalRevenueAllocation/Forms/FormSelectAllocationRows/Form.form index 4c37aed94d..08b735a90f 100644 --- a/IRP/src/Documents/AdditionalRevenueAllocation/Forms/FormSelectAllocationRows/Form.form +++ b/IRP/src/Documents/AdditionalRevenueAllocation/Forms/FormSelectAllocationRows/Form.form @@ -141,7 +141,7 @@ <key>ru</key> - <value>Специальные предложения</value> + <value>Представление</value> <key>tr</key> @@ -1327,7 +1327,7 @@ <key>ru</key> - <value>Специальные предложения</value> + <value>Представление</value> <key>tr</key> @@ -2230,7 +2230,7 @@ WHERE <key>ru</key> - <value>Специальные предложения</value> + <value>Представление</value> <key>tr</key> diff --git a/IRP/src/Documents/AdditionalRevenueAllocation/Forms/FormSelectRevenueRows/Form.form b/IRP/src/Documents/AdditionalRevenueAllocation/Forms/FormSelectRevenueRows/Form.form index cd816077ab..3437812957 100644 --- a/IRP/src/Documents/AdditionalRevenueAllocation/Forms/FormSelectRevenueRows/Form.form +++ b/IRP/src/Documents/AdditionalRevenueAllocation/Forms/FormSelectRevenueRows/Form.form @@ -225,7 +225,7 @@ <key>ru</key> - <value>Специальные предложения</value> + <value>Представление</value> <key>tr</key> @@ -888,7 +888,7 @@ <key>ru</key> - <value>Специальные предложения</value> + <value>Представление</value> <key>tr</key> diff --git a/IRP/src/Documents/BankReceipt/ManagerModule.bsl b/IRP/src/Documents/BankReceipt/ManagerModule.bsl index 4db82a2647..9d610476bc 100644 --- a/IRP/src/Documents/BankReceipt/ManagerModule.bsl +++ b/IRP/src/Documents/BankReceipt/ManagerModule.bsl @@ -643,8 +643,9 @@ Function R3010B_CashOnHand() |FROM | PaymentList AS PaymentList |WHERE - | PaymentList.IsTransferFromPOS - | AND NOT PaymentList.CommissionIsSeparate"; + | (PaymentList.IsTransferFromPOS + | AND NOT PaymentList.CommissionIsSeparate) + | OR (PaymentList.IsPaymentFromCustomerByPOS)"; EndFunction Function R3035T_CashPlanning() @@ -691,7 +692,7 @@ Function R5022T_Expenses() |FROM | PaymentList AS PaymentList |WHERE - | PaymentList.Commission <> 0 AND NOT PaymentList.IsPaymentFromCustomerByPOS"; + | PaymentList.Commission <> 0"; EndFunction Function R3024B_SalesOrdersToBePaid() diff --git a/IRP/src/Documents/ChequeBondTransaction/ChequeBondTransaction.mdo b/IRP/src/Documents/ChequeBondTransaction/ChequeBondTransaction.mdo index ca13d98543..e036500968 100644 --- a/IRP/src/Documents/ChequeBondTransaction/ChequeBondTransaction.mdo +++ b/IRP/src/Documents/ChequeBondTransaction/ChequeBondTransaction.mdo @@ -101,7 +101,7 @@ </synonym> <synonym> <key>ru</key> - <value>Валюты</value> + <value>Валюта</value> </synonym> <synonym> <key>tr</key> @@ -449,7 +449,7 @@ </synonym> <synonym> <key>ru</key> - <value>Валюты</value> + <value>Валюта</value> </synonym> <synonym> <key>tr</key> @@ -472,7 +472,7 @@ </synonym> <synonym> <key>ru</key> - <value>Сумма оплаты</value> + <value>Сумма</value> </synonym> <synonym> <key>tr</key> @@ -743,7 +743,7 @@ </synonym> <synonym> <key>ru</key> - <value>Сумма оплаты</value> + <value>Сумма</value> </synonym> <synonym> <key>tr</key> diff --git a/IRP/src/Documents/ChequeBondTransaction/Forms/DocumentForm/Form.form b/IRP/src/Documents/ChequeBondTransaction/Forms/DocumentForm/Form.form index 0266010ef1..7ac48313ae 100644 --- a/IRP/src/Documents/ChequeBondTransaction/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/ChequeBondTransaction/Forms/DocumentForm/Form.form @@ -2220,7 +2220,7 @@ <key>ru</key> - <value>Наименование</value> + <value>Комментарий</value> <key>tr</key> diff --git a/IRP/src/Documents/ChequeBondTransactionItem/ChequeBondTransactionItem.mdo b/IRP/src/Documents/ChequeBondTransactionItem/ChequeBondTransactionItem.mdo index 4e73c23fc1..72590d09a7 100644 --- a/IRP/src/Documents/ChequeBondTransactionItem/ChequeBondTransactionItem.mdo +++ b/IRP/src/Documents/ChequeBondTransactionItem/ChequeBondTransactionItem.mdo @@ -594,7 +594,7 @@ </synonym> <synonym> <key>ru</key> - <value>Сумма оплаты</value> + <value>Сумма</value> </synonym> <synonym> <key>tr</key> diff --git a/IRP/src/Documents/ConsolidatedRetailSales/Forms/DocumentForm/Form.form b/IRP/src/Documents/ConsolidatedRetailSales/Forms/DocumentForm/Form.form index 94c4d1e501..a539084afb 100644 --- a/IRP/src/Documents/ConsolidatedRetailSales/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/ConsolidatedRetailSales/Forms/DocumentForm/Form.form @@ -3134,7 +3134,7 @@ <key>ru</key> - <value>Наименование</value> + <value>Комментарий</value> <key>tr</key> diff --git a/IRP/src/Documents/JournalEntry/Forms/CreateDocuments/Form.form b/IRP/src/Documents/JournalEntry/Forms/CreateDocuments/Form.form index 9986cae440..f287df2d0a 100644 --- a/IRP/src/Documents/JournalEntry/Forms/CreateDocuments/Form.form +++ b/IRP/src/Documents/JournalEntry/Forms/CreateDocuments/Form.form @@ -663,7 +663,7 @@ <key>ru</key> - <value>Использование</value> + <value>Использовать</value> <key>tr</key> @@ -714,7 +714,7 @@ <key>ru</key> - <value>Специальные предложения</value> + <value>Представление</value> <key>tr</key> diff --git a/IRP/src/Documents/OpeningEntry/ManagerModule.bsl b/IRP/src/Documents/OpeningEntry/ManagerModule.bsl index f9d6cfab94..bbefdb251c 100644 --- a/IRP/src/Documents/OpeningEntry/ManagerModule.bsl +++ b/IRP/src/Documents/OpeningEntry/ManagerModule.bsl @@ -487,6 +487,7 @@ Function ShipmentToTradeAgent() | ShipmentToTradeAgent.Ref.Branch AS Branch, | ShipmentToTradeAgent.Ref.PartnerTradeAgent AS Partner, | ShipmentToTradeAgent.Ref.AgreementTradeAgent AS Agreement, + | ShipmentToTradeAgent.Ref.LegalNameTradeAgent AS LegalName, | ShipmentToTradeAgent.Store, | ShipmentToTradeAgent.Ref AS Batch, | ShipmentToTradeAgent.SerialLotNumber, @@ -517,6 +518,7 @@ Function ReceiptFromConsignor() | ReceiptFromConsignor.Ref.Branch AS Branch, | ReceiptFromConsignor.Ref.PartnerConsignor AS Partner, | ReceiptFromConsignor.Ref.AgreementConsignor AS Agreement, + | ReceiptFromConsignor.Ref.LegalNameConsignor AS LegalName, | ReceiptFromConsignor.Ref AS PurchaseInvoice, | ReceiptFromConsignor.Ref AS Batch, | ReceiptFromConsignor.Currency AS Currency, @@ -1228,6 +1230,7 @@ Function R8010B_TradeAgentInventory() | ShipmentToTradeAgent.Company, | ShipmentToTradeAgent.Partner, | ShipmentToTradeAgent.Agreement, + | ShipmentToTradeAgent.LegalName, | ShipmentToTradeAgent.ItemKey, | ShipmentToTradeAgent.Quantity |INTO R8010B_TradeAgentInventory @@ -1263,6 +1266,7 @@ Function R8012B_ConsignorInventory() | ReceiptFromConsignor.Company, | ReceiptFromConsignor.Partner, | ReceiptFromConsignor.Agreement, + | ReceiptFromConsignor.LegalName, | ReceiptFromConsignor.ItemKey, | ReceiptFromConsignor.SerialLotNumber, | ReceiptFromConsignor.Quantity diff --git a/IRP/src/Documents/PriceList/Forms/DocumentForm/Form.form b/IRP/src/Documents/PriceList/Forms/DocumentForm/Form.form index d65f7846cc..0036ba4bec 100644 --- a/IRP/src/Documents/PriceList/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/PriceList/Forms/DocumentForm/Form.form @@ -2449,7 +2449,7 @@ <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> <key>tr</key> diff --git a/IRP/src/Documents/PriceList/PriceList.mdo b/IRP/src/Documents/PriceList/PriceList.mdo index 98942222ca..b137fb2b38 100644 --- a/IRP/src/Documents/PriceList/PriceList.mdo +++ b/IRP/src/Documents/PriceList/PriceList.mdo @@ -322,7 +322,7 @@ </synonym> <synonym> <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> </synonym> <synonym> <key>tr</key> @@ -510,7 +510,7 @@ </synonym> <synonym> <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> </synonym> <synonym> <key>tr</key> @@ -751,7 +751,7 @@ </synonym> <synonym> <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> </synonym> <synonym> <key>tr</key> diff --git a/IRP/src/Documents/Production/Forms/ChoiceProductionForm/Form.form b/IRP/src/Documents/Production/Forms/ChoiceProductionForm/Form.form index c341038bde..d31ad461b0 100644 --- a/IRP/src/Documents/Production/Forms/ChoiceProductionForm/Form.form +++ b/IRP/src/Documents/Production/Forms/ChoiceProductionForm/Form.form @@ -922,7 +922,7 @@ <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> <key>tr</key> diff --git a/IRP/src/Documents/Production/Forms/DocumentForm/Form.form b/IRP/src/Documents/Production/Forms/DocumentForm/Form.form index 38ca26cf5d..c3d87806a0 100644 --- a/IRP/src/Documents/Production/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/Production/Forms/DocumentForm/Form.form @@ -3157,7 +3157,7 @@ <key>ru</key> - <value>Наименование</value> + <value>Комментарий</value> <key>tr</key> diff --git a/IRP/src/Documents/Production/Production.mdo b/IRP/src/Documents/Production/Production.mdo index 0e9447982e..2f13295343 100644 --- a/IRP/src/Documents/Production/Production.mdo +++ b/IRP/src/Documents/Production/Production.mdo @@ -221,7 +221,7 @@ </synonym> <synonym> <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> </synonym> <synonym> <key>tr</key> @@ -597,7 +597,7 @@ </synonym> <synonym> <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> </synonym> <synonym> <key>tr</key> diff --git a/IRP/src/Documents/ProductionPlanning/Forms/DocumentForm/Form.form b/IRP/src/Documents/ProductionPlanning/Forms/DocumentForm/Form.form index 2e3ab905c9..1509958d34 100644 --- a/IRP/src/Documents/ProductionPlanning/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/ProductionPlanning/Forms/DocumentForm/Form.form @@ -3342,7 +3342,7 @@ <key>ru</key> - <value>Наименование</value> + <value>Комментарий</value> <key>tr</key> diff --git a/IRP/src/Documents/ProductionPlanning/ProductionPlanning.mdo b/IRP/src/Documents/ProductionPlanning/ProductionPlanning.mdo index 6a84de0fb0..598c8b16a9 100644 --- a/IRP/src/Documents/ProductionPlanning/ProductionPlanning.mdo +++ b/IRP/src/Documents/ProductionPlanning/ProductionPlanning.mdo @@ -311,7 +311,7 @@ </synonym> <synonym> <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> </synonym> <synonym> <key>tr</key> @@ -782,7 +782,7 @@ </synonym> <synonym> <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> </synonym> <synonym> <key>tr</key> diff --git a/IRP/src/Documents/ProductionPlanningClosing/Forms/DocumentForm/Form.form b/IRP/src/Documents/ProductionPlanningClosing/Forms/DocumentForm/Form.form index 4392cda06d..bda3df51e4 100644 --- a/IRP/src/Documents/ProductionPlanningClosing/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/ProductionPlanningClosing/Forms/DocumentForm/Form.form @@ -1353,7 +1353,7 @@ <key>ru</key> - <value>Наименование</value> + <value>Комментарий</value> <key>tr</key> diff --git a/IRP/src/Documents/ProductionPlanningCorrection/Forms/DocumentForm/Form.form b/IRP/src/Documents/ProductionPlanningCorrection/Forms/DocumentForm/Form.form index 99a849a590..05af108f47 100644 --- a/IRP/src/Documents/ProductionPlanningCorrection/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/ProductionPlanningCorrection/Forms/DocumentForm/Form.form @@ -3948,7 +3948,7 @@ <key>ru</key> - <value>Наименование</value> + <value>Комментарий</value> <key>tr</key> @@ -4029,7 +4029,7 @@ <key>tr</key> - <value>Update</value> + <value>Güncelle</value> 1 diff --git a/IRP/src/Documents/ProductionPlanningCorrection/ProductionPlanningCorrection.mdo b/IRP/src/Documents/ProductionPlanningCorrection/ProductionPlanningCorrection.mdo index b0ed6b6ac8..2548394804 100644 --- a/IRP/src/Documents/ProductionPlanningCorrection/ProductionPlanningCorrection.mdo +++ b/IRP/src/Documents/ProductionPlanningCorrection/ProductionPlanningCorrection.mdo @@ -378,7 +378,7 @@ ru - Единица измерения + Ед. изм. tr @@ -849,7 +849,7 @@ ru - Единица измерения + Ед. изм. tr diff --git a/IRP/src/Documents/PurchaseInvoice/ManagerModule.bsl b/IRP/src/Documents/PurchaseInvoice/ManagerModule.bsl index a9bc218519..83716a8ee1 100644 --- a/IRP/src/Documents/PurchaseInvoice/ManagerModule.bsl +++ b/IRP/src/Documents/PurchaseInvoice/ManagerModule.bsl @@ -1328,6 +1328,7 @@ Function R8012B_ConsignorInventory() | ItemList.ItemKey, | ItemList.Partner, | ItemList.Agreement, + | ItemList.LegalName, | SUM(case | when SerialLotNumbers.SerialLotNumber.Ref IS NULL | Then ItemList.Quantity @@ -1349,6 +1350,7 @@ Function R8012B_ConsignorInventory() | ItemList.ItemKey, | ItemList.Partner, | ItemList.Agreement, + | ItemList.LegalName, | SerialLotNumbers.SerialLotNumber"; EndFunction diff --git a/IRP/src/Documents/PurchaseReturn/ManagerModule.bsl b/IRP/src/Documents/PurchaseReturn/ManagerModule.bsl index b35c9a58db..6a02b59055 100644 --- a/IRP/src/Documents/PurchaseReturn/ManagerModule.bsl +++ b/IRP/src/Documents/PurchaseReturn/ManagerModule.bsl @@ -926,15 +926,6 @@ Function T6020S_BatchKeysInfo() | ON ItemList.Key = ConsignorBatches.Key |WHERE | NOT ItemList.IsService -// |GROUP BY -// | ItemList.Key, -// | ItemList.Period, -// | VALUE(Enum.BatchDirection.Expense), -// | ItemList.Company, -// | ItemList.Store, -// | ItemList.ItemKey, -// | ItemList.BatchDocument, -// | ConsignorBatches.Batch |; |////////////////////////////////////////////////////////////////////////////////////////// |SELECT @@ -950,12 +941,6 @@ Function T6020S_BatchKeysInfo() | THEN ISNULL(SourceOfOrigins.Quantity, 0) | ELSE BatchKeysInfo_1.Quantity | END) AS Quantity, - -// | SUM(case -// | when ConsignorBatches.Quantity is null -// | then ItemList.Quantity -// | else ConsignorBatches.Quantity -// | end) AS Quantity | ISNULL(SourceOfOrigins.SourceOfOrigin, VALUE(Catalog.SourceOfOrigins.EmptyRef)) AS SourceOfOrigin, | ISNULL(SourceOfOrigins.SerialLotNumber, VALUE(Catalog.SerialLotNumbers.EmptyRef)) AS SerialLotNumber |INTO T6020S_BatchKeysInfo @@ -968,15 +953,6 @@ Function T6020S_BatchKeysInfo() | then BatchKeysInfo_1.SerialLotNumber = SourceOfOrigins.SerialLotNumberStock | else true | end - - -// |INTO T6020S_BatchKeysInfo -// |FROM -// | ItemList AS ItemList -// | LEFT JOIN ConsignorBatches AS ConsignorBatches -// | ON ItemList.Key = ConsignorBatches.Key -// |WHERE -// | NOT ItemList.IsService |GROUP BY | BatchKeysInfo_1.Period, | BatchKeysInfo_1.Direction, @@ -987,14 +963,6 @@ Function T6020S_BatchKeysInfo() | BatchKeysInfo_1.BatchConsignor, | ISNULL(SourceOfOrigins.SourceOfOrigin, VALUE(Catalog.SourceOfOrigins.EmptyRef)), | ISNULL(SourceOfOrigins.SerialLotNumber, VALUE(Catalog.SerialLotNumbers.EmptyRef))"; - -// | ItemList.Period, -// | VALUE(Enum.BatchDirection.Expense), -// | ItemList.Company, -// | ItemList.Store, -// | ItemList.ItemKey, -// | ItemList.BatchDocument, -// | ConsignorBatches.Batch"; EndFunction Function R8012B_ConsignorInventory() @@ -1007,12 +975,13 @@ Function R8012B_ConsignorInventory() | ConsignorBatches.SerialLotNumber, | ItemList.Partner, | ItemList.Agreement, + | ItemList.LegalName, | SUM(ConsignorBatches.Quantity) AS Quantity |INTO R8012B_ConsignorInventory |FROM | ItemList AS ItemList - | LEFT JOIN ConsignorBatches AS ConsignorBatches ON - | ItemList.Key = ConsignorBatches.Key + | LEFT JOIN ConsignorBatches AS ConsignorBatches + | ON ItemList.Key = ConsignorBatches.Key |WHERE | NOT ItemList.IsService | AND ItemList.IsReturnToConsignor @@ -1023,7 +992,8 @@ Function R8012B_ConsignorInventory() | ItemList.ItemKey, | ConsignorBatches.SerialLotNumber, | ItemList.Partner, - | ItemList.Agreement"; + | ItemList.Agreement, + | ItemList.LegalName"; EndFunction Function R8013B_ConsignorBatchWiseBalance() diff --git a/IRP/src/Documents/RetailReturnReceipt/ManagerModule.bsl b/IRP/src/Documents/RetailReturnReceipt/ManagerModule.bsl index 7346ce0b24..f381dc69cd 100644 --- a/IRP/src/Documents/RetailReturnReceipt/ManagerModule.bsl +++ b/IRP/src/Documents/RetailReturnReceipt/ManagerModule.bsl @@ -1276,6 +1276,11 @@ Function R8012B_ConsignorInventory() | ConsignorBatches.SerialLotNumber, | ConsignorBatches.Batch.Partner AS Partner, | ConsignorBatches.Batch.Agreement AS Agreement, + | CASE + | WHEN ConsignorBatches.Batch REFS Document.OpeningEntry + | THEN ConsignorBatches.Batch.LegalNameConsignor + | ELSE ConsignorBatches.Batch.LegalName + | END AS LegalName, | SUM(ConsignorBatches.Quantity) AS Quantity |INTO R8012B_ConsignorInventory |FROM @@ -1288,7 +1293,12 @@ Function R8012B_ConsignorInventory() | ConsignorBatches.ItemKey, | ConsignorBatches.SerialLotNumber, | ConsignorBatches.Batch.Partner, - | ConsignorBatches.Batch.Agreement"; + | ConsignorBatches.Batch.Agreement, + | CASE + | WHEN ConsignorBatches.Batch REFS Document.OpeningEntry + | THEN ConsignorBatches.Batch.LegalNameConsignor + | ELSE ConsignorBatches.Batch.LegalName + | END"; EndFunction Function R8014T_ConsignorSales() diff --git a/IRP/src/Documents/RetailSalesReceipt/ManagerModule.bsl b/IRP/src/Documents/RetailSalesReceipt/ManagerModule.bsl index c698157a35..48364db293 100644 --- a/IRP/src/Documents/RetailSalesReceipt/ManagerModule.bsl +++ b/IRP/src/Documents/RetailSalesReceipt/ManagerModule.bsl @@ -1200,12 +1200,17 @@ Function R8012B_ConsignorInventory() | ConsignorBatches.SerialLotNumber, | ConsignorBatches.Batch.Partner AS Partner, | ConsignorBatches.Batch.Agreement AS Agreement, + | CASE + | WHEN ConsignorBatches.Batch REFS Document.OpeningEntry + | THEN ConsignorBatches.Batch.LegalNameConsignor + | ELSE ConsignorBatches.Batch.LegalName + | END AS LegalName, | ConsignorBatches.Quantity |INTO R8012B_ConsignorInventory |FROM | ItemList AS ItemList - | LEFT JOIN ConsignorBatches AS ConsignorBatches ON - | ItemList.Key = ConsignorBatches.Key + | LEFT JOIN ConsignorBatches AS ConsignorBatches + | ON ItemList.Key = ConsignorBatches.Key |WHERE | ItemList.IsConsignorStocks"; EndFunction diff --git a/IRP/src/Documents/SalesInvoice/ManagerModule.bsl b/IRP/src/Documents/SalesInvoice/ManagerModule.bsl index 199872e9cc..72ed07e716 100644 --- a/IRP/src/Documents/SalesInvoice/ManagerModule.bsl +++ b/IRP/src/Documents/SalesInvoice/ManagerModule.bsl @@ -1424,6 +1424,7 @@ Function R8010B_TradeAgentInventory() | ItemList.ItemKey, | ItemList.Partner, | ItemList.Agreement, + | ItemList.LegalName, | SUM(ItemList.Quantity) AS Quantity |INTO R8010B_TradeAgentInventory |FROM @@ -1431,14 +1432,14 @@ Function R8010B_TradeAgentInventory() |WHERE | NOT ItemList.IsService | AND ItemList.IsShipmentToTradeAgent - | |GROUP BY | VALUE(AccumulationRecordType.Receipt), | ItemList.Period, | ItemList.Company, | ItemList.ItemKey, | ItemList.Partner, - | ItemList.Agreement"; + | ItemList.Agreement, + | ItemList.LegalName"; EndFunction Function R8011B_TradeAgentSerialLotNumber() @@ -1469,12 +1470,17 @@ Function R8012B_ConsignorInventory() | ConsignorBatches.SerialLotNumber, | ConsignorBatches.Batch.Partner AS Partner, | ConsignorBatches.Batch.Agreement AS Agreement, + | CASE + | WHEN ConsignorBatches.Batch REFS Document.OpeningEntry + | THEN ConsignorBatches.Batch.LegalNameConsignor + | ELSE ConsignorBatches.Batch.LegalName + | END AS LegalName, | ConsignorBatches.Quantity |INTO R8012B_ConsignorInventory |FROM | ItemList AS ItemList - | LEFT JOIN ConsignorBatches AS ConsignorBatches ON - | ItemList.Key = ConsignorBatches.Key + | LEFT JOIN ConsignorBatches AS ConsignorBatches + | ON ItemList.Key = ConsignorBatches.Key |WHERE | ItemList.IsSales | AND ItemList.IsConsignorStocks"; diff --git a/IRP/src/Documents/SalesOrder/Templates/SalesOrderPrint/Template.mxlx b/IRP/src/Documents/SalesOrder/Templates/SalesOrderPrint/Template.mxlx index 677ebc610b..f50e8e49a2 100644 --- a/IRP/src/Documents/SalesOrder/Templates/SalesOrderPrint/Template.mxlx +++ b/IRP/src/Documents/SalesOrder/Templates/SalesOrderPrint/Template.mxlx @@ -345,7 +345,7 @@ ru - Единица измерения + Ед. изм. tr @@ -429,7 +429,7 @@ ru - Общая сумма + Итого tr diff --git a/IRP/src/Documents/SalesReportFromTradeAgent/Forms/DocumentForm/Form.form b/IRP/src/Documents/SalesReportFromTradeAgent/Forms/DocumentForm/Form.form index a32ab8bac1..d0853e4bc8 100644 --- a/IRP/src/Documents/SalesReportFromTradeAgent/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/SalesReportFromTradeAgent/Forms/DocumentForm/Form.form @@ -4490,7 +4490,7 @@ <key>ru</key> - <value>Налоги и специальные предложения рассчитаны</value> + <value>Налоги и скидки рассчитаны</value> <key>tr</key> @@ -4515,7 +4515,7 @@ <key>ru</key> - <value>Наименование</value> + <value>Комментарий</value> <key>tr</key> diff --git a/IRP/src/Documents/SalesReportFromTradeAgent/ManagerModule.bsl b/IRP/src/Documents/SalesReportFromTradeAgent/ManagerModule.bsl index a74e5aea16..fdcb2e1362 100644 --- a/IRP/src/Documents/SalesReportFromTradeAgent/ManagerModule.bsl +++ b/IRP/src/Documents/SalesReportFromTradeAgent/ManagerModule.bsl @@ -555,20 +555,21 @@ Function R8010B_TradeAgentInventory() | ItemList.ItemKey, | ItemList.Partner, | ItemList.Agreement, + | ItemList.LegalName, | SUM(ItemList.Quantity) AS Quantity |INTO R8010B_TradeAgentInventory |FROM | ItemList AS ItemList |WHERE | NOT ItemList.IsService - | |GROUP BY | VALUE(AccumulationRecordType.Expense), | ItemList.Period, | ItemList.Company, | ItemList.ItemKey, | ItemList.Partner, - | ItemList.Agreement"; + | ItemList.Agreement, + | ItemList.LegalName"; EndFunction Function R8011B_TradeAgentSerialLotNumber() diff --git a/IRP/src/Documents/SalesReportFromTradeAgent/SalesReportFromTradeAgent.mdo b/IRP/src/Documents/SalesReportFromTradeAgent/SalesReportFromTradeAgent.mdo index 695b0d06cd..851f991916 100644 --- a/IRP/src/Documents/SalesReportFromTradeAgent/SalesReportFromTradeAgent.mdo +++ b/IRP/src/Documents/SalesReportFromTradeAgent/SalesReportFromTradeAgent.mdo @@ -470,7 +470,7 @@ </synonym> <synonym> <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> </synonym> <synonym> <key>tr</key> diff --git a/IRP/src/Documents/SalesReportToConsignor/Forms/DocumentForm/Form.form b/IRP/src/Documents/SalesReportToConsignor/Forms/DocumentForm/Form.form index e87a561362..c83f34549f 100644 --- a/IRP/src/Documents/SalesReportToConsignor/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/SalesReportToConsignor/Forms/DocumentForm/Form.form @@ -4722,7 +4722,7 @@ <key>ru</key> - <value>Налоги и специальные предложения рассчитаны</value> + <value>Налоги и скидки рассчитаны</value> <key>tr</key> @@ -4747,7 +4747,7 @@ <key>ru</key> - <value>Наименование</value> + <value>Комментарий</value> <key>tr</key> diff --git a/IRP/src/Documents/SalesReportToConsignor/Forms/FillSales/Form.form b/IRP/src/Documents/SalesReportToConsignor/Forms/FillSales/Form.form index fbd556bc89..6f8bf68872 100644 --- a/IRP/src/Documents/SalesReportToConsignor/Forms/FillSales/Form.form +++ b/IRP/src/Documents/SalesReportToConsignor/Forms/FillSales/Form.form @@ -1645,7 +1645,7 @@ <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> <key>tr</key> diff --git a/IRP/src/Documents/SalesReportToConsignor/SalesReportToConsignor.mdo b/IRP/src/Documents/SalesReportToConsignor/SalesReportToConsignor.mdo index 302cfb479e..91d90a64a5 100644 --- a/IRP/src/Documents/SalesReportToConsignor/SalesReportToConsignor.mdo +++ b/IRP/src/Documents/SalesReportToConsignor/SalesReportToConsignor.mdo @@ -514,7 +514,7 @@ </synonym> <synonym> <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> </synonym> <synonym> <key>tr</key> diff --git a/IRP/src/Documents/SalesReturn/ManagerModule.bsl b/IRP/src/Documents/SalesReturn/ManagerModule.bsl index cf8219ceb5..c841194af3 100644 --- a/IRP/src/Documents/SalesReturn/ManagerModule.bsl +++ b/IRP/src/Documents/SalesReturn/ManagerModule.bsl @@ -680,7 +680,6 @@ Function ItemList() | NOT GoodsReceipts.Key IS NULL AS GoodsReceiptExists, | GoodsReceipts.GoodsReceipt, | ItemList.NetAmount, -// | ItemList.ItemKey.Item.ItemType.Type = VALUE(Enum.ItemTypes.Service) AS IsService, | ItemList.IsService AS IsService, | ItemList.ReturnReason, | ItemList.ProfitLossCenter AS ProfitLossCenter, @@ -1411,8 +1410,6 @@ Function T6020S_BatchKeysInfo() | THEN ISNULL(SourceOfOrigins.Quantity, 0) | ELSE ItemList.Quantity | END) AS Quantity, - -// | SUM(ItemList.Quantity), | 0, | 0, | UNDEFINED, @@ -1445,6 +1442,7 @@ Function R8010B_TradeAgentInventory() | ItemList.ItemKey, | ItemList.Partner, | ItemList.Agreement, + | ItemList.LegalName, | SUM(ItemList.Quantity) AS Quantity |INTO R8010B_TradeAgentInventory |FROM @@ -1458,7 +1456,8 @@ Function R8010B_TradeAgentInventory() | ItemList.Company, | ItemList.ItemKey, | ItemList.Partner, - | ItemList.Agreement"; + | ItemList.Agreement, + | ItemList.LegalName"; EndFunction Function R8011B_TradeAgentSerialLotNumber() @@ -1516,6 +1515,11 @@ Function R8012B_ConsignorInventory() | ConsignorBatches.SerialLotNumber, | ConsignorBatches.Batch.Partner AS Partner, | ConsignorBatches.Batch.Agreement AS Agreement, + | CASE + | WHEN ConsignorBatches.Batch REFS Document.OpeningEntry + | THEN ConsignorBatches.Batch.LegalNameConsignor + | ELSE ConsignorBatches.Batch.LegalName + | END AS LegalName, | SUM(ConsignorBatches.Quantity) AS Quantity |INTO R8012B_ConsignorInventory |FROM @@ -1528,7 +1532,12 @@ Function R8012B_ConsignorInventory() | ConsignorBatches.ItemKey, | ConsignorBatches.SerialLotNumber, | ConsignorBatches.Batch.Partner, - | ConsignorBatches.Batch.Agreement"; + | ConsignorBatches.Batch.Agreement, + | CASE + | WHEN ConsignorBatches.Batch REFS Document.OpeningEntry + | THEN ConsignorBatches.Batch.LegalNameConsignor + | ELSE ConsignorBatches.Batch.LegalName + | END"; EndFunction Function R8014T_ConsignorSales() diff --git a/IRP/src/Documents/StockAdjustmentAsSurplus/StockAdjustmentAsSurplus.mdo b/IRP/src/Documents/StockAdjustmentAsSurplus/StockAdjustmentAsSurplus.mdo index 5b84fe9cb3..481ce8f6fb 100644 --- a/IRP/src/Documents/StockAdjustmentAsSurplus/StockAdjustmentAsSurplus.mdo +++ b/IRP/src/Documents/StockAdjustmentAsSurplus/StockAdjustmentAsSurplus.mdo @@ -155,7 +155,7 @@ </synonym> <synonym> <key>ru</key> - <value>Валюты</value> + <value>Валюта</value> </synonym> <synonym> <key>tr</key> diff --git a/IRP/src/Documents/StockAdjustmentAsWriteOff/StockAdjustmentAsWriteOff.mdo b/IRP/src/Documents/StockAdjustmentAsWriteOff/StockAdjustmentAsWriteOff.mdo index 235bae23fc..f0bede82cd 100644 --- a/IRP/src/Documents/StockAdjustmentAsWriteOff/StockAdjustmentAsWriteOff.mdo +++ b/IRP/src/Documents/StockAdjustmentAsWriteOff/StockAdjustmentAsWriteOff.mdo @@ -155,7 +155,7 @@ </synonym> <synonym> <key>ru</key> - <value>Валюты</value> + <value>Валюта</value> </synonym> <synonym> <key>tr</key> @@ -744,7 +744,7 @@ </synonym> <synonym> <key>ru</key> - <value>Сумма оплаты</value> + <value>Сумма</value> </synonym> <synonym> <key>tr</key> diff --git a/IRP/src/Documents/WorkOrder/Forms/DocumentForm/Form.form b/IRP/src/Documents/WorkOrder/Forms/DocumentForm/Form.form index 843fc7bcce..68d0452f7c 100644 --- a/IRP/src/Documents/WorkOrder/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/WorkOrder/Forms/DocumentForm/Form.form @@ -5174,7 +5174,7 @@ <key>ru</key> - <value>Специальные предложения</value> + <value>Скидки</value> <key>tr</key> @@ -5957,7 +5957,7 @@ <key>ru</key> - <value>Наименование</value> + <value>Комментарий</value> <key>tr</key> @@ -6033,7 +6033,7 @@ <key>ru</key> - <value>Специальные предложения</value> + <value>Скидки</value> <key>tr</key> @@ -6220,7 +6220,7 @@ <key>ru</key> - <value>Специальные предложения</value> + <value>% Скидки</value> <key>tr</key> diff --git a/IRP/src/Documents/WorkOrder/WorkOrder.mdo b/IRP/src/Documents/WorkOrder/WorkOrder.mdo index a34623a4b8..ad7c7a9a9a 100644 --- a/IRP/src/Documents/WorkOrder/WorkOrder.mdo +++ b/IRP/src/Documents/WorkOrder/WorkOrder.mdo @@ -456,7 +456,7 @@ </synonym> <synonym> <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> </synonym> <synonym> <key>tr</key> @@ -880,7 +880,7 @@ </synonym> <synonym> <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> </synonym> <synonym> <key>tr</key> @@ -1092,7 +1092,7 @@ </synonym> <synonym> <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> </synonym> <synonym> <key>tr</key> @@ -1618,7 +1618,7 @@ </synonym> <synonym> <key>ru</key> - <value>Специальные предложения</value> + <value>Скидки</value> </synonym> <synonym> <key>tr</key> diff --git a/IRP/src/Documents/WorkSheet/Forms/DocumentForm/Form.form b/IRP/src/Documents/WorkSheet/Forms/DocumentForm/Form.form index 450fdb1104..86809cb044 100644 --- a/IRP/src/Documents/WorkSheet/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/WorkSheet/Forms/DocumentForm/Form.form @@ -5072,7 +5072,7 @@ <key>ru</key> - <value>Наименование</value> + <value>Комментарий</value> <key>tr</key> diff --git a/IRP/src/Documents/WorkSheet/WorkSheet.mdo b/IRP/src/Documents/WorkSheet/WorkSheet.mdo index 7ae9f9a19e..854c0feb2d 100644 --- a/IRP/src/Documents/WorkSheet/WorkSheet.mdo +++ b/IRP/src/Documents/WorkSheet/WorkSheet.mdo @@ -369,7 +369,7 @@ </synonym> <synonym> <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> </synonym> <synonym> <key>tr</key> @@ -692,7 +692,7 @@ </synonym> <synonym> <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> </synonym> <synonym> <key>tr</key> @@ -1056,7 +1056,7 @@ </synonym> <synonym> <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> </synonym> <synonym> <key>tr</key> diff --git a/IRP/src/Enums/ExternalFunctionType/ExternalFunctionType.mdo b/IRP/src/Enums/ExternalFunctionType/ExternalFunctionType.mdo index 6184a651a2..4e3791da81 100644 --- a/IRP/src/Enums/ExternalFunctionType/ExternalFunctionType.mdo +++ b/IRP/src/Enums/ExternalFunctionType/ExternalFunctionType.mdo @@ -62,7 +62,7 @@ </synonym> <synonym> <key>tr</key> - <value>Execute</value> + <value>Çalıştır</value> </synonym> </enumValues> <enumValues uuid="b3d16ef0-4733-4912-ab40-d7a4e85f54ed"> diff --git a/IRP/src/Enums/JobStatus/JobStatus.mdo b/IRP/src/Enums/JobStatus/JobStatus.mdo index 57828a1af3..eaf27ac4de 100644 --- a/IRP/src/Enums/JobStatus/JobStatus.mdo +++ b/IRP/src/Enums/JobStatus/JobStatus.mdo @@ -88,11 +88,11 @@ </synonym> <synonym> <key>ru</key> - <value>Canceled</value> + <value>Отменен</value> </synonym> <synonym> <key>tr</key> - <value>Canceled</value> + <value>İptal edildi</value> </synonym> </enumValues> <enumValues uuid="d8150dd1-afc8-4975-9545-e4bc74bc52b9"> diff --git a/IRP/src/Enums/TradeAgentFeeTypes/TradeAgentFeeTypes.mdo b/IRP/src/Enums/TradeAgentFeeTypes/TradeAgentFeeTypes.mdo index 22c0f39239..9b8bc8b1d8 100644 --- a/IRP/src/Enums/TradeAgentFeeTypes/TradeAgentFeeTypes.mdo +++ b/IRP/src/Enums/TradeAgentFeeTypes/TradeAgentFeeTypes.mdo @@ -32,7 +32,7 @@ </synonym> <synonym> <key>tr</key> - <value>Yüzde124</value> + <value>Yüzde</value> </synonym> </enumValues> <enumValues uuid="f950dee3-7ed0-4f66-bc8c-3617a578bda5"> diff --git a/IRP/src/InformationRegisters/JobQueue/Forms/RecordForm/Form.form b/IRP/src/InformationRegisters/JobQueue/Forms/RecordForm/Form.form index 27aa824077..fb65833bbe 100644 --- a/IRP/src/InformationRegisters/JobQueue/Forms/RecordForm/Form.form +++ b/IRP/src/InformationRegisters/JobQueue/Forms/RecordForm/Form.form @@ -659,7 +659,7 @@ <key>ru</key> - <value>Наименование</value> + <value>Комментарий</value> <key>tr</key> diff --git a/IRP/src/InformationRegisters/JobQueue/JobQueue.mdo b/IRP/src/InformationRegisters/JobQueue/JobQueue.mdo index 22b54e23e7..e6236b7cff 100644 --- a/IRP/src/InformationRegisters/JobQueue/JobQueue.mdo +++ b/IRP/src/InformationRegisters/JobQueue/JobQueue.mdo @@ -65,7 +65,7 @@ </synonym> <synonym> <key>tr</key> - <value>Start</value> + <value>Başlat</value> </synonym> <type> <types>Date</types> @@ -108,7 +108,7 @@ </synonym> <synonym> <key>ru</key> - <value>Наименование</value> + <value>Комментарий</value> </synonym> <synonym> <key>tr</key> diff --git a/IRP/src/InformationRegisters/PricesByItemKeys/PricesByItemKeys.mdo b/IRP/src/InformationRegisters/PricesByItemKeys/PricesByItemKeys.mdo index c909ec53d4..bd1258b8ee 100644 --- a/IRP/src/InformationRegisters/PricesByItemKeys/PricesByItemKeys.mdo +++ b/IRP/src/InformationRegisters/PricesByItemKeys/PricesByItemKeys.mdo @@ -167,7 +167,7 @@ </synonym> <synonym> <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> </synonym> <synonym> <key>tr</key> diff --git a/IRP/src/InformationRegisters/PricesByItems/PricesByItems.mdo b/IRP/src/InformationRegisters/PricesByItems/PricesByItems.mdo index c2ca952b42..ac6be5db4c 100644 --- a/IRP/src/InformationRegisters/PricesByItems/PricesByItems.mdo +++ b/IRP/src/InformationRegisters/PricesByItems/PricesByItems.mdo @@ -164,7 +164,7 @@ </synonym> <synonym> <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> </synonym> <synonym> <key>tr</key> diff --git a/IRP/src/InformationRegisters/PricesByProperties/PricesByProperties.mdo b/IRP/src/InformationRegisters/PricesByProperties/PricesByProperties.mdo index fcef6a67f0..0bc69e7f86 100644 --- a/IRP/src/InformationRegisters/PricesByProperties/PricesByProperties.mdo +++ b/IRP/src/InformationRegisters/PricesByProperties/PricesByProperties.mdo @@ -163,7 +163,7 @@ </synonym> <synonym> <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> </synonym> <synonym> <key>tr</key> diff --git a/IRP/src/InformationRegisters/T6095S_WriteOffBatchesInfo/T6095S_WriteOffBatchesInfo.mdo b/IRP/src/InformationRegisters/T6095S_WriteOffBatchesInfo/T6095S_WriteOffBatchesInfo.mdo index 640456a2a6..0d00a3cb3d 100644 --- a/IRP/src/InformationRegisters/T6095S_WriteOffBatchesInfo/T6095S_WriteOffBatchesInfo.mdo +++ b/IRP/src/InformationRegisters/T6095S_WriteOffBatchesInfo/T6095S_WriteOffBatchesInfo.mdo @@ -35,7 +35,7 @@ </synonym> <synonym> <key>ru</key> - <value>Сумма оплаты</value> + <value>Сумма</value> </synonym> <synonym> <key>tr</key> @@ -238,7 +238,7 @@ </synonym> <synonym> <key>ru</key> - <value>Валюты</value> + <value>Валюта</value> </synonym> <synonym> <key>tr</key> diff --git a/IRP/src/InformationRegisters/T7010S_BillOfMaterials/T7010S_BillOfMaterials.mdo b/IRP/src/InformationRegisters/T7010S_BillOfMaterials/T7010S_BillOfMaterials.mdo index 2d12a43857..5a12db2306 100644 --- a/IRP/src/InformationRegisters/T7010S_BillOfMaterials/T7010S_BillOfMaterials.mdo +++ b/IRP/src/InformationRegisters/T7010S_BillOfMaterials/T7010S_BillOfMaterials.mdo @@ -59,7 +59,7 @@ </synonym> <synonym> <key>ru</key> - <value>Единица измерения</value> + <value>Ед. изм.</value> </synonym> <synonym> <key>tr</key> diff --git a/features/Internal/_0400 Movements/_0404SalesInvoiceMovements.feature b/features/Internal/_0400 Movements/_0404SalesInvoiceMovements.feature index 86342b78ab..399fcb0b08 100644 --- a/features/Internal/_0400 Movements/_0404SalesInvoiceMovements.feature +++ b/features/Internal/_0400 Movements/_0404SalesInvoiceMovements.feature @@ -1050,15 +1050,15 @@ Scenario: _0401334 check Sales invoice movements by the Register "R8010 Trade a And I select "R8010 Trade agent inventory" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Sales invoice 192 dated 02.11.2022 10:53:19' | '' | '' | '' | '' | '' | '' | '' | - | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "R8010 Trade agent inventory"' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | - | '' | '' | '' | 'Quantity' | 'Company' | 'Item key' | 'Partner' | 'Agreement' | - | '' | 'Receipt' | '02.11.2022 10:53:19' | '1' | 'Main Company' | '37/18SD' | 'Trade agent 1' | 'Trade agent partner term 1' | - | '' | 'Receipt' | '02.11.2022 10:53:19' | '2' | 'Main Company' | 'UNIQ' | 'Trade agent 1' | 'Trade agent partner term 1' | - | '' | 'Receipt' | '02.11.2022 10:53:19' | '4' | 'Main Company' | 'XS/Blue' | 'Trade agent 1' | 'Trade agent partner term 1' | - | '' | 'Receipt' | '02.11.2022 10:53:19' | '4' | 'Main Company' | 'PZU' | 'Trade agent 1' | 'Trade agent partner term 1' | + | 'Sales invoice 192 dated 02.11.2022 10:53:19' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R8010 Trade agent inventory"' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | + | '' | '' | '' | 'Quantity' | 'Company' | 'Item key' | 'Partner' | 'Agreement' | 'Legal name' | + | '' | 'Receipt' | '02.11.2022 10:53:19' | '1' | 'Main Company' | '37/18SD' | 'Trade agent 1' | 'Trade agent partner term 1' | 'Trade agent 1' | + | '' | 'Receipt' | '02.11.2022 10:53:19' | '2' | 'Main Company' | 'UNIQ' | 'Trade agent 1' | 'Trade agent partner term 1' | 'Trade agent 1' | + | '' | 'Receipt' | '02.11.2022 10:53:19' | '4' | 'Main Company' | 'XS/Blue' | 'Trade agent 1' | 'Trade agent partner term 1' | 'Trade agent 1' | + | '' | 'Receipt' | '02.11.2022 10:53:19' | '4' | 'Main Company' | 'PZU' | 'Trade agent 1' | 'Trade agent partner term 1' | 'Trade agent 1' | And I close all client application windows Scenario: _0401335 check Sales invoice movements by the Register "R8011 Trade agent serial lot number" (Shipment to trade agent) @@ -1345,14 +1345,14 @@ Scenario: _0401349 check Sales invoice movements by the Register "R8012 Consign And I select "R8012 Consignor inventory" 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 "R8012 Consignor inventory"' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | - | '' | '' | '' | 'Quantity' | 'Company' | 'Item key' | 'Serial lot number' | 'Partner' | 'Agreement' | - | '' | 'Expense' | '04.11.2022 16:33:38' | '2' | 'Main Company' | 'S/Yellow' | '' | 'Consignor 1' | 'Consignor partner term 1' | - | '' | 'Expense' | '04.11.2022 16:33:38' | '2' | 'Main Company' | 'UNIQ' | '09987897977889' | 'Consignor 1' | 'Consignor partner term 1' | - | '' | 'Expense' | '04.11.2022 16:33:38' | '4' | 'Main Company' | 'UNIQ' | '09987897977889' | 'Consignor 2' | 'Consignor 2 partner term' | + | 'Sales invoice 194 dated 04.11.2022 16:33:38' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R8012 Consignor inventory"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | '' | + | '' | '' | '' | 'Quantity' | 'Company' | 'Item key' | 'Serial lot number' | 'Partner' | 'Agreement' | 'Legal name' | + | '' | 'Expense' | '04.11.2022 16:33:38' | '2' | 'Main Company' | 'S/Yellow' | '' | 'Consignor 1' | 'Consignor partner term 1' | 'Consignor 1' | + | '' | 'Expense' | '04.11.2022 16:33:38' | '2' | 'Main Company' | 'UNIQ' | '09987897977889' | 'Consignor 1' | 'Consignor partner term 1' | 'Consignor 1' | + | '' | 'Expense' | '04.11.2022 16:33:38' | '4' | 'Main Company' | 'UNIQ' | '09987897977889' | 'Consignor 2' | 'Consignor 2 partner term' | 'Consignor 2' | And I close all client application windows Scenario: _0401349 check Sales invoice movements by the Register "R8013 Consignor batch wise balance" (consignor and own stocks) diff --git a/features/Internal/_0400 Movements/_407PurchaseInvoiceMovements.feature b/features/Internal/_0400 Movements/_407PurchaseInvoiceMovements.feature index c3b53f2074..11972e4470 100644 --- a/features/Internal/_0400 Movements/_407PurchaseInvoiceMovements.feature +++ b/features/Internal/_0400 Movements/_407PurchaseInvoiceMovements.feature @@ -885,16 +885,16 @@ Scenario: _0401028 check Purchase invoice movements by the Register "R8012 Cons And I select "R8012 Consignor inventory" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Purchase invoice 195 dated 02.11.2022 16:31:38' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "R8012 Consignor inventory"' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | - | '' | '' | '' | 'Quantity' | 'Company' | 'Item key' | 'Serial lot number' | 'Partner' | 'Agreement' | - | '' | 'Receipt' | '02.11.2022 16:31:38' | '2' | 'Main Company' | 'UNIQ' | '09987897977889' | 'Consignor 1' | 'Consignor partner term 1' | - | '' | 'Receipt' | '02.11.2022 16:31:38' | '2' | 'Main Company' | 'UNIQ' | '09987897977890' | 'Consignor 1' | 'Consignor partner term 1' | - | '' | 'Receipt' | '02.11.2022 16:31:38' | '2' | 'Main Company' | 'ODS' | '899007790088' | 'Consignor 1' | 'Consignor partner term 1' | - | '' | 'Receipt' | '02.11.2022 16:31:38' | '10' | 'Main Company' | '38/18SD' | '' | 'Consignor 1' | 'Consignor partner term 1' | - | '' | 'Receipt' | '02.11.2022 16:31:38' | '14' | 'Main Company' | 'S/Yellow' | '' | 'Consignor 1' | 'Consignor partner term 1' | + | 'Purchase invoice 195 dated 02.11.2022 16:31:38' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R8012 Consignor inventory"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | '' | + | '' | '' | '' | 'Quantity' | 'Company' | 'Item key' | 'Serial lot number' | 'Partner' | 'Agreement' | 'Legal name' | + | '' | 'Receipt' | '02.11.2022 16:31:38' | '2' | 'Main Company' | 'UNIQ' | '09987897977889' | 'Consignor 1' | 'Consignor partner term 1' | 'Consignor 1' | + | '' | 'Receipt' | '02.11.2022 16:31:38' | '2' | 'Main Company' | 'UNIQ' | '09987897977890' | 'Consignor 1' | 'Consignor partner term 1' | 'Consignor 1' | + | '' | 'Receipt' | '02.11.2022 16:31:38' | '2' | 'Main Company' | 'ODS' | '899007790088' | 'Consignor 1' | 'Consignor partner term 1' | 'Consignor 1' | + | '' | 'Receipt' | '02.11.2022 16:31:38' | '10' | 'Main Company' | '38/18SD' | '' | 'Consignor 1' | 'Consignor partner term 1' | 'Consignor 1' | + | '' | 'Receipt' | '02.11.2022 16:31:38' | '14' | 'Main Company' | 'S/Yellow' | '' | 'Consignor 1' | 'Consignor partner term 1' | 'Consignor 1' | And I close all client application windows Scenario: _0401029 check Purchase invoice movements by the Register "R8013 Consignor batch wise balance" (Receipt from consignor) diff --git a/features/Internal/_0400 Movements/_413SalesReturnMovements.feature b/features/Internal/_0400 Movements/_413SalesReturnMovements.feature index d20b29a8d9..07bc0d9dd3 100644 --- a/features/Internal/_0400 Movements/_413SalesReturnMovements.feature +++ b/features/Internal/_0400 Movements/_413SalesReturnMovements.feature @@ -869,13 +869,13 @@ Scenario: _041332 check Sales return movements by the Register "R8010 Trade age And I select "R8010 Trade agent inventory" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Sales return 192 dated 02.11.2022 10:53:27' | '' | '' | '' | '' | '' | '' | '' | - | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "R8010 Trade agent inventory"' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | - | '' | '' | '' | 'Quantity' | 'Company' | 'Item key' | 'Partner' | 'Agreement' | - | '' | 'Expense' | '02.11.2022 10:53:27' | '1' | 'Main Company' | 'XS/Blue' | 'Trade agent 1' | 'Trade agent partner term 1' | - | '' | 'Expense' | '02.11.2022 10:53:27' | '4' | 'Main Company' | 'PZU' | 'Trade agent 1' | 'Trade agent partner term 1' | + | 'Sales return 192 dated 02.11.2022 10:53:27' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R8010 Trade agent inventory"' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | + | '' | '' | '' | 'Quantity' | 'Company' | 'Item key' | 'Partner' | 'Agreement' | 'Legal name' | + | '' | 'Expense' | '02.11.2022 10:53:27' | '1' | 'Main Company' | 'XS/Blue' | 'Trade agent 1' | 'Trade agent partner term 1' | 'Trade agent 1' | + | '' | 'Expense' | '02.11.2022 10:53:27' | '4' | 'Main Company' | 'PZU' | 'Trade agent 1' | 'Trade agent partner term 1' | 'Trade agent 1' | And I close all client application windows Scenario: _041333 check Sales return movements by the Register "R8011 Trade agent serial lot number" (Return from trade agent) @@ -996,13 +996,13 @@ Scenario: _041340 check Sales return movements by the Register "R8012 Consignor And I select "R8012 Consignor inventory" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Sales return 193 dated 05.11.2022 00:00:00' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "R8012 Consignor inventory"' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | - | '' | '' | '' | 'Quantity' | 'Company' | 'Item key' | 'Serial lot number' | 'Partner' | 'Agreement' | - | '' | 'Receipt' | '05.11.2022 00:00:00' | '1' | 'Main Company' | 'UNIQ' | '09987897977889' | 'Consignor 1' | 'Consignor partner term 1' | - | '' | 'Receipt' | '05.11.2022 00:00:00' | '2' | 'Main Company' | 'S/Yellow' | '' | 'Consignor 1' | 'Consignor partner term 1' | + | 'Sales return 193 dated 05.11.2022 00:00:00' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R8012 Consignor inventory"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | '' | + | '' | '' | '' | 'Quantity' | 'Company' | 'Item key' | 'Serial lot number' | 'Partner' | 'Agreement' | 'Legal name' | + | '' | 'Receipt' | '05.11.2022 00:00:00' | '1' | 'Main Company' | 'UNIQ' | '09987897977889' | 'Consignor 1' | 'Consignor partner term 1' | 'Consignor 1' | + | '' | 'Receipt' | '05.11.2022 00:00:00' | '2' | 'Main Company' | 'S/Yellow' | '' | 'Consignor 1' | 'Consignor partner term 1' | 'Consignor 1' | And I close all client application windows Scenario: _041341 check Sales return movements by the Register "R8013 Consignor batch wise balance" (Return Consignor stocks) diff --git a/features/Internal/_0400 Movements/_416PurchaseReturnMovements.feature b/features/Internal/_0400 Movements/_416PurchaseReturnMovements.feature index cf6972c263..a6aeb6deef 100644 --- a/features/Internal/_0400 Movements/_416PurchaseReturnMovements.feature +++ b/features/Internal/_0400 Movements/_416PurchaseReturnMovements.feature @@ -630,14 +630,14 @@ Scenario: _041623 check Purchase return movements by the Register "R8012 Consig And I select "R8012 Consignor inventory" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Purchase return 195 dated 02.11.2022 16:31:47' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "R8012 Consignor inventory"' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | - | '' | '' | '' | 'Quantity' | 'Company' | 'Item key' | 'Serial lot number' | 'Partner' | 'Agreement' | - | '' | 'Expense' | '02.11.2022 16:31:47' | '1' | 'Main Company' | 'ODS' | '899007790088' | 'Consignor 1' | 'Consignor partner term 1' | - | '' | 'Expense' | '02.11.2022 16:31:47' | '2' | 'Main Company' | '38/18SD' | '' | 'Consignor 1' | 'Consignor partner term 1' | - | '' | 'Expense' | '02.11.2022 16:31:47' | '3' | 'Main Company' | 'S/Yellow' | '' | 'Consignor 1' | 'Consignor partner term 1' | + | 'Purchase return 195 dated 02.11.2022 16:31:47' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R8012 Consignor inventory"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | '' | + | '' | '' | '' | 'Quantity' | 'Company' | 'Item key' | 'Serial lot number' | 'Partner' | 'Agreement' | 'Legal name' | + | '' | 'Expense' | '02.11.2022 16:31:47' | '1' | 'Main Company' | 'ODS' | '899007790088' | 'Consignor 1' | 'Consignor partner term 1' | 'Consignor 1' | + | '' | 'Expense' | '02.11.2022 16:31:47' | '2' | 'Main Company' | '38/18SD' | '' | 'Consignor 1' | 'Consignor partner term 1' | 'Consignor 1' | + | '' | 'Expense' | '02.11.2022 16:31:47' | '3' | 'Main Company' | 'S/Yellow' | '' | 'Consignor 1' | 'Consignor partner term 1' | 'Consignor 1' | And I close all client application windows Scenario: _041624 check Purchase return movements by the Register "R8013 Consignor batch wise balance" (Return to consignor) diff --git a/features/Internal/_0400 Movements/_424RetailSalesReceiptMovements.feature b/features/Internal/_0400 Movements/_424RetailSalesReceiptMovements.feature index ecd56eb1ae..35f1a3adc4 100644 --- a/features/Internal/_0400 Movements/_424RetailSalesReceiptMovements.feature +++ b/features/Internal/_0400 Movements/_424RetailSalesReceiptMovements.feature @@ -450,14 +450,14 @@ Scenario: _042421 check Retail sales receipt movements by the Register "R8012 C And I select "R8012 Consignor inventory" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Retail sales receipt 1 113 dated 14.11.2022 13:29:44' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "R8012 Consignor inventory"' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | - | '' | '' | '' | 'Quantity' | 'Company' | 'Item key' | 'Serial lot number' | 'Partner' | 'Agreement' | - | '' | 'Expense' | '14.11.2022 13:29:44' | '2' | 'Main Company' | 'S/Yellow' | '' | 'Consignor 1' | 'Consignor partner term 1' | - | '' | 'Expense' | '14.11.2022 13:29:44' | '2' | 'Main Company' | 'UNIQ' | '09987897977890' | 'Consignor 1' | 'Consignor partner term 1' | - | '' | 'Expense' | '14.11.2022 13:29:44' | '2' | 'Main Company' | 'UNIQ' | '09987897977890' | 'Consignor 2' | 'Consignor 2 partner term' | + | 'Retail sales receipt 1 113 dated 14.11.2022 13:29:44' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R8012 Consignor inventory"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | '' | + | '' | '' | '' | 'Quantity' | 'Company' | 'Item key' | 'Serial lot number' | 'Partner' | 'Agreement' | 'Legal name' | + | '' | 'Expense' | '14.11.2022 13:29:44' | '2' | 'Main Company' | 'S/Yellow' | '' | 'Consignor 1' | 'Consignor partner term 1' | 'Consignor 1' | + | '' | 'Expense' | '14.11.2022 13:29:44' | '2' | 'Main Company' | 'UNIQ' | '09987897977890' | 'Consignor 1' | 'Consignor partner term 1' | 'Consignor 1' | + | '' | 'Expense' | '14.11.2022 13:29:44' | '2' | 'Main Company' | 'UNIQ' | '09987897977890' | 'Consignor 2' | 'Consignor 2 partner term' | 'Consignor 2' | And I close all client application windows Scenario: _042422 check Retail sales receipt movements by the Register "R8013 Consignor batch wise balance" (consignor and own stocks) diff --git a/features/Internal/_0400 Movements/_425RetailReturnReceiptMovements.feature b/features/Internal/_0400 Movements/_425RetailReturnReceiptMovements.feature index 14084ac256..011656698e 100644 --- a/features/Internal/_0400 Movements/_425RetailReturnReceiptMovements.feature +++ b/features/Internal/_0400 Movements/_425RetailReturnReceiptMovements.feature @@ -646,14 +646,14 @@ Scenario: _042525 check Retail return receipt movements by the Register "R8012 And I select "R8012 Consignor inventory" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Retail return receipt 1 113 dated 14.11.2022 13:57:09' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "R8012 Consignor inventory"' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | - | '' | '' | '' | 'Quantity' | 'Company' | 'Item key' | 'Serial lot number' | 'Partner' | 'Agreement' | - | '' | 'Receipt' | '14.11.2022 13:57:09' | '1' | 'Main Company' | 'UNIQ' | '09987897977890' | 'Consignor 2' | 'Consignor 2 partner term' | - | '' | 'Receipt' | '14.11.2022 13:57:09' | '2' | 'Main Company' | 'S/Yellow' | '' | 'Consignor 1' | 'Consignor partner term 1' | - | '' | 'Receipt' | '14.11.2022 13:57:09' | '2' | 'Main Company' | 'UNIQ' | '09987897977890' | 'Consignor 1' | 'Consignor partner term 1' | + | 'Retail return receipt 1 113 dated 14.11.2022 13:57:09' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R8012 Consignor inventory"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | '' | + | '' | '' | '' | 'Quantity' | 'Company' | 'Item key' | 'Serial lot number' | 'Partner' | 'Agreement' | 'Legal name' | + | '' | 'Receipt' | '14.11.2022 13:57:09' | '1' | 'Main Company' | 'UNIQ' | '09987897977890' | 'Consignor 2' | 'Consignor 2 partner term' | 'Consignor 2' | + | '' | 'Receipt' | '14.11.2022 13:57:09' | '2' | 'Main Company' | 'S/Yellow' | '' | 'Consignor 1' | 'Consignor partner term 1' | 'Consignor 1' | + | '' | 'Receipt' | '14.11.2022 13:57:09' | '2' | 'Main Company' | 'UNIQ' | '09987897977890' | 'Consignor 1' | 'Consignor partner term 1' | 'Consignor 1' | And I close all client application windows Scenario: _042526 check Retail return receipt movements by the Register "R8013 Consignor batch wise balance" (consignor and own stocks) diff --git a/features/Internal/_0400 Movements/_429OpeningEntryMovements.feature b/features/Internal/_0400 Movements/_429OpeningEntryMovements.feature index 03d8891ee8..373862ec46 100644 --- a/features/Internal/_0400 Movements/_429OpeningEntryMovements.feature +++ b/features/Internal/_0400 Movements/_429OpeningEntryMovements.feature @@ -596,14 +596,14 @@ Scenario: _042919 check Opening entry movements by the Register "R8010 Trade ag And I select "R8010 Trade agent inventory" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Opening entry 14 dated 01.12.2022 12:41:27' | '' | '' | '' | '' | '' | '' | '' | - | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "R8010 Trade agent inventory"' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | - | '' | '' | '' | 'Quantity' | 'Company' | 'Item key' | 'Partner' | 'Agreement' | - | '' | 'Receipt' | '01.12.2022 12:41:27' | '20' | 'Main Company' | 'PZU' | 'Trade agent 1' | 'Trade agent partner term 1' | - | '' | 'Receipt' | '01.12.2022 12:41:27' | '30' | 'Main Company' | 'XS/Blue' | 'Trade agent 1' | 'Trade agent partner term 1' | - | '' | 'Receipt' | '01.12.2022 12:41:27' | '100' | 'Main Company' | 'UNIQ' | 'Trade agent 1' | 'Trade agent partner term 1' | + | 'Opening entry 14 dated 01.12.2022 12:41:27' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R8010 Trade agent inventory"' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | + | '' | '' | '' | 'Quantity' | 'Company' | 'Item key' | 'Partner' | 'Agreement' | 'Legal name' | + | '' | 'Receipt' | '01.12.2022 12:41:27' | '20' | 'Main Company' | 'PZU' | 'Trade agent 1' | 'Trade agent partner term 1' | 'Trade agent 1' | + | '' | 'Receipt' | '01.12.2022 12:41:27' | '30' | 'Main Company' | 'XS/Blue' | 'Trade agent 1' | 'Trade agent partner term 1' | 'Trade agent 1' | + | '' | 'Receipt' | '01.12.2022 12:41:27' | '100' | 'Main Company' | 'UNIQ' | 'Trade agent 1' | 'Trade agent partner term 1' | 'Trade agent 1' | And I close all client application windows Scenario: _042920 check Opening entry movements by the Register "R8011 Trade agent serial lot number" (shipment to trade agent) @@ -750,13 +750,13 @@ Scenario: _042926 check Opening entry movements by the Register "R8012 Consigno And I select "R8012 Consignor inventory" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Opening entry 15 dated 01.12.2022 12:41:39' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "R8012 Consignor inventory"' | '' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | - | '' | '' | '' | 'Quantity' | 'Company' | 'Item key' | 'Serial lot number' | 'Partner' | 'Agreement' | - | '' | 'Receipt' | '01.12.2022 12:41:39' | '50' | 'Main Company' | 'M/White' | '' | 'Consignor 1' | 'Consignor partner term 1' | - | '' | 'Receipt' | '01.12.2022 12:41:39' | '70' | 'Main Company' | 'PZU' | '8908899877' | 'Consignor 1' | 'Consignor partner term 1' | + | 'Opening entry 15 dated 01.12.2022 12:41:39' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R8012 Consignor inventory"' | '' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | '' | + | '' | '' | '' | 'Quantity' | 'Company' | 'Item key' | 'Serial lot number' | 'Partner' | 'Agreement' | 'Legal name' | + | '' | 'Receipt' | '01.12.2022 12:41:39' | '50' | 'Main Company' | 'M/White' | '' | 'Consignor 1' | 'Consignor partner term 1' | 'Consignor 1' | + | '' | 'Receipt' | '01.12.2022 12:41:39' | '70' | 'Main Company' | 'PZU' | '8908899877' | 'Consignor 1' | 'Consignor partner term 1' | 'Consignor 1' | And I close all client application windows Scenario: _042927 check Opening entry movements by the Register "R8013 Consignor batch wise balance" (receipt from consignor) diff --git a/features/Internal/_0400 Movements/_434BankReceiptMovements.feature b/features/Internal/_0400 Movements/_434BankReceiptMovements.feature index 306cb9a0d2..c9e859673f 100644 --- a/features/Internal/_0400 Movements/_434BankReceiptMovements.feature +++ b/features/Internal/_0400 Movements/_434BankReceiptMovements.feature @@ -606,6 +606,9 @@ Scenario: _0434282 check Bank receipt movements by the Register "R3010 Cash on h | '' | 'Receipt' | '23.06.2022 19:41:15' | '17,12' | 'Main Company' | 'Distribution department' | 'POS account, Comission separate, TRY' | 'USD' | 'Reporting currency' | 'No' | | '' | 'Receipt' | '23.06.2022 19:41:15' | '100' | 'Main Company' | 'Distribution department' | 'POS account, Comission separate, TRY' | 'TRY' | 'Local currency' | 'No' | | '' | 'Receipt' | '23.06.2022 19:41:15' | '100' | 'Main Company' | 'Distribution department' | 'POS account, Comission separate, TRY' | 'TRY' | 'en description is empty' | 'No' | + | '' | 'Expense' | '23.06.2022 19:41:15' | '1,71' | 'Main Company' | 'Distribution department' | 'POS account, Comission separate, TRY' | 'USD' | 'Reporting currency' | 'No' | + | '' | 'Expense' | '23.06.2022 19:41:15' | '10' | 'Main Company' | 'Distribution department' | 'POS account, Comission separate, TRY' | 'TRY' | 'Local currency' | 'No' | + | '' | 'Expense' | '23.06.2022 19:41:15' | '10' | 'Main Company' | 'Distribution department' | 'POS account, Comission separate, TRY' | 'TRY' | 'en description is empty' | 'No' | And I close all client application windows @@ -695,6 +698,9 @@ Scenario: _0434287 check Bank receipt movements by the Register "R3010 Cash on h | '' | 'Receipt' | '23.06.2022 17:50:08' | '17,12' | 'Main Company' | 'Distribution department' | 'POS account, Comission separate, TRY' | 'USD' | 'Reporting currency' | 'No' | | '' | 'Receipt' | '23.06.2022 17:50:08' | '100' | 'Main Company' | 'Distribution department' | 'POS account, Comission separate, TRY' | 'TRY' | 'Local currency' | 'No' | | '' | 'Receipt' | '23.06.2022 17:50:08' | '100' | 'Main Company' | 'Distribution department' | 'POS account, Comission separate, TRY' | 'TRY' | 'en description is empty' | 'No' | + | '' | 'Expense' | '23.06.2022 17:50:08' | '1,71' | 'Main Company' | 'Distribution department' | 'POS account, Comission separate, TRY' | 'USD' | 'Reporting currency' | 'No' | + | '' | 'Expense' | '23.06.2022 17:50:08' | '10' | 'Main Company' | 'Distribution department' | 'POS account, Comission separate, TRY' | 'TRY' | 'Local currency' | 'No' | + | '' | 'Expense' | '23.06.2022 17:50:08' | '10' | 'Main Company' | 'Distribution department' | 'POS account, Comission separate, TRY' | 'TRY' | 'en description is empty' | 'No' | And I close all client application windows diff --git a/features/Internal/_0400 Movements/_460SalesReportFromTradeAgentMovements.feature b/features/Internal/_0400 Movements/_460SalesReportFromTradeAgentMovements.feature index 300258ca2b..e1fc0f84fe 100644 --- a/features/Internal/_0400 Movements/_460SalesReportFromTradeAgentMovements.feature +++ b/features/Internal/_0400 Movements/_460SalesReportFromTradeAgentMovements.feature @@ -269,14 +269,14 @@ Scenario: _046005 check Sales report from trade agent movements by the Register And I select "R8010 Trade agent inventory" exact value from "Register" drop-down list And I click "Generate report" button Then "ResultTable" spreadsheet document is equal - | 'Sales report from trade agent 1 dated 03.11.2022 10:53:35' | '' | '' | '' | '' | '' | '' | '' | - | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | - | 'Register "R8010 Trade agent inventory"' | '' | '' | '' | '' | '' | '' | '' | - | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | - | '' | '' | '' | 'Quantity' | 'Company' | 'Item key' | 'Partner' | 'Agreement' | - | '' | 'Expense' | '03.11.2022 10:53:35' | '1' | 'Main Company' | 'PZU' | 'Trade agent 1' | 'Trade agent partner term 1' | - | '' | 'Expense' | '03.11.2022 10:53:35' | '2' | 'Main Company' | 'XS/Blue' | 'Trade agent 1' | 'Trade agent partner term 1' | - | '' | 'Expense' | '03.11.2022 10:53:35' | '2' | 'Main Company' | 'UNIQ' | 'Trade agent 1' | 'Trade agent partner term 1' | + | 'Sales report from trade agent 1 dated 03.11.2022 10:53:35' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Document registrations records' | '' | '' | '' | '' | '' | '' | '' | '' | + | 'Register "R8010 Trade agent inventory"' | '' | '' | '' | '' | '' | '' | '' | '' | + | '' | 'Record type' | 'Period' | 'Resources' | 'Dimensions' | '' | '' | '' | '' | + | '' | '' | '' | 'Quantity' | 'Company' | 'Item key' | 'Partner' | 'Agreement' | 'Legal name' | + | '' | 'Expense' | '03.11.2022 10:53:35' | '1' | 'Main Company' | 'PZU' | 'Trade agent 1' | 'Trade agent partner term 1' | 'Trade agent 1' | + | '' | 'Expense' | '03.11.2022 10:53:35' | '2' | 'Main Company' | 'XS/Blue' | 'Trade agent 1' | 'Trade agent partner term 1' | 'Trade agent 1' | + | '' | 'Expense' | '03.11.2022 10:53:35' | '2' | 'Main Company' | 'UNIQ' | 'Trade agent 1' | 'Trade agent partner term 1' | 'Trade agent 1' | And I close all client application windows Scenario: _046006 check Sales report from trade agent movements by the Register "R8011 Trade agent serial lot number" diff --git a/features/Internal/_0920 SerialLotNumbers/_0920SerialLotNumber.feature b/features/Internal/_0920 SerialLotNumbers/_0920SerialLotNumber.feature index 853a883adb..da2920e58b 100644 --- a/features/Internal/_0920 SerialLotNumbers/_0920SerialLotNumber.feature +++ b/features/Internal/_0920 SerialLotNumbers/_0920SerialLotNumber.feature @@ -3898,6 +3898,109 @@ Scenario: _092083 check serial lot numbers in the POS | 'Dress' | 'XS/Blue' | '0512; 0514' | '2,000' | And I close all client application windows +Scenario: _092087 check cleaning serial lot number in documents + And I close all client application windows + * Open Sales invoice + Given I open hyperlink "e1cib/list/Document.SalesInvoice" + And I click "Create" button + And in the table "ItemList" I click the button named "ItemListAdd" + And I activate "Item" field in "ItemList" table + And I select current line in "ItemList" table + And I click choice button of "Item" attribute in "ItemList" table + And I go to line in "List" table + | 'Description' | + | 'Product 1 with SLN' | + And I select current line in "List" table + And I activate "Item key" field in "ItemList" table + And I click choice button of "Item key" attribute in "ItemList" table + And I go to line in "List" table + | 'Item' | 'Item key' | + | 'Product 1 with SLN' | 'PZU' | + And I select current line in "List" table + And I activate field named "ItemListSerialLotNumbersPresentation" in "ItemList" table + And I click choice button of the attribute named "ItemListSerialLotNumbersPresentation" in "ItemList" table + And in the table "SerialLotNumbers" I click "Add" button + And I click choice button of the attribute named "SerialLotNumbersSerialLotNumber" in "SerialLotNumbers" table + And I activate field named "Owner" in "List" table + And I go to line in "List" table + | 'Owner' | 'Serial number' | + | 'PZU' | '456789' | + And I select current line in "List" table + And I activate "Quantity" field in "SerialLotNumbers" table + And I input "1,000" text in "Quantity" field of "SerialLotNumbers" table + And I finish line editing in "SerialLotNumbers" table + And I click "Ok" button + * Check filling + And "ItemList" table became equal + | 'Item' | 'Item key' | 'Serial lot numbers' | + | 'Product 1 with SLN' | 'PZU' | '456789' | + * Reselect item key and cleaning serial lot number + And I activate field named "ItemListItemKey" in "ItemList" table + And I select current line in "ItemList" table + And I click choice button of the attribute named "ItemListItemKey" in "ItemList" table + And I go to line in "List" table + | 'Item' | 'Item key' | + | 'Product 1 with SLN' | 'ODS' | + And I select current line in "List" table + And "ItemList" table became equal + | 'Item' | 'Item key' | 'Serial lot numbers' | + | 'Product 1 with SLN' | 'ODS' | '' | + And I close all client application windows + * Open Retail sales receipt + Given I open hyperlink "e1cib/list/Document.RetailSalesReceipt" + And I click "Create" button + And in the table "ItemList" I click the button named "ItemListAdd" + And I activate "Item" field in "ItemList" table + And I select current line in "ItemList" table + And I click choice button of "Item" attribute in "ItemList" table + And I go to line in "List" table + | 'Description' | + | 'Product 1 with SLN' | + And I select current line in "List" table + And I activate "Item key" field in "ItemList" table + And I click choice button of "Item key" attribute in "ItemList" table + And I go to line in "List" table + | 'Item' | 'Item key' | + | 'Product 1 with SLN' | 'PZU' | + And I select current line in "List" table + And I activate field named "ItemListSerialLotNumbersPresentation" in "ItemList" table + And I click choice button of the attribute named "ItemListSerialLotNumbersPresentation" in "ItemList" table + And in the table "SerialLotNumbers" I click "Add" button + And I click choice button of the attribute named "SerialLotNumbersSerialLotNumber" in "SerialLotNumbers" table + And I activate field named "Owner" in "List" table + And I go to line in "List" table + | 'Owner' | 'Serial number' | + | 'PZU' | '456789' | + And I select current line in "List" table + And I activate "Quantity" field in "SerialLotNumbers" table + And I input "1,000" text in "Quantity" field of "SerialLotNumbers" table + And I finish line editing in "SerialLotNumbers" table + And I click "Ok" button + * Check filling + And "ItemList" table became equal + | 'Item' | 'Item key' | 'Serial lot numbers' | + | 'Product 1 with SLN' | 'PZU' | '456789' | + * Reselect item key and cleaning serial lot number + And I activate field named "ItemListItemKey" in "ItemList" table + And I select current line in "ItemList" table + And I click choice button of the attribute named "ItemListItemKey" in "ItemList" table + And I go to line in "List" table + | 'Item' | 'Item key' | + | 'Product 1 with SLN' | 'ODS' | + And I select current line in "List" table + And "ItemList" table became equal + | 'Item' | 'Item key' | 'Serial lot numbers' | + | 'Product 1 with SLN' | 'ODS' | '' | + And I close all client application windows + + + + + + + + + Scenario: _092090 uncheck checkbox Use serial lot number in the Item type Given I open hyperlink "e1cib/list/Catalog.ItemTypes"