diff --git a/IRP/src/CommonModules/ControllerClientServer_V2/Module.bsl b/IRP/src/CommonModules/ControllerClientServer_V2/Module.bsl index 2df096de55..2ada418071 100644 --- a/IRP/src/CommonModules/ControllerClientServer_V2/Module.bsl +++ b/IRP/src/CommonModules/ControllerClientServer_V2/Module.bsl @@ -13231,6 +13231,114 @@ EndProcedure #EndRegion +#Region CASH_IN_TRANSIT + +#Region CASH_IN_TRANSIT_RECEIPTING_ACCOUNT + +// CashInTransit.ReceiptingAccount.OnChange +Procedure CashInTransitReceiptingAccountOnChange(Parameters) Export + Binding = BindCashInTransitReceiptingAccount(Parameters); + ModelClientServer_V2.EntryPoint(Binding.StepsEnabler, Parameters); +EndProcedure + +// CashInTransit.ReceiptingAccount.Set +Procedure SetCashInTransitReceiptingAccount(Parameters, Results) Export + Binding = BindCashInTransitReceiptingAccount(Parameters); + SetterObject(Binding.StepsEnabler, Binding.DataPath, Parameters, Results); +EndProcedure + +// CashInTransit.ReceiptingAccount.Get +Function GetCashInTransitReceiptingAccount(Parameters, _Key) + Return GetPropertyObject(Parameters, BindCashInTransitReceiptingAccount(Parameters).DataPath, _Key); +EndFunction + +// CashInTransit.ReceiptingAccount.Bind +Function BindCashInTransitReceiptingAccount(Parameters) + DataPath = "CashInTransit.ReceiptingAccount"; + Binding = New Structure(); + Binding.Insert("OpeningEntry", + "StepCashInTransitChangeCurrencyByReceiptingAccount, + |StepCashInTransitChangeIsFixedCurrencyByReceiptingAccount"); + Return BindSteps("BindVoid", DataPath, Binding, Parameters, "BindCashInTransitReceiptingAccount"); +EndFunction + +#EndRegion + +#Region CASH_IN_TRANSIT_CURRENCY + +// CashInTransit.Currency.Set +Procedure SetCashInTransitCurrency(Parameters, Results) Export + Binding = BindCashInTransitCurrency(Parameters); + SetterObject(Binding.StepsEnabler, Binding.DataPath, Parameters, Results); +EndProcedure + +// CashInTransit.Currency.Get +Function GetCashInTransitCurrency(Parameters, _Key) + Binding = BindCashInTransitCurrency(Parameters); + Return GetPropertyObject(Parameters, Binding.DataPath, _Key); +EndFunction + +// CashInTransit.Currency.Bind +Function BindCashInTransitCurrency(Parameters) + DataPath = "CashInTransit.Currency"; + Binding = New Structure(); + Return BindSteps("BindVoid", DataPath, Binding, Parameters, "BindCashInTransitCurrency"); +EndFunction + +// CashInTransit.Currency.ChangeCurrencyByReceiptingAccount.Step +Procedure StepCashInTransitChangeCurrencyByReceiptingAccount(Parameters, Chain) Export + Chain.ChangeCurrencyByAccount.Enable = True; + If Chain.Idle Then + Return; + EndIf; + Chain.ChangeCurrencyByAccount.Setter = "SetCashInTransitCurrency"; + For Each Row In GetRows(Parameters, Parameters.TableName) Do + Options = ModelClientServer_V2.ChangeCurrencyByAccountOptions(); + Options.Account = GetCashInTransitReceiptingAccount(Parameters, Row.Key); + Options.CurrentCurrency = GetCashInTransitCurrency(Parameters, Row.Key); + Options.Key = Row.Key; + Options.StepName = "StepCashInTransitChangeCurrencyByReceiptingAccount"; + Chain.ChangeCurrencyByAccount.Options.Add(Options); + EndDo; +EndProcedure + +#EndRegion + +#Region CASH_IN_TRANSIT_IS_FIXED_CURRENCY + +// CashInTransit.IsFixedCurrency.Set +Procedure SetCashInTransitIsFixedCurrency(Parameters, Results) Export + Binding = BindCashInTransitIsFixedCurrency(Parameters); + SetterObject(Binding.StepsEnabler, Binding.DataPath, Parameters, Results); +EndProcedure + +// CashInTransit.IsFixedCurrency.Bind +Function BindCashInTransitIsFixedCurrency(Parameters) + DataPath = "CashInTransit.IsFixedCurrency"; + Binding = New Structure(); + Return BindSteps("BindVoid", DataPath, Binding, Parameters, "BindCashInTransitIsFixedCurrency"); +EndFunction + +// CashInTransit.IsFixedCurrency.ChangeIsFixedCurrencyByReceiptingAccount.Step +Procedure StepCashInTransitChangeIsFixedCurrencyByReceiptingAccount(Parameters, Chain) Export + Chain.ChangeIsFixedCurrencyByAccount.Enable = True; + If Chain.Idle Then + Return; + EndIf; + Chain.ChangeIsFixedCurrencyByAccount.Setter = "SetCashInTransitIsFixedCurrency"; + For Each Row In GetRows(Parameters, Parameters.TableName) Do + Options = ModelClientServer_V2.ChangeIsFixedCurrencyByAccountOptions(); + Options.Account = GetCashInTransitReceiptingAccount(Parameters, Row.Key); + Options.Key = Row.Key; + Options.StepName = "StepCashInTransitChangeIsFixedCurrencyByReceiptingAccount"; + Chain.ChangeIsFixedCurrencyByAccount.Options.Add(Options); + EndDo; +EndProcedure + +#EndRegion + +#EndRegion + #Region EMPLOYEE_CASH_ADVANCE #Region EMPLOYEE_CASH_ADVANCE_ACCOUNT @@ -13641,6 +13749,8 @@ Procedure ExecuteViewNotify(Parameters, ViewNotify) ElsIf ViewNotify = "InventoryOnCopyRowFormNotify" Then ViewClient_V2.InventoryOnCopyRowFormNotify(Parameters); ElsIf ViewNotify = "AccountBalanceOnAddRowFormNotify" Then ViewClient_V2.AccountBalanceOnAddRowFormNotify(Parameters); ElsIf ViewNotify = "AccountBalanceOnCopyRowFormNotify" Then ViewClient_V2.AccountBalanceOnCopyRowFormNotify(Parameters); + ElsIf ViewNotify = "CashInTransitOnAddRowFormNotify" Then ViewClient_V2.AccountBalanceOnAddRowFormNotify(Parameters); + ElsIf ViewNotify = "CashInTransitOnCopyRowFormNotify" Then ViewClient_V2.AccountBalanceOnCopyRowFormNotify(Parameters); ElsIf ViewNotify = "ChequeBondsOnAddRowFormNotify" Then ViewClient_V2.ChequeBondsOnAddRowFormNotify(Parameters); ElsIf ViewNotify = "ChequeBondsOnCopyRowFormNotify" Then ViewClient_V2.ChequeBondsOnCopyRowFormNotify(Parameters); ElsIf ViewNotify = "ChequeBondsAfterDeleteRowFormNotify" Then ViewClient_V2.ChequeBondsAfterDeleteRowFormNotify(Parameters); diff --git a/IRP/src/CommonModules/DocOpeningEntryClient/Module.bsl b/IRP/src/CommonModules/DocOpeningEntryClient/Module.bsl index 295a9da4f4..9095d9778c 100644 --- a/IRP/src/CommonModules/DocOpeningEntryClient/Module.bsl +++ b/IRP/src/CommonModules/DocOpeningEntryClient/Module.bsl @@ -130,6 +130,33 @@ EndProcedure #EndRegion +#Region CASH_IN_TRANSIT + +&AtClient +Procedure CashInTransitBeforeAddRow(Object, Form, Item, Cancel, Clone, Parent, IsFolder, Parameter) Export + ViewClient_V2.CashInTransitBeforeAddRow(Object, Form, Cancel, Clone); +EndProcedure + +&AtClient +Procedure CashInTransitAfterDeleteRow(Object, Form, Item) Export + ViewClient_V2.CashInTransitAfterDeleteRow(Object, Form); +EndProcedure + +#Region CASH_IN_TRANSIT_COLUMNS + +#Region RECEIPTING_ACCOUNT + +&AtClient +Procedure CashInTransitReceiptingAccountOnChange(Object, Form, Item, CurrentData = Undefined) Export + ViewClient_V2.CashInTransitReceiptingAccountOnChange(Object, Form, CurrentData); +EndProcedure + +#EndRegion + +#EndRegion + +#EndRegion + #Region EMPLOYEE_CASH_ADVANCE Procedure EmployeeCashAdvanceBeforeAddRow(Object, Form, Item, Cancel, Clone, Parent, IsFolder, Parameter) Export diff --git a/IRP/src/CommonModules/DocumentsClient/Module.bsl b/IRP/src/CommonModules/DocumentsClient/Module.bsl index 63b97dbb76..b69073d251 100644 --- a/IRP/src/CommonModules/DocumentsClient/Module.bsl +++ b/IRP/src/CommonModules/DocumentsClient/Module.bsl @@ -1083,7 +1083,8 @@ Function GetFormItemNames() |EmployeeCashAdvanceKey, AdvanceFromRetailCustomersKey, SalaryPaymentKey, EmployeeCashAdvanceIsFixedCurrency, |ItemListPurchaseOrderKey, ItemListSalesOrderKey, |AccrualListKey, DeductionListKey, CashAdvanceDeductionListKey, - |ItemListConsignor, isControlCodeString"; + |ItemListConsignor, isControlCodeString, + |AccountPayableOtherKey, AccountReceivableOtherKey, CashInTransitKey, CashInTransitIsFixedCurrency"; Return ItemNames; EndFunction diff --git a/IRP/src/CommonModules/EquipmentFiscalPrinterServer/Module.bsl b/IRP/src/CommonModules/EquipmentFiscalPrinterServer/Module.bsl index 1d72ce9261..e0ca72e507 100644 --- a/IRP/src/CommonModules/EquipmentFiscalPrinterServer/Module.bsl +++ b/IRP/src/CommonModules/EquipmentFiscalPrinterServer/Module.bsl @@ -178,30 +178,34 @@ Function PrepareReceiptDataByRetailSalesReceipt(SourceData) Export EndIf; If SourceData.PaymentMethod = Enums.ReceiptPaymentMethods.FullPrepayment Then - Str.Insert("PrePayment", Str.PrePayment + Payment.Amount); + Str.PrePayment = Str.PrePayment + Payment.Amount; ElsIf SourceData.PaymentMethod = Enums.ReceiptPaymentMethods.PartialPrepayment Then - Str.Insert("PrePayment", Str.PrePayment + Payment.Amount); + Str.PrePayment = Str.PrePayment + Payment.Amount; ElsIf SourceData.PaymentMethod = Enums.ReceiptPaymentMethods.AdvancePayment Then - Str.Insert("PrePayment", Str.PrePayment + Payment.Amount); + Str.PrePayment = Str.PrePayment + Payment.Amount; ElsIf SourceData.PaymentMethod = Enums.ReceiptPaymentMethods.FullCalculation Then If Payment.PaymentType.Type = Enums.PaymentTypes.Cash Then - Str.Insert("Cash", Str.Cash + Payment.Amount); + Str.Cash = Str.Cash + Payment.Amount; ElsIf Payment.PaymentType.Type = Enums.PaymentTypes.Card Then - Str.Insert("ElectronicPayment", Str.ElectronicPayment + Payment.Amount); + Str.ElectronicPayment = Str.ElectronicPayment + Payment.Amount; ElsIf Payment.PaymentType.Type = Enums.PaymentTypes.PaymentAgent Then - Str.Insert("PostPayment", Str.PostPayment + Payment.Amount); + Str.PostPayment = Str.PostPayment + Payment.Amount; + ElsIf Payment.PaymentType.Type = Enums.PaymentTypes.Advance Then + Str.PrePayment = Str.PrePayment + Payment.Amount; Else - Str.Insert("Cash", Str.Cash + Payment.Amount); + Str.Cash = Str.Cash + Payment.Amount; EndIf; Else If Payment.PaymentType.Type = Enums.PaymentTypes.Cash Then - Str.Insert("Cash", Str.Cash + Payment.Amount); + Str.Cash = Str.Cash + Payment.Amount; ElsIf Payment.PaymentType.Type = Enums.PaymentTypes.Card Then - Str.Insert("ElectronicPayment", Str.ElectronicPayment + Payment.Amount); + Str.ElectronicPayment = Str.ElectronicPayment + Payment.Amount; ElsIf Payment.PaymentType.Type = Enums.PaymentTypes.PaymentAgent Then - Str.Insert("PostPayment", Str.PostPayment + Payment.Amount); + Str.PostPayment = Str.PostPayment + Payment.Amount; + ElsIf Payment.PaymentType.Type = Enums.PaymentTypes.Advance Then + Str.PrePayment = Str.PrePayment + Payment.Amount; Else - Str.Insert("Cash", Str.Cash + Payment.Amount); + Str.Cash = Str.Cash + Payment.Amount; EndIf; EndIf; EndDo; diff --git a/IRP/src/CommonModules/ViewClient_V2/Module.bsl b/IRP/src/CommonModules/ViewClient_V2/Module.bsl index b54faa8088..ffc09424d0 100644 --- a/IRP/src/CommonModules/ViewClient_V2/Module.bsl +++ b/IRP/src/CommonModules/ViewClient_V2/Module.bsl @@ -1368,7 +1368,7 @@ Procedure AccountBalanceOnCopyRowFormNotify(Parameters) Export EndProcedure Procedure AccountBalanceAfterDeleteRow(Object, Form) Export - DeleteRows(Object, Form, "Inventory"); + DeleteRows(Object, Form, "AccountBalance"); EndProcedure #EndRegion @@ -1388,6 +1388,47 @@ EndProcedure #EndRegion +#Region CASH_IN_TRANSIT + +Function CashInTransitBeforeAddRow(Object, Form, Cancel = False, Clone = False, CurrentData = Undefined) Export + NewRow = AddOrCopyRow(Object, Form, "CashInTransit", Cancel, Clone, CurrentData, + "CashInTransitOnAddRowFormNotify", "CashInTransitOnCopyRowFormNotify"); + Form.Items.CashInTransit.CurrentRow = NewRow.GetID(); + If Form.Items.CashInTransit.CurrentRow <> Undefined Then + Form.Items.CashInTransit.ChangeRow(); + EndIf; + Return NewRow; +EndFunction + +Procedure CashInTransitOnAddRowFormNotify(Parameters) Export + Parameters.Form.Modified = True; +EndProcedure + +Procedure CashInTransitOnCopyRowFormNotify(Parameters) Export + Parameters.Form.Modified = True; +EndProcedure + +Procedure CashInTransitAfterDeleteRow(Object, Form) Export + DeleteRows(Object, Form, "CashInTransit"); +EndProcedure + +#EndRegion + +#Region CASH_IN_TRANSIT_COLUMNS + +#Region CASH_IN_TRANSIT_RECEIPTING_ACCOUNT + +// CashInTransit.ReceiptingAccount +Procedure CashInTransitReceiptingAccountOnChange(Object, Form, CurrentData = Undefined) Export + Rows = GetRowsByCurrentData(Form, "CashInTransit", CurrentData); + Parameters = GetSimpleParameters(Object, Form, "CashInTransit", Rows); + ControllerClientServer_V2.CashInTransitReceiptingAccountOnChange(Parameters); +EndProcedure + +#EndRegion + +#EndRegion + #Region CHEQUE_BONDS Function ChequeBondsBeforeAddRow(Object, Form, Cancel = False, Clone = False, CurrentData = Undefined) Export diff --git a/IRP/src/Documents/OpeningEntry/Forms/DocumentForm/ConditionalAppearance.dcssca b/IRP/src/Documents/OpeningEntry/Forms/DocumentForm/ConditionalAppearance.dcssca index 312899cc47..a4589742f6 100644 --- a/IRP/src/Documents/OpeningEntry/Forms/DocumentForm/ConditionalAppearance.dcssca +++ b/IRP/src/Documents/OpeningEntry/Forms/DocumentForm/ConditionalAppearance.dcssca @@ -350,4 +350,24 @@ + + + + CashInTransitCurrency + + + + + Object.CashInTransit.IsFixedCurrency + Equal + true + + + + + ReadOnly + true + + + \ No newline at end of file diff --git a/IRP/src/Documents/OpeningEntry/Forms/DocumentForm/Form.form b/IRP/src/Documents/OpeningEntry/Forms/DocumentForm/Form.form index dc14eb9bdb..bf96653c88 100644 --- a/IRP/src/Documents/OpeningEntry/Forms/DocumentForm/Form.form +++ b/IRP/src/Documents/OpeningEntry/Forms/DocumentForm/Form.form @@ -1966,626 +1966,133 @@ - GroupAdvance - 419 - - GroupAdvanceFromCustomersAndToSuppliers - 421 - - GroupFromCustomers - 423 - - AdvanceFromCustomers - 427 + GroupCashInTransit + 1408 + + CashInTransit + 1484 + true + true + + true + + + Object.CashInTransit + + None + + CashInTransitLineNumber + 1497 + true + true + + true + + + Object.CashInTransit.LineNumber + + + CashInTransitLineNumberExtendedTooltip + 1499 true true true - - Object.AdvanceFromCustomers - - None - - AdvanceFromCustomersKey - 1120 - true - - true - - - Object.AdvanceFromCustomers.Key - - - AdvanceFromCustomersKeyExtendedTooltip - 1122 - true - true - - true - - Label - true - true - - Left - - - - AdvanceFromCustomersKeyContextMenu - 1121 - true - true - - true - - true - - InputField - Enter - true - Left - true - - true - true - true - true - true - true - - - - AdvanceFromCustomersLineNumber - 440 - true - true - - true - - - Object.AdvanceFromCustomers.LineNumber - - - AdvanceFromCustomersLineNumberExtendedTooltip - 442 - true - true - - true - - Label - true - true - - Left - - - - AdvanceFromCustomersLineNumberContextMenu - 441 - true - true - - true - - true - - InputField - Enter - true - Left - true - - true - true - true - true - true - true - - - - AdvanceFromCustomersPartner - 443 - true - true - - true - - - Object.AdvanceFromCustomers.Partner - - - OnChange - AdvanceMainTablePartnerOnChange - - - AdvanceFromCustomersPartnerExtendedTooltip - 445 - true - true - - true - - Label - true - true - - Left - - - - AdvanceFromCustomersPartnerContextMenu - 444 - true - true - - true - - true - - InputField - Enter - true - Left - true - - true - true - true - true - true - true - - Filter.Customer - - - true - - - - - - - AdvanceFromCustomersLegalName - 446 - true - true - - true - - - Object.AdvanceFromCustomers.LegalName - - - AdvanceFromCustomersLegalNameExtendedTooltip - 448 - true - true - - true - - Label - true - true - - Left - - - - AdvanceFromCustomersLegalNameContextMenu - 447 - true - true - - true - - true - - InputField - Enter - true - Left - true - - - EditTextChange - MainTableLegalNameEditTextChange - - - StartChoice - MainTableLegalNameStartChoice - - true - true - true - true - true - true - - - - AdvanceFromCustomersLegalNameContract - 1063 - true - true - - true - - - Object.AdvanceFromCustomers.LegalNameContract - - - AdvanceFromCustomersLegalNameContractExtendedTooltip - 1065 - true - true - - true - - Label - true - true - - Left - - - - AdvanceFromCustomersLegalNameContractContextMenu - 1064 - true - true - - true - - true - - InputField - Enter - true - Left - true - - true - true - true - true - true - true - - - - AdvanceFromCustomersCurrency - 449 - true - true - - true - - - Object.AdvanceFromCustomers.Currency - - - AdvanceFromCustomersCurrencyExtendedTooltip - 451 - true - true - - true - - Label - true - true - - Left - - - - AdvanceFromCustomersCurrencyContextMenu - 450 - true - true - - true - - true - - InputField - Enter - true - Left - true - - true - true - true - true - true - true - - - - AdvanceFromCustomersAmount - 452 - true - true - - true - - - Object.AdvanceFromCustomers.Amount - - - AdvanceFromCustomersAmountExtendedTooltip - 454 - true - true - - true - - Label - true - true - - Left - - - - AdvanceFromCustomersAmountContextMenu - 453 - true - true - - true - - true - - InputField - Enter - true - Left - true - - true - true - true - true - true - true - - - - AdvanceFromCustomersCommandBar - 428 - - EditCurrenciesAdvanceFromCustomers - 1148 - true - true - - true - - - EditCurrenciesAdvanceFromCustomersExtendedTooltip - 1149 - true - true - - true - - Label - true - true - - Left - - - Form.Command.EditCurrenciesAdvanceFromCustomers - Auto - true - true - UserCmds - Auto - - true - true - - true - + Label + true + true + Left - true - - - OnActivateCell - AdvanceFromCustomersOnActivateCell - - - OnChange - MainTableOnChange - - - true - true - - true - - AdvanceFromCustomersSearchString - 431 - - AdvanceFromCustomersSearchStringExtendedTooltip - 433 - true - true - - true - - Label - true - true - - Left - - - - AdvanceFromCustomersSearchStringContextMenu - 432 - true - true - - true - - true - - AdvanceFromCustomersSearchString - - true - - - - true - true - - true - - AdvanceFromCustomersViewStatus - 437 - - AdvanceFromCustomersViewStatusExtendedTooltip - 439 - true - true - - true - - Label - true - true - - Left - - - - AdvanceFromCustomersViewStatusContextMenu - 438 - true - true - - true - - true - - ViewStatusAddition - AdvanceFromCustomersViewStatus - - true - Left - - - - true - true - - true - - AdvanceFromCustomersSearchControl - 434 - - AdvanceFromCustomersSearchControlExtendedTooltip - 436 - true - true - - true - - Label - true - true - - Left - - - - AdvanceFromCustomersSearchControlContextMenu - 435 - true - true - - true - - true - - SearchControlAddition - AdvanceFromCustomersSearchControl - - true - - - - AdvanceFromCustomersExtendedTooltip - 430 - true - true - - true - - Label - true - true - - Left - - - - AdvanceFromCustomersContextMenu - 429 - true - true - - true - - true - - true - true + + + + CashInTransitLineNumberContextMenu + 1498 + true + true + + true + + true + + InputField + Enter + true + Left + true + true true - true - MultiRow -
true
- 1 - 1 - AutoUse - AutoUse - true - true - Auto - Auto - true - true - AsFileRef - - + true + true + true + true + + + + CashInTransitKey + 1500 + true + + true + + + Object.CashInTransit.Key + + + CashInTransitKeyExtendedTooltip + 1502 + true + true + + true + + Label + true + true + + Left + + + + CashInTransitKeyContextMenu + 1501 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + CashInTransitAccount + 1503 true true true - - <key>en</key> - <value>From customers</value> - - - <key>ru</key> - <value>Покупатели</value> - - - <key>tr</key> - <value>Müşteriden</value> - + + Object.CashInTransit.Account + - GroupFromCustomersExtendedTooltip - 424 + CashInTransitAccountExtendedTooltip + 1505 true true @@ -2598,144 +2105,554 @@ Left - Page - - Vertical - true + + CashInTransitAccountContextMenu + 1504 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true - - GroupToSuppliers - 425 - - AdvanceToSuppliers - 458 + + CashInTransitReceiptingAccount + 1515 + true + true + + true + + + Object.CashInTransit.ReceiptingAccount + + + OnChange + CashInTransitReceiptingAccountOnChange + + + CashInTransitReceiptingAccountExtendedTooltip + 1517 true true true - - Object.AdvanceToSuppliers - - None - - AdvanceToSuppliersKey - 1123 - true - - true - - - Object.AdvanceToSuppliers.Key - - - AdvanceToSuppliersKeyExtendedTooltip - 1125 - true - true - - true - - Label - true - true - - Left - - - - AdvanceToSuppliersKeyContextMenu - 1124 - true - true - - true - - true - - InputField - Enter - true - Left - true - - true - true - true - true - true - true - - - - AdvanceToSuppliersLineNumber - 471 + Label + true + true + + Left + + + + CashInTransitReceiptingAccountContextMenu + 1516 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + CashInTransitReceiptingBranch + 1518 + true + true + + true + + + Object.CashInTransit.ReceiptingBranch + + + CashInTransitReceiptingBranchExtendedTooltip + 1520 + true + true + + true + + Label + true + true + + Left + + + + CashInTransitReceiptingBranchContextMenu + 1519 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + CashInTransitCurrency + 1506 + true + true + + true + + + Object.CashInTransit.Currency + + + CashInTransitCurrencyExtendedTooltip + 1508 + true + true + + true + + Label + true + true + + Left + + + + CashInTransitCurrencyContextMenu + 1507 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + CashInTransitAmount + 1509 + true + true + + true + + + Object.CashInTransit.Amount + + + CashInTransitAmountExtendedTooltip + 1511 + true + true + + true + + Label + true + true + + Left + + + + CashInTransitAmountContextMenu + 1510 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + CashInTransitIsFixedCurrency + 1512 + true + + true + + + Object.CashInTransit.IsFixedCurrency + + + CashInTransitIsFixedCurrencyExtendedTooltip + 1514 + true + true + + true + + Label + true + true + + Left + + + + CashInTransitIsFixedCurrencyContextMenu + 1513 + true + true + + true + + true + + CheckBoxField + Enter + true + Left + true + + + + CashInTransitCommandBar + 1485 + + EditCurrenciesCashInTransit + 1521 + true + true + + true + + + EditCurrenciesCashInTransitExtendedTooltip + 1522 true true true - - Object.AdvanceToSuppliers.LineNumber - - - AdvanceToSuppliersLineNumberExtendedTooltip - 473 - true - true - - true - - Label - true - true - - Left - - - - AdvanceToSuppliersLineNumberContextMenu - 472 - true - true - - true - - true - - InputField - Enter - true - Left - true - - true - true - true - true - true - true + Label + true + true + + Left - + + Form.Command.EditCurrenciesCashInTransit + Auto + true + true + UserCmds + Auto + + true + true + + true + + Left + true + + + AfterDeleteRow + CashInTransitAfterDeleteRow + + + BeforeAddRow + CashInTransitBeforeAddRow + + + true + true + + true + + CashInTransitSearchString + 1488 + + CashInTransitSearchStringExtendedTooltip + 1490 + true + true + + true + + Label + true + true + + Left + + + + CashInTransitSearchStringContextMenu + 1489 + true + true + + true + + true + + + true + + + + true + true + + true + + CashInTransitViewStatus + 1494 + + CashInTransitViewStatusExtendedTooltip + 1496 + true + true + + true + + Label + true + true + + Left + + + + CashInTransitViewStatusContextMenu + 1495 + true + true + + true + + true + + ViewStatusAddition + + true + + + + true + true + + true + + CashInTransitSearchControl + 1491 + + CashInTransitSearchControlExtendedTooltip + 1493 + true + true + + true + + Label + true + true + + Left + + + + CashInTransitSearchControlContextMenu + 1492 + true + true + + true + + true + + SearchControlAddition + + true + + + + CashInTransitExtendedTooltip + 1487 + true + true + + true + + Label + true + true + + Left + + + + CashInTransitContextMenu + 1486 + true + true + + true + + true + + true + true + true + true + true + MultiRow +
true
+ 1 + 1 + AutoUse + AutoUse + true + true + Auto + Auto + true + true + AsFileRef + + true + true + + true + + + <key>en</key> + <value>Cash in transit</value> + + + <key>ru</key> + <value>Денежные средства в пути</value> + + + <key>tr</key> + <value>Yoldaki paralar (CashInTransit)</value> + + + GroupCashInTransitExtendedTooltip + 1409 + true + true + + true + + Label + true + true + + Left + + + Page + + Vertical + true + + + + GroupAdvance + 419 + + GroupAdvanceFromCustomersAndToSuppliers + 421 + + GroupFromCustomers + 423 + + AdvanceFromCustomers + 427 + true + true + + true + + + Object.AdvanceFromCustomers + + None - AdvanceToSuppliersPartner - 474 - true + AdvanceFromCustomersKey + 1120 true true - Object.AdvanceToSuppliers.Partner + Object.AdvanceFromCustomers.Key - - OnChange - AdvanceMainTablePartnerOnChange - - AdvanceToSuppliersPartnerExtendedTooltip - 476 + AdvanceFromCustomersKeyExtendedTooltip + 1122 true true @@ -2749,8 +2666,8 @@ - AdvanceToSuppliersPartnerContextMenu - 475 + AdvanceFromCustomersKeyContextMenu + 1121 true true @@ -2770,30 +2687,22 @@ true true true - - Filter.Vendor - - - true - - - - AdvanceToSuppliersLegalName - 477 - true + AdvanceFromCustomersLineNumber + 440 + true true true - Object.AdvanceToSuppliers.LegalName + Object.AdvanceFromCustomers.LineNumber - AdvanceToSuppliersLegalNameExtendedTooltip - 479 + AdvanceFromCustomersLineNumberExtendedTooltip + 442 true true @@ -2807,8 +2716,120 @@ - AdvanceToSuppliersLegalNameContextMenu - 478 + AdvanceFromCustomersLineNumberContextMenu + 441 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + AdvanceFromCustomersPartner + 443 + true + true + + true + + + Object.AdvanceFromCustomers.Partner + + + OnChange + AdvanceMainTablePartnerOnChange + + + AdvanceFromCustomersPartnerExtendedTooltip + 445 + true + true + + true + + Label + true + true + + Left + + + + AdvanceFromCustomersPartnerContextMenu + 444 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + Filter.Customer + + + true + + + + + + + AdvanceFromCustomersLegalName + 446 + true + true + + true + + + Object.AdvanceFromCustomers.LegalName + + + AdvanceFromCustomersLegalNameExtendedTooltip + 448 + true + true + + true + + Label + true + true + + Left + + + + AdvanceFromCustomersLegalNameContextMenu + 447 true true @@ -2836,28 +2857,22 @@ true true true - - Filter.Partner - - Items.AdvanceToSuppliers.CurrentData.Partner - - - AdvanceToSuppliersLegalNameContract - 1066 + AdvanceFromCustomersLegalNameContract + 1063 true true true - Object.AdvanceToSuppliers.LegalNameContract + Object.AdvanceFromCustomers.LegalNameContract - AdvanceToSuppliersLegalNameContractExtendedTooltip - 1068 + AdvanceFromCustomersLegalNameContractExtendedTooltip + 1065 true true @@ -2871,8 +2886,8 @@ - AdvanceToSuppliersLegalNameContractContextMenu - 1067 + AdvanceFromCustomersLegalNameContractContextMenu + 1064 true true @@ -2895,19 +2910,19 @@ - AdvanceToSuppliersCurrency - 480 + AdvanceFromCustomersCurrency + 449 true true true - Object.AdvanceToSuppliers.Currency + Object.AdvanceFromCustomers.Currency - AdvanceToSuppliersCurrencyExtendedTooltip - 482 + AdvanceFromCustomersCurrencyExtendedTooltip + 451 true true @@ -2921,8 +2936,8 @@ - AdvanceToSuppliersCurrencyContextMenu - 481 + AdvanceFromCustomersCurrencyContextMenu + 450 true true @@ -2945,19 +2960,19 @@ - AdvanceToSuppliersAmount - 483 + AdvanceFromCustomersAmount + 452 true true true - Object.AdvanceToSuppliers.Amount + Object.AdvanceFromCustomers.Amount - AdvanceToSuppliersAmountExtendedTooltip - 485 + AdvanceFromCustomersAmountExtendedTooltip + 454 true true @@ -2971,8 +2986,8 @@ - AdvanceToSuppliersAmountContextMenu - 484 + AdvanceFromCustomersAmountContextMenu + 453 true true @@ -2995,19 +3010,19 @@ - AdvanceToSuppliersCommandBar - 459 + AdvanceFromCustomersCommandBar + 428 - EditCurrenciesAdvanceToSuppliers - 1150 + EditCurrenciesAdvanceFromCustomers + 1148 true true true - EditCurrenciesAdvanceToSuppliersExtendedTooltip - 1151 + EditCurrenciesAdvanceFromCustomersExtendedTooltip + 1149 true true @@ -3020,7 +3035,7 @@ Left - Form.Command.EditCurrenciesAdvanceToSuppliers + Form.Command.EditCurrenciesAdvanceFromCustomers Auto true true @@ -3037,7 +3052,7 @@ OnActivateCell - AdvanceToSuppliersOnActivateCell + AdvanceFromCustomersOnActivateCell OnChange @@ -3049,11 +3064,11 @@ true - AdvanceToSuppliersSearchString - 462 + AdvanceFromCustomersSearchString + 431 - AdvanceToSuppliersSearchStringExtendedTooltip - 464 + AdvanceFromCustomersSearchStringExtendedTooltip + 433 true true @@ -3067,8 +3082,8 @@ - AdvanceToSuppliersSearchStringContextMenu - 463 + AdvanceFromCustomersSearchStringContextMenu + 432 true true @@ -3076,7 +3091,7 @@ true - AdvanceToSuppliersSearchString + AdvanceFromCustomersSearchString true @@ -3087,11 +3102,11 @@ true - AdvanceToSuppliersViewStatus - 468 + AdvanceFromCustomersViewStatus + 437 - AdvanceToSuppliersViewStatusExtendedTooltip - 470 + AdvanceFromCustomersViewStatusExtendedTooltip + 439 true true @@ -3105,8 +3120,8 @@ - AdvanceToSuppliersViewStatusContextMenu - 469 + AdvanceFromCustomersViewStatusContextMenu + 438 true true @@ -3115,7 +3130,7 @@ true ViewStatusAddition - AdvanceToSuppliersViewStatus + AdvanceFromCustomersViewStatus true Left @@ -3127,11 +3142,11 @@ true - AdvanceToSuppliersSearchControl - 465 + AdvanceFromCustomersSearchControl + 434 - AdvanceToSuppliersSearchControlExtendedTooltip - 467 + AdvanceFromCustomersSearchControlExtendedTooltip + 436 true true @@ -3145,8 +3160,8 @@ - AdvanceToSuppliersSearchControlContextMenu - 466 + AdvanceFromCustomersSearchControlContextMenu + 435 true true @@ -3155,14 +3170,14 @@ true SearchControlAddition - AdvanceToSuppliersSearchControl + AdvanceFromCustomersSearchControl true - AdvanceToSuppliersExtendedTooltip - 461 + AdvanceFromCustomersExtendedTooltip + 430 true true @@ -3176,8 +3191,8 @@ - AdvanceToSuppliersContextMenu - 460 + AdvanceFromCustomersContextMenu + 429 true true @@ -3212,19 +3227,19 @@ <key>en</key> - <value>To suppliers</value> + <value>From customers</value> <key>ru</key> - <value>Поставщики</value> + <value>Покупатели</value> <key>tr</key> - <value>Tedarikçilere</value> + <value>Müşteriden</value> - GroupToSuppliersExtendedTooltip - 426 + GroupFromCustomersExtendedTooltip + 424 true true @@ -3243,116 +3258,34 @@ true - true - true - - true - - - <key>en</key> - <value>Advance from customers and to suppliers</value> - - - <key>ru</key> - <value>Авансы от покупателей и авансы поставщикам</value> - - - <key>tr</key> - <value>Müşteri ve tedarikçi avansları</value> - - - GroupAdvanceFromCustomersAndToSuppliersExtendedTooltip - 422 - true - true - - true - - Label - true - true - - Left - - - Pages - - TabsOnTop - Auto - - - true - true - - true - - - <key>en</key> - <value>Advance</value> - - - <key>ru</key> - <value>Авансы</value> - - - <key>tr</key> - <value>Avans</value> - - - GroupAdvanceExtendedTooltip - 420 - true - true - - true - - Label - true - true - - Left - - - Page - - Vertical - true - - - - GroupAccountPayable - 593 - - GroupAccountPayableByAgreementsAndByDocuments - 595 - GroupAccountPayableByAgreements - 597 + GroupToSuppliers + 425 - AccountPayableByAgreements - 609 + AdvanceToSuppliers + 458 true true true - Object.AccountPayableByAgreements + Object.AdvanceToSuppliers None - AccountPayableByAgreementsKey - 1126 + AdvanceToSuppliersKey + 1123 true true - Object.AccountPayableByAgreements.Key + Object.AdvanceToSuppliers.Key - AccountPayableByAgreementsKeyExtendedTooltip - 1128 + AdvanceToSuppliersKeyExtendedTooltip + 1125 true true @@ -3366,8 +3299,8 @@ - AccountPayableByAgreementsKeyContextMenu - 1127 + AdvanceToSuppliersKeyContextMenu + 1124 true true @@ -3390,19 +3323,19 @@ - AccountPayableByAgreementsLineNumber - 622 + AdvanceToSuppliersLineNumber + 471 true true true - Object.AccountPayableByAgreements.LineNumber + Object.AdvanceToSuppliers.LineNumber - AccountPayableByAgreementsLineNumberExtendedTooltip - 624 + AdvanceToSuppliersLineNumberExtendedTooltip + 473 true true @@ -3416,8 +3349,8 @@ - AccountPayableByAgreementsLineNumberContextMenu - 623 + AdvanceToSuppliersLineNumberContextMenu + 472 true true @@ -3440,23 +3373,23 @@ - AccountPayableByAgreementsPartner - 628 + AdvanceToSuppliersPartner + 474 true true true - Object.AccountPayableByAgreements.Partner + Object.AdvanceToSuppliers.Partner OnChange - AccountPayableByAgreementsPartnerOnChange + AdvanceMainTablePartnerOnChange - AccountPayableByAgreementsPartnerExtendedTooltip - 630 + AdvanceToSuppliersPartnerExtendedTooltip + 476 true true @@ -3470,8 +3403,8 @@ - AccountPayableByAgreementsPartnerContextMenu - 629 + AdvanceToSuppliersPartnerContextMenu + 475 true true @@ -3502,19 +3435,19 @@ - AccountPayableByAgreementsLegalName - 631 + AdvanceToSuppliersLegalName + 477 true true true - Object.AccountPayableByAgreements.LegalName + Object.AdvanceToSuppliers.LegalName - AccountPayableByAgreementsLegalNameExtendedTooltip - 633 + AdvanceToSuppliersLegalNameExtendedTooltip + 479 true true @@ -3528,8 +3461,8 @@ - AccountPayableByAgreementsLegalNameContextMenu - 632 + AdvanceToSuppliersLegalNameContextMenu + 478 true true @@ -3557,26 +3490,28 @@ true true true + + Filter.Partner + + Items.AdvanceToSuppliers.CurrentData.Partner + + - AccountPayableByAgreementsAgreement - 634 + AdvanceToSuppliersLegalNameContract + 1066 true true true - Object.AccountPayableByAgreements.Agreement + Object.AdvanceToSuppliers.LegalNameContract - - OnChange - AgreementOnChange - - AccountPayableByAgreementsAgreementExtendedTooltip - 636 + AdvanceToSuppliersLegalNameContractExtendedTooltip + 1068 true true @@ -3590,8 +3525,8 @@ - AccountPayableByAgreementsAgreementContextMenu - 635 + AdvanceToSuppliersLegalNameContractContextMenu + 1067 true true @@ -3605,14 +3540,6 @@ Left true - - EditTextChange - AccountPayableByAgreementsAgreementEditTextChange - - - StartChoice - AccountPayableByAgreementsAgreementStartChoice - true true true @@ -3622,19 +3549,19 @@ - AccountPayableByAgreementsLegalNameContract - 1051 + AdvanceToSuppliersCurrency + 480 true true true - Object.AccountPayableByAgreements.LegalNameContract + Object.AdvanceToSuppliers.Currency - AccountPayableByAgreementsLegalNameContractExtendedTooltip - 1053 + AdvanceToSuppliersCurrencyExtendedTooltip + 482 true true @@ -3648,8 +3575,8 @@ - AccountPayableByAgreementsLegalNameContractContextMenu - 1052 + AdvanceToSuppliersCurrencyContextMenu + 481 true true @@ -3672,19 +3599,19 @@ - AccountPayableByAgreementsCurrency - 637 + AdvanceToSuppliersAmount + 483 true true true - Object.AccountPayableByAgreements.Currency + Object.AdvanceToSuppliers.Amount - AccountPayableByAgreementsCurrencyExtendedTooltip - 639 + AdvanceToSuppliersAmountExtendedTooltip + 485 true true @@ -3698,8 +3625,8 @@ - AccountPayableByAgreementsCurrencyContextMenu - 638 + AdvanceToSuppliersAmountContextMenu + 484 true true @@ -3721,84 +3648,34 @@ true - - AccountPayableByAgreementsAmount - 640 - true - true - - true - - - Object.AccountPayableByAgreements.Amount - - - AccountPayableByAgreementsAmountExtendedTooltip - 642 + + AdvanceToSuppliersCommandBar + 459 + + EditCurrenciesAdvanceToSuppliers + 1150 true true true - Label - true - true - - Left - - - - AccountPayableByAgreementsAmountContextMenu - 641 - true - true - - true - - true - - InputField - Enter - true - Left - true - - true - true - true - true - true - true - - - - AccountPayableByAgreementsCommandBar - 610 - - EditCurrenciesAccountPayableByAgreements - 1156 - true - true - - true - - - EditCurrenciesAccountPayableByAgreementsExtendedTooltip - 1157 - true - true - - true - - Label - true - true - - Left - - - Form.Command.EditCurrenciesAccountPayableByAgreements - Auto + + EditCurrenciesAdvanceToSuppliersExtendedTooltip + 1151 + true + true + + true + + Label + true + true + + Left + + + Form.Command.EditCurrenciesAdvanceToSuppliers + Auto true true UserCmds @@ -3814,7 +3691,7 @@ OnActivateCell - AccountPayableByAgreementsOnActivateCell + AdvanceToSuppliersOnActivateCell OnChange @@ -3826,11 +3703,11 @@ true - AccountPayableByAgreementsSearchString - 613 + AdvanceToSuppliersSearchString + 462 - AccountPayableByAgreementsSearchStringExtendedTooltip - 615 + AdvanceToSuppliersSearchStringExtendedTooltip + 464 true true @@ -3844,8 +3721,8 @@ - AccountPayableByAgreementsSearchStringContextMenu - 614 + AdvanceToSuppliersSearchStringContextMenu + 463 true true @@ -3853,7 +3730,7 @@ true - AccountPayableByAgreementsSearchString + AdvanceToSuppliersSearchString true @@ -3864,11 +3741,11 @@ true - AccountPayableByAgreementsViewStatus - 619 + AdvanceToSuppliersViewStatus + 468 - AccountPayableByAgreementsViewStatusExtendedTooltip - 621 + AdvanceToSuppliersViewStatusExtendedTooltip + 470 true true @@ -3882,8 +3759,8 @@ - AccountPayableByAgreementsViewStatusContextMenu - 620 + AdvanceToSuppliersViewStatusContextMenu + 469 true true @@ -3892,7 +3769,7 @@ true ViewStatusAddition - AccountPayableByAgreementsViewStatus + AdvanceToSuppliersViewStatus true Left @@ -3904,11 +3781,11 @@ true - AccountPayableByAgreementsSearchControl - 616 + AdvanceToSuppliersSearchControl + 465 - AccountPayableByAgreementsSearchControlExtendedTooltip - 618 + AdvanceToSuppliersSearchControlExtendedTooltip + 467 true true @@ -3922,8 +3799,8 @@ - AccountPayableByAgreementsSearchControlContextMenu - 617 + AdvanceToSuppliersSearchControlContextMenu + 466 true true @@ -3932,14 +3809,14 @@ true SearchControlAddition - AccountPayableByAgreementsSearchControl + AdvanceToSuppliersSearchControl true - AccountPayableByAgreementsExtendedTooltip - 612 + AdvanceToSuppliersExtendedTooltip + 461 true true @@ -3953,8 +3830,8 @@ - AccountPayableByAgreementsContextMenu - 611 + AdvanceToSuppliersContextMenu + 460 true true @@ -3989,19 +3866,19 @@ <key>en</key> - <value>By agreements</value> + <value>To suppliers</value> <key>ru</key> - <value>По соглашениям</value> + <value>Поставщики</value> <key>tr</key> - <value>Sözleşme detaylı</value> + <value>Tedarikçilere</value> - GroupAccountPayableByAgreementsExtendedTooltip - 598 + GroupToSuppliersExtendedTooltip + 426 true true @@ -4020,34 +3897,116 @@ true + true + true + + true + + + <key>en</key> + <value>Advance from customers and to suppliers</value> + + + <key>ru</key> + <value>Авансы от покупателей и авансы поставщикам</value> + + + <key>tr</key> + <value>Müşteri ve tedarikçi avansları</value> + + + GroupAdvanceFromCustomersAndToSuppliersExtendedTooltip + 422 + true + true + + true + + Label + true + true + + Left + + + Pages + + TabsOnTop + Auto + + + true + true + + true + + + <key>en</key> + <value>Advance</value> + + + <key>ru</key> + <value>Авансы</value> + + + <key>tr</key> + <value>Avans</value> + + + GroupAdvanceExtendedTooltip + 420 + true + true + + true + + Label + true + true + + Left + + + Page + + Vertical + true + + + + GroupAccountPayable + 593 + + GroupAccountPayableByAgreementsAndByDocuments + 595 - GroupAccountPayableByDocuments - 599 + GroupAccountPayableByAgreements + 597 - AccountPayableByDocuments - 643 + AccountPayableByAgreements + 609 true true true - Object.AccountPayableByDocuments + Object.AccountPayableByAgreements None - AccountPayableByDocumentsKey - 1129 + AccountPayableByAgreementsKey + 1126 true true - Object.AccountPayableByDocuments.Key + Object.AccountPayableByAgreements.Key - AccountPayableByDocumentsKeyExtendedTooltip - 1131 + AccountPayableByAgreementsKeyExtendedTooltip + 1128 true true @@ -4061,8 +4020,8 @@ - AccountPayableByDocumentsKeyContextMenu - 1130 + AccountPayableByAgreementsKeyContextMenu + 1127 true true @@ -4085,19 +4044,19 @@ - AccountPayableByDocumentsLineNumber - 656 + AccountPayableByAgreementsLineNumber + 622 true true true - Object.AccountPayableByDocuments.LineNumber + Object.AccountPayableByAgreements.LineNumber - AccountPayableByDocumentsLineNumberExtendedTooltip - 658 + AccountPayableByAgreementsLineNumberExtendedTooltip + 624 true true @@ -4111,8 +4070,8 @@ - AccountPayableByDocumentsLineNumberContextMenu - 657 + AccountPayableByAgreementsLineNumberContextMenu + 623 true true @@ -4135,23 +4094,23 @@ - AccountPayableByDocumentsPartner - 665 + AccountPayableByAgreementsPartner + 628 true true true - Object.AccountPayableByDocuments.Partner + Object.AccountPayableByAgreements.Partner OnChange - AccountPayableByDocumentsPartnerOnChange + AccountPayableByAgreementsPartnerOnChange - AccountPayableByDocumentsPartnerExtendedTooltip - 667 + AccountPayableByAgreementsPartnerExtendedTooltip + 630 true true @@ -4165,8 +4124,8 @@ - AccountPayableByDocumentsPartnerContextMenu - 666 + AccountPayableByAgreementsPartnerContextMenu + 629 true true @@ -4197,19 +4156,19 @@ - AccountPayableByDocumentsLegalName - 668 + AccountPayableByAgreementsLegalName + 631 true true true - Object.AccountPayableByDocuments.LegalName + Object.AccountPayableByAgreements.LegalName - AccountPayableByDocumentsLegalNameExtendedTooltip - 670 + AccountPayableByAgreementsLegalNameExtendedTooltip + 633 true true @@ -4223,8 +4182,8 @@ - AccountPayableByDocumentsLegalNameContextMenu - 669 + AccountPayableByAgreementsLegalNameContextMenu + 632 true true @@ -4255,23 +4214,23 @@ - AccountPayableByDocumentsAgreement - 671 + AccountPayableByAgreementsAgreement + 634 true true true - Object.AccountPayableByDocuments.Agreement + Object.AccountPayableByAgreements.Agreement OnChange AgreementOnChange - AccountPayableByDocumentsAgreementExtendedTooltip - 673 + AccountPayableByAgreementsAgreementExtendedTooltip + 636 true true @@ -4285,8 +4244,8 @@ - AccountPayableByDocumentsAgreementContextMenu - 672 + AccountPayableByAgreementsAgreementContextMenu + 635 true true @@ -4302,11 +4261,11 @@ EditTextChange - AccountPayableByDocumentsAgreementEditTextChange + AccountPayableByAgreementsAgreementEditTextChange StartChoice - AccountPayableByDocumentsAgreementStartChoice + AccountPayableByAgreementsAgreementStartChoice true true @@ -4317,19 +4276,19 @@ - AccountPayableByDocumentsLegalNameContract - 1054 + AccountPayableByAgreementsLegalNameContract + 1051 true true true - Object.AccountPayableByDocuments.LegalNameContract + Object.AccountPayableByAgreements.LegalNameContract - AccountPayableByDocumentsLegalNameContractExtendedTooltip - 1056 + AccountPayableByAgreementsLegalNameContractExtendedTooltip + 1053 true true @@ -4343,8 +4302,8 @@ - AccountPayableByDocumentsLegalNameContractContextMenu - 1055 + AccountPayableByAgreementsLegalNameContractContextMenu + 1052 true true @@ -4367,19 +4326,19 @@ - AccountPayableByDocumentsCurrency - 674 + AccountPayableByAgreementsCurrency + 637 true true true - Object.AccountPayableByDocuments.Currency + Object.AccountPayableByAgreements.Currency - AccountPayableByDocumentsCurrencyExtendedTooltip - 676 + AccountPayableByAgreementsCurrencyExtendedTooltip + 639 true true @@ -4393,8 +4352,8 @@ - AccountPayableByDocumentsCurrencyContextMenu - 675 + AccountPayableByAgreementsCurrencyContextMenu + 638 true true @@ -4417,19 +4376,19 @@ - AccountPayableByDocumentsAmount - 677 + AccountPayableByAgreementsAmount + 640 true true true - Object.AccountPayableByDocuments.Amount + Object.AccountPayableByAgreements.Amount - AccountPayableByDocumentsAmountExtendedTooltip - 679 + AccountPayableByAgreementsAmountExtendedTooltip + 642 true true @@ -4443,8 +4402,8 @@ - AccountPayableByDocumentsAmountContextMenu - 678 + AccountPayableByAgreementsAmountContextMenu + 641 true true @@ -4467,19 +4426,19 @@ - AccountPayableByDocumentsCommandBar - 644 + AccountPayableByAgreementsCommandBar + 610 - EditCurrenciesAccountPayableByDocuments - 1158 + EditCurrenciesAccountPayableByAgreements + 1156 true true true - EditCurrenciesAccountPayableByDocumentsExtendedTooltip - 1159 + EditCurrenciesAccountPayableByAgreementsExtendedTooltip + 1157 true true @@ -4492,7 +4451,7 @@ Left - Form.Command.EditCurrenciesAccountPayableByDocuments + Form.Command.EditCurrenciesAccountPayableByAgreements Auto true true @@ -4507,17 +4466,9 @@ Left true - - OnActivateRow - AccountPayableByDocumentsOnActivateRow - - - AfterDeleteRow - AccountPayableByDocumentsAfterDeleteRow - OnActivateCell - AccountPayableByDocumentsOnActivateCell + AccountPayableByAgreementsOnActivateCell OnChange @@ -4529,11 +4480,11 @@ true - AccountPayableByDocumentsSearchString - 647 + AccountPayableByAgreementsSearchString + 613 - AccountPayableByDocumentsSearchStringExtendedTooltip - 649 + AccountPayableByAgreementsSearchStringExtendedTooltip + 615 true true @@ -4547,8 +4498,8 @@ - AccountPayableByDocumentsSearchStringContextMenu - 648 + AccountPayableByAgreementsSearchStringContextMenu + 614 true true @@ -4556,7 +4507,7 @@ true - AccountPayableByDocumentsSearchString + AccountPayableByAgreementsSearchString true @@ -4567,11 +4518,11 @@ true - AccountPayableByDocumentsViewStatus - 653 + AccountPayableByAgreementsViewStatus + 619 - AccountPayableByDocumentsViewStatusExtendedTooltip - 655 + AccountPayableByAgreementsViewStatusExtendedTooltip + 621 true true @@ -4585,8 +4536,8 @@ - AccountPayableByDocumentsViewStatusContextMenu - 654 + AccountPayableByAgreementsViewStatusContextMenu + 620 true true @@ -4595,7 +4546,7 @@ true ViewStatusAddition - AccountPayableByDocumentsViewStatus + AccountPayableByAgreementsViewStatus true Left @@ -4607,11 +4558,11 @@ true - AccountPayableByDocumentsSearchControl - 650 + AccountPayableByAgreementsSearchControl + 616 - AccountPayableByDocumentsSearchControlExtendedTooltip - 652 + AccountPayableByAgreementsSearchControlExtendedTooltip + 618 true true @@ -4625,8 +4576,8 @@ - AccountPayableByDocumentsSearchControlContextMenu - 651 + AccountPayableByAgreementsSearchControlContextMenu + 617 true true @@ -4635,14 +4586,14 @@ true SearchControlAddition - AccountPayableByDocumentsSearchControl + AccountPayableByAgreementsSearchControl true - AccountPayableByDocumentsExtendedTooltip - 646 + AccountPayableByAgreementsExtendedTooltip + 612 true true @@ -4656,8 +4607,8 @@ - AccountPayableByDocumentsContextMenu - 645 + AccountPayableByAgreementsContextMenu + 611 true true @@ -4685,31 +4636,72 @@ AsFileRef + true + true + + true + + + <key>en</key> + <value>By agreements</value> + + + <key>ru</key> + <value>По соглашениям</value> + + + <key>tr</key> + <value>Sözleşme detaylı</value> + + + GroupAccountPayableByAgreementsExtendedTooltip + 598 + true + true + + true + + Label + true + true + + Left + + + Page + + Vertical + true + + + + GroupAccountPayableByDocuments + 599 - VendorsPaymentTerms - 1011 + AccountPayableByDocuments + 643 true true true - Object.VendorsPaymentTerms + Object.AccountPayableByDocuments None - VendorsPaymentTermsKey - 1132 + AccountPayableByDocumentsKey + 1129 true true - Object.VendorsPaymentTerms.Key + Object.AccountPayableByDocuments.Key - VendorsPaymentTermsKeyExtendedTooltip - 1134 + AccountPayableByDocumentsKeyExtendedTooltip + 1131 true true @@ -4723,8 +4715,8 @@ - VendorsPaymentTermsKeyContextMenu - 1133 + AccountPayableByDocumentsKeyContextMenu + 1130 true true @@ -4747,19 +4739,19 @@ - VendorsPaymentTermsCalculationType - 1030 + AccountPayableByDocumentsLineNumber + 656 true true true - Object.VendorsPaymentTerms.CalculationType + Object.AccountPayableByDocuments.LineNumber - VendorsPaymentTermsCalculationTypeExtendedTooltip - 1032 + AccountPayableByDocumentsLineNumberExtendedTooltip + 658 true true @@ -4773,8 +4765,8 @@ - VendorsPaymentTermsCalculationTypeContextMenu - 1031 + AccountPayableByDocumentsLineNumberContextMenu + 657 true true @@ -4797,19 +4789,23 @@ - VendorsPaymentTermsDate - 1033 + AccountPayableByDocumentsPartner + 665 true true true - Object.VendorsPaymentTerms.Date + Object.AccountPayableByDocuments.Partner + + OnChange + AccountPayableByDocumentsPartnerOnChange + - VendorsPaymentTermsDateExtendedTooltip - 1035 + AccountPayableByDocumentsPartnerExtendedTooltip + 667 true true @@ -4823,8 +4819,8 @@ - VendorsPaymentTermsDateContextMenu - 1034 + AccountPayableByDocumentsPartnerContextMenu + 666 true true @@ -4844,22 +4840,30 @@ true true true + + Filter.Vendor + + + true + + + - VendorsPaymentTermsAmount - 1036 + AccountPayableByDocumentsLegalName + 668 true true true - Object.VendorsPaymentTerms.Amount + Object.AccountPayableByDocuments.LegalName - VendorsPaymentTermsAmountExtendedTooltip - 1038 + AccountPayableByDocumentsLegalNameExtendedTooltip + 670 true true @@ -4873,8 +4877,8 @@ - VendorsPaymentTermsAmountContextMenu - 1037 + AccountPayableByDocumentsLegalNameContextMenu + 669 true true @@ -4888,6 +4892,14 @@ Left true + + EditTextChange + MainTableLegalNameEditTextChange + + + StartChoice + MainTableLegalNameStartChoice + true true true @@ -4896,32 +4908,82 @@ true - - VendorsPaymentTermsCommandBar - 1012 + + AccountPayableByDocumentsAgreement + 671 true true true - Left - true - - - BeforeAddRow - VendorsPaymentTermsBeforeAddRow - - + + Object.AccountPayableByDocuments.Agreement + + + OnChange + AgreementOnChange + + + AccountPayableByDocumentsAgreementExtendedTooltip + 673 + true + true + + true + + Label + true + true + + Left + + + + AccountPayableByDocumentsAgreementContextMenu + 672 + true + true + + true + + true + + InputField + Enter + true + Left + true + + + EditTextChange + AccountPayableByDocumentsAgreementEditTextChange + + + StartChoice + AccountPayableByDocumentsAgreementStartChoice + + true + true + true + true + true + true + + + + AccountPayableByDocumentsLegalNameContract + 1054 true true true - VendorsPaymentTermsSearchString - 1015 + + Object.AccountPayableByDocuments.LegalNameContract + - VendorsPaymentTermsSearchStringExtendedTooltip - 1017 + AccountPayableByDocumentsLegalNameContractExtendedTooltip + 1056 true true @@ -4935,8 +4997,8 @@ - VendorsPaymentTermsSearchStringContextMenu - 1016 + AccountPayableByDocumentsLegalNameContractContextMenu + 1055 true true @@ -4944,22 +5006,34 @@ true - VendorsPaymentTermsSearchString - + InputField + Enter + true + Left + true + true + true + true + true + true + true - - + + + AccountPayableByDocumentsCurrency + 674 true true true - VendorsPaymentTermsViewStatus - 1021 + + Object.AccountPayableByDocuments.Currency + - VendorsPaymentTermsViewStatusExtendedTooltip - 1023 + AccountPayableByDocumentsCurrencyExtendedTooltip + 676 true true @@ -4973,8 +5047,8 @@ - VendorsPaymentTermsViewStatusContextMenu - 1022 + AccountPayableByDocumentsCurrencyContextMenu + 675 true true @@ -4982,23 +5056,34 @@ true - ViewStatusAddition - VendorsPaymentTermsViewStatus - + InputField + Enter + true + Left + true + true + true + true + true + true + true - - + + + AccountPayableByDocumentsAmount + 677 true true true - VendorsPaymentTermsSearchControl - 1018 + + Object.AccountPayableByDocuments.Amount + - VendorsPaymentTermsSearchControlExtendedTooltip - 1020 + AccountPayableByDocumentsAmountExtendedTooltip + 679 true true @@ -5012,8 +5097,8 @@ - VendorsPaymentTermsSearchControlContextMenu - 1019 + AccountPayableByDocumentsAmountContextMenu + 678 true true @@ -5021,205 +5106,88 @@ true - SearchControlAddition - VendorsPaymentTermsSearchControl - + InputField + Enter + true + Left + true + true + true + true + true + true + true - - - VendorsPaymentTermsExtendedTooltip - 1014 + + + AccountPayableByDocumentsCommandBar + 644 + + EditCurrenciesAccountPayableByDocuments + 1158 + true + true + + true + + + EditCurrenciesAccountPayableByDocumentsExtendedTooltip + 1159 + true + true + + true + + Label + true + true + + Left + + + Form.Command.EditCurrenciesAccountPayableByDocuments + Auto + true + true + UserCmds + Auto + true true true - Label - true - true - - Left - - - - VendorsPaymentTermsContextMenu - 1013 + Left + true + + + OnActivateRow + AccountPayableByDocumentsOnActivateRow + + + AfterDeleteRow + AccountPayableByDocumentsAfterDeleteRow + + + OnActivateCell + AccountPayableByDocumentsOnActivateCell + + + OnChange + MainTableOnChange + + true true true - true - - true - true - true - true - true - MultiRow -
true
- 1 - 1 - AutoUse - AutoUse - true - true - Auto - Auto - true - true - AsFileRef - - - true - true - - true - - - <key>en</key> - <value>By documents</value> - - - <key>ru</key> - <value>По документам</value> - - - <key>tr</key> - <value>Evrak detaylı</value> - - - GroupAccountPayableByDocumentsExtendedTooltip - 600 - true - true - - true - - Label - true - true - - Left - - - Page - - Vertical - true - - - true - true - - true - - - <key>en</key> - <value>Group account payable by agreements and by documents</value> - - - <key>ru</key> - <value>Группа взаиморасчеты с поставщиками по соглашениям и по документам</value> - - - <key>tr</key> - <value>Grup Cari hesap (A/P tedarikçi), sözleşme ve evrak detaylı</value> - - - GroupAccountPayableByAgreementsAndByDocumentsExtendedTooltip - 596 - true - true - - true - - Label - true - true - - Left - - - Pages - - TabsOnTop - Auto - - - true - true - - true - - - <key>en</key> - <value>Account payable</value> - - - <key>ru</key> - <value>Взаиморасчеты с поставщиками</value> - - - <key>tr</key> - <value>Cari hesap alacakları</value> - - - GroupAccountPayableExtendedTooltip - 594 - true - true - - true - - Label - true - true - - Left - - - Page - - Vertical - true - - - - GroupAccountReceivable - 601 - - GroupAccountReceivableByAgreementsAndByDocuments - 603 - - GroupAccountReceivableByAgreements - 605 - - AccountReceivableByAgreements - 680 - true - true - - true - - - Object.AccountReceivableByAgreements - - None - - AccountReceivableByAgreementsKey - 1135 - true - - true - - - Object.AccountReceivableByAgreements.Key - + AccountPayableByDocumentsSearchString + 647 - AccountReceivableByAgreementsKeyExtendedTooltip - 1137 + AccountPayableByDocumentsSearchStringExtendedTooltip + 649 true true @@ -5233,8 +5201,8 @@ - AccountReceivableByAgreementsKeyContextMenu - 1136 + AccountPayableByDocumentsSearchStringContextMenu + 648 true true @@ -5242,34 +5210,22 @@ true - InputField - Enter - true - Left - true - + AccountPayableByDocumentsSearchString + true - true - true - true - true - true - - - AccountReceivableByAgreementsLineNumber - 693 + + true true true - - Object.AccountReceivableByAgreements.LineNumber - + AccountPayableByDocumentsViewStatus + 653 - AccountReceivableByAgreementsLineNumberExtendedTooltip - 695 + AccountPayableByDocumentsViewStatusExtendedTooltip + 655 true true @@ -5283,8 +5239,8 @@ - AccountReceivableByAgreementsLineNumberContextMenu - 694 + AccountPayableByDocumentsViewStatusContextMenu + 654 true true @@ -5292,38 +5248,24 @@ true - InputField - Enter - true - Left - true - + ViewStatusAddition + AccountPayableByDocumentsViewStatus + true - true - true - true - true - true + Left - - - AccountReceivableByAgreementsPartner - 699 + + true true true - - Object.AccountReceivableByAgreements.Partner - - - OnChange - AccountReceivableByAgreementsPartnerOnChange - + AccountPayableByDocumentsSearchControl + 650 - AccountReceivableByAgreementsPartnerExtendedTooltip - 701 + AccountPayableByDocumentsSearchControlExtendedTooltip + 652 true true @@ -5337,8 +5279,8 @@ - AccountReceivableByAgreementsPartnerContextMenu - 700 + AccountPayableByDocumentsSearchControlContextMenu + 651 true true @@ -5346,104 +5288,82 @@ true - InputField - Enter - true - Left - true - + SearchControlAddition + AccountPayableByDocumentsSearchControl + true - true - true - true - true - true - - Filter.Customer - - - true - - - - - - AccountReceivableByAgreementsLegalName - 702 + + + AccountPayableByDocumentsExtendedTooltip + 646 true true true - - Object.AccountReceivableByAgreements.LegalName - - - AccountReceivableByAgreementsLegalNameExtendedTooltip - 704 - true - true - - true - - Label - true - true - - Left - - - - AccountReceivableByAgreementsLegalNameContextMenu - 703 - true - true - - true - - true - - InputField - Enter - true - Left - true - - - EditTextChange - MainTableLegalNameEditTextChange - - - StartChoice - MainTableLegalNameStartChoice - - true - true - true - true - true - true + Label + true + true + + Left - - - AccountReceivableByAgreementsAgreement - 705 + + + AccountPayableByDocumentsContextMenu + 645 true true true + true + + true + true + true + true + true + MultiRow +
true
+ 1 + 1 + AutoUse + AutoUse + true + true + Auto + Auto + true + true + AsFileRef + + + + VendorsPaymentTerms + 1011 + true + true + + true + + + Object.VendorsPaymentTerms + + None + + VendorsPaymentTermsKey + 1132 + true + + true + - Object.AccountReceivableByAgreements.Agreement + Object.VendorsPaymentTerms.Key - - OnChange - AgreementOnChange - - AccountReceivableByAgreementsAgreementExtendedTooltip - 707 + VendorsPaymentTermsKeyExtendedTooltip + 1134 true true @@ -5457,8 +5377,8 @@ - AccountReceivableByAgreementsAgreementContextMenu - 706 + VendorsPaymentTermsKeyContextMenu + 1133 true true @@ -5472,14 +5392,6 @@ Left true - - EditTextChange - AccountReceivableByAgreementsAgreementEditTextChange - - - StartChoice - AccountReceivableByAgreementsAgreementStartChoice - true true true @@ -5489,19 +5401,19 @@ - AccountReceivableByAgreementsLegalNameContract - 1057 + VendorsPaymentTermsCalculationType + 1030 true true true - Object.AccountReceivableByAgreements.LegalNameContract + Object.VendorsPaymentTerms.CalculationType - AccountReceivableByAgreementsLegalNameContractExtendedTooltip - 1059 + VendorsPaymentTermsCalculationTypeExtendedTooltip + 1032 true true @@ -5515,8 +5427,8 @@ - AccountReceivableByAgreementsLegalNameContractContextMenu - 1058 + VendorsPaymentTermsCalculationTypeContextMenu + 1031 true true @@ -5539,19 +5451,19 @@ - AccountReceivableByAgreementsCurrency - 708 + VendorsPaymentTermsDate + 1033 true true true - Object.AccountReceivableByAgreements.Currency + Object.VendorsPaymentTerms.Date - AccountReceivableByAgreementsCurrencyExtendedTooltip - 710 + VendorsPaymentTermsDateExtendedTooltip + 1035 true true @@ -5565,8 +5477,8 @@ - AccountReceivableByAgreementsCurrencyContextMenu - 709 + VendorsPaymentTermsDateContextMenu + 1034 true true @@ -5589,19 +5501,19 @@ - AccountReceivableByAgreementsAmount - 711 + VendorsPaymentTermsAmount + 1036 true true true - Object.AccountReceivableByAgreements.Amount + Object.VendorsPaymentTerms.Amount - AccountReceivableByAgreementsAmountExtendedTooltip - 713 + VendorsPaymentTermsAmountExtendedTooltip + 1038 true true @@ -5615,8 +5527,8 @@ - AccountReceivableByAgreementsAmountContextMenu - 712 + VendorsPaymentTermsAmountContextMenu + 1037 true true @@ -5639,38 +5551,8 @@ - AccountReceivableByAgreementsCommandBar - 681 - - EditCurrenciesAccountReceivableByAgreements - 1152 - true - true - - true - - - EditCurrenciesAccountReceivableByAgreementsExtendedTooltip - 1153 - true - true - - true - - Label - true - true - - Left - - - Form.Command.EditCurrenciesAccountReceivableByAgreements - Auto - true - true - UserCmds - Auto - + VendorsPaymentTermsCommandBar + 1012 true true @@ -5680,12 +5562,8 @@ true - OnActivateCell - AccountReceivableByAgreementsOnActivateCell - - - OnChange - MainTableOnChange + BeforeAddRow + VendorsPaymentTermsBeforeAddRow true @@ -5693,11 +5571,11 @@ true - AccountReceivableByAgreementsSearchString - 684 + VendorsPaymentTermsSearchString + 1015 - AccountReceivableByAgreementsSearchStringExtendedTooltip - 686 + VendorsPaymentTermsSearchStringExtendedTooltip + 1017 true true @@ -5711,8 +5589,8 @@ - AccountReceivableByAgreementsSearchStringContextMenu - 685 + VendorsPaymentTermsSearchStringContextMenu + 1016 true true @@ -5720,7 +5598,7 @@ true - AccountReceivableByAgreementsSearchString + VendorsPaymentTermsSearchString true @@ -5731,11 +5609,11 @@ true - AccountReceivableByAgreementsViewStatus - 690 + VendorsPaymentTermsViewStatus + 1021 - AccountReceivableByAgreementsViewStatusExtendedTooltip - 692 + VendorsPaymentTermsViewStatusExtendedTooltip + 1023 true true @@ -5749,8 +5627,8 @@ - AccountReceivableByAgreementsViewStatusContextMenu - 691 + VendorsPaymentTermsViewStatusContextMenu + 1022 true true @@ -5759,10 +5637,9 @@ true ViewStatusAddition - AccountReceivableByAgreementsViewStatus + VendorsPaymentTermsViewStatus true - Left @@ -5771,11 +5648,11 @@ true - AccountReceivableByAgreementsSearchControl - 687 + VendorsPaymentTermsSearchControl + 1018 - AccountReceivableByAgreementsSearchControlExtendedTooltip - 689 + VendorsPaymentTermsSearchControlExtendedTooltip + 1020 true true @@ -5789,8 +5666,8 @@ - AccountReceivableByAgreementsSearchControlContextMenu - 688 + VendorsPaymentTermsSearchControlContextMenu + 1019 true true @@ -5799,14 +5676,14 @@ true SearchControlAddition - AccountReceivableByAgreementsSearchControl + VendorsPaymentTermsSearchControl true - AccountReceivableByAgreementsExtendedTooltip - 683 + VendorsPaymentTermsExtendedTooltip + 1014 true true @@ -5820,8 +5697,8 @@ - AccountReceivableByAgreementsContextMenu - 682 + VendorsPaymentTermsContextMenu + 1013 true true @@ -5856,19 +5733,19 @@ <key>en</key> - <value>By agreements</value> + <value>By documents</value> <key>ru</key> - <value>По соглашениям</value> + <value>По документам</value> <key>tr</key> - <value>Sözleşme detaylı</value> + <value>Evrak detaylı</value> - GroupAccountReceivableByAgreementsExtendedTooltip - 606 + GroupAccountPayableByDocumentsExtendedTooltip + 600 true true @@ -5887,34 +5764,116 @@ true + true + true + + true + + + <key>en</key> + <value>Group account payable by agreements and by documents</value> + + + <key>ru</key> + <value>Группа взаиморасчеты с поставщиками по соглашениям и по документам</value> + + + <key>tr</key> + <value>Grup Cari hesap (A/P tedarikçi), sözleşme ve evrak detaylı</value> + + + GroupAccountPayableByAgreementsAndByDocumentsExtendedTooltip + 596 + true + true + + true + + Label + true + true + + Left + + + Pages + + TabsOnTop + Auto + + + true + true + + true + + + <key>en</key> + <value>Account payable</value> + + + <key>ru</key> + <value>Взаиморасчеты с поставщиками</value> + + + <key>tr</key> + <value>Cari hesap alacakları</value> + + + GroupAccountPayableExtendedTooltip + 594 + true + true + + true + + Label + true + true + + Left + + + Page + + Vertical + true + + + + GroupAccountReceivable + 601 + + GroupAccountReceivableByAgreementsAndByDocuments + 603 - GroupAccountReceivableByDocuments - 607 + GroupAccountReceivableByAgreements + 605 - AccountReceivableByDocuments - 714 + AccountReceivableByAgreements + 680 true true true - Object.AccountReceivableByDocuments + Object.AccountReceivableByAgreements None - AccountReceivableByDocumentsKey - 1138 + AccountReceivableByAgreementsKey + 1135 true true - Object.AccountReceivableByDocuments.Key + Object.AccountReceivableByAgreements.Key - AccountReceivableByDocumentsKeyExtendedTooltip - 1140 + AccountReceivableByAgreementsKeyExtendedTooltip + 1137 true true @@ -5928,8 +5887,8 @@ - AccountReceivableByDocumentsKeyContextMenu - 1139 + AccountReceivableByAgreementsKeyContextMenu + 1136 true true @@ -5952,19 +5911,19 @@ - AccountReceivableByDocumentsLineNumber - 727 + AccountReceivableByAgreementsLineNumber + 693 true true true - Object.AccountReceivableByDocuments.LineNumber + Object.AccountReceivableByAgreements.LineNumber - AccountReceivableByDocumentsLineNumberExtendedTooltip - 729 + AccountReceivableByAgreementsLineNumberExtendedTooltip + 695 true true @@ -5978,8 +5937,8 @@ - AccountReceivableByDocumentsLineNumberContextMenu - 728 + AccountReceivableByAgreementsLineNumberContextMenu + 694 true true @@ -6002,23 +5961,23 @@ - AccountReceivableByDocumentsPartner - 736 + AccountReceivableByAgreementsPartner + 699 true true true - Object.AccountReceivableByDocuments.Partner + Object.AccountReceivableByAgreements.Partner OnChange - AccountReceivableByDocumentsPartnerOnChange + AccountReceivableByAgreementsPartnerOnChange - AccountReceivableByDocumentsPartnerExtendedTooltip - 738 + AccountReceivableByAgreementsPartnerExtendedTooltip + 701 true true @@ -6032,8 +5991,8 @@ - AccountReceivableByDocumentsPartnerContextMenu - 737 + AccountReceivableByAgreementsPartnerContextMenu + 700 true true @@ -6064,19 +6023,19 @@ - AccountReceivableByDocumentsLegalName - 739 + AccountReceivableByAgreementsLegalName + 702 true true true - Object.AccountReceivableByDocuments.LegalName + Object.AccountReceivableByAgreements.LegalName - AccountReceivableByDocumentsLegalNameExtendedTooltip - 741 + AccountReceivableByAgreementsLegalNameExtendedTooltip + 704 true true @@ -6090,8 +6049,8 @@ - AccountReceivableByDocumentsLegalNameContextMenu - 740 + AccountReceivableByAgreementsLegalNameContextMenu + 703 true true @@ -6122,23 +6081,23 @@ - AccountReceivableByDocumentsAgreement - 742 + AccountReceivableByAgreementsAgreement + 705 true true true - Object.AccountReceivableByDocuments.Agreement + Object.AccountReceivableByAgreements.Agreement OnChange AgreementOnChange - AccountReceivableByDocumentsAgreementExtendedTooltip - 744 + AccountReceivableByAgreementsAgreementExtendedTooltip + 707 true true @@ -6152,8 +6111,8 @@ - AccountReceivableByDocumentsAgreementContextMenu - 743 + AccountReceivableByAgreementsAgreementContextMenu + 706 true true @@ -6169,11 +6128,11 @@ EditTextChange - AccountReceivableByDocumentsAgreementEditTextChange + AccountReceivableByAgreementsAgreementEditTextChange StartChoice - AccountReceivableByDocumentsAgreementStartChoice + AccountReceivableByAgreementsAgreementStartChoice true true @@ -6184,19 +6143,19 @@ - AccountReceivableByDocumentsLegalNameContract - 1060 + AccountReceivableByAgreementsLegalNameContract + 1057 true true true - Object.AccountReceivableByDocuments.LegalNameContract + Object.AccountReceivableByAgreements.LegalNameContract - AccountReceivableByDocumentsLegalNameContractExtendedTooltip - 1062 + AccountReceivableByAgreementsLegalNameContractExtendedTooltip + 1059 true true @@ -6210,8 +6169,8 @@ - AccountReceivableByDocumentsLegalNameContractContextMenu - 1061 + AccountReceivableByAgreementsLegalNameContractContextMenu + 1058 true true @@ -6234,19 +6193,19 @@ - AccountReceivableByDocumentsCurrency - 745 + AccountReceivableByAgreementsCurrency + 708 true true true - Object.AccountReceivableByDocuments.Currency + Object.AccountReceivableByAgreements.Currency - AccountReceivableByDocumentsCurrencyExtendedTooltip - 747 + AccountReceivableByAgreementsCurrencyExtendedTooltip + 710 true true @@ -6260,8 +6219,8 @@ - AccountReceivableByDocumentsCurrencyContextMenu - 746 + AccountReceivableByAgreementsCurrencyContextMenu + 709 true true @@ -6284,19 +6243,19 @@ - AccountReceivableByDocumentsAmount - 748 + AccountReceivableByAgreementsAmount + 711 true true true - Object.AccountReceivableByDocuments.Amount + Object.AccountReceivableByAgreements.Amount - AccountReceivableByDocumentsAmountExtendedTooltip - 750 + AccountReceivableByAgreementsAmountExtendedTooltip + 713 true true @@ -6310,8 +6269,8 @@ - AccountReceivableByDocumentsAmountContextMenu - 749 + AccountReceivableByAgreementsAmountContextMenu + 712 true true @@ -6334,19 +6293,19 @@ - AccountReceivableByDocumentsCommandBar - 715 + AccountReceivableByAgreementsCommandBar + 681 - EditCurrenciesAccountReceivableByDocuments - 1154 + EditCurrenciesAccountReceivableByAgreements + 1152 true true true - EditCurrenciesAccountReceivableByDocumentsExtendedTooltip - 1155 + EditCurrenciesAccountReceivableByAgreementsExtendedTooltip + 1153 true true @@ -6359,7 +6318,7 @@ Left - Form.Command.EditCurrenciesAccountReceivableByDocuments + Form.Command.EditCurrenciesAccountReceivableByAgreements Auto true true @@ -6372,531 +6331,2517 @@ true Left - true - - - OnActivateRow - AccountReceivableByDocumentsOnActivateRow - + true + + + OnActivateCell + AccountReceivableByAgreementsOnActivateCell + + + OnChange + MainTableOnChange + + + true + true + + true + + AccountReceivableByAgreementsSearchString + 684 + + AccountReceivableByAgreementsSearchStringExtendedTooltip + 686 + true + true + + true + + Label + true + true + + Left + + + + AccountReceivableByAgreementsSearchStringContextMenu + 685 + true + true + + true + + true + + AccountReceivableByAgreementsSearchString + + true + + + + true + true + + true + + AccountReceivableByAgreementsViewStatus + 690 + + AccountReceivableByAgreementsViewStatusExtendedTooltip + 692 + true + true + + true + + Label + true + true + + Left + + + + AccountReceivableByAgreementsViewStatusContextMenu + 691 + true + true + + true + + true + + ViewStatusAddition + AccountReceivableByAgreementsViewStatus + + true + Left + + + + true + true + + true + + AccountReceivableByAgreementsSearchControl + 687 + + AccountReceivableByAgreementsSearchControlExtendedTooltip + 689 + true + true + + true + + Label + true + true + + Left + + + + AccountReceivableByAgreementsSearchControlContextMenu + 688 + true + true + + true + + true + + SearchControlAddition + AccountReceivableByAgreementsSearchControl + + true + + + + AccountReceivableByAgreementsExtendedTooltip + 683 + true + true + + true + + Label + true + true + + Left + + + + AccountReceivableByAgreementsContextMenu + 682 + true + true + + true + + true + + true + true + true + true + true + MultiRow +
true
+ 1 + 1 + AutoUse + AutoUse + true + true + Auto + Auto + true + true + AsFileRef + + + true + true + + true + + + <key>en</key> + <value>By agreements</value> + + + <key>ru</key> + <value>По соглашениям</value> + + + <key>tr</key> + <value>Sözleşme detaylı</value> + + + GroupAccountReceivableByAgreementsExtendedTooltip + 606 + true + true + + true + + Label + true + true + + Left + + + Page + + Vertical + true + + + + GroupAccountReceivableByDocuments + 607 + + AccountReceivableByDocuments + 714 + true + true + + true + + + Object.AccountReceivableByDocuments + + None + + AccountReceivableByDocumentsKey + 1138 + true + + true + + + Object.AccountReceivableByDocuments.Key + + + AccountReceivableByDocumentsKeyExtendedTooltip + 1140 + true + true + + true + + Label + true + true + + Left + + + + AccountReceivableByDocumentsKeyContextMenu + 1139 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + AccountReceivableByDocumentsLineNumber + 727 + true + true + + true + + + Object.AccountReceivableByDocuments.LineNumber + + + AccountReceivableByDocumentsLineNumberExtendedTooltip + 729 + true + true + + true + + Label + true + true + + Left + + + + AccountReceivableByDocumentsLineNumberContextMenu + 728 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + AccountReceivableByDocumentsPartner + 736 + true + true + + true + + + Object.AccountReceivableByDocuments.Partner + + + OnChange + AccountReceivableByDocumentsPartnerOnChange + + + AccountReceivableByDocumentsPartnerExtendedTooltip + 738 + true + true + + true + + Label + true + true + + Left + + + + AccountReceivableByDocumentsPartnerContextMenu + 737 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + Filter.Customer + + + true + + + + + + + AccountReceivableByDocumentsLegalName + 739 + true + true + + true + + + Object.AccountReceivableByDocuments.LegalName + + + AccountReceivableByDocumentsLegalNameExtendedTooltip + 741 + true + true + + true + + Label + true + true + + Left + + + + AccountReceivableByDocumentsLegalNameContextMenu + 740 + true + true + + true + + true + + InputField + Enter + true + Left + true + + + EditTextChange + MainTableLegalNameEditTextChange + + + StartChoice + MainTableLegalNameStartChoice + + true + true + true + true + true + true + + + + AccountReceivableByDocumentsAgreement + 742 + true + true + + true + + + Object.AccountReceivableByDocuments.Agreement + + + OnChange + AgreementOnChange + + + AccountReceivableByDocumentsAgreementExtendedTooltip + 744 + true + true + + true + + Label + true + true + + Left + + + + AccountReceivableByDocumentsAgreementContextMenu + 743 + true + true + + true + + true + + InputField + Enter + true + Left + true + + + EditTextChange + AccountReceivableByDocumentsAgreementEditTextChange + + + StartChoice + AccountReceivableByDocumentsAgreementStartChoice + + true + true + true + true + true + true + + + + AccountReceivableByDocumentsLegalNameContract + 1060 + true + true + + true + + + Object.AccountReceivableByDocuments.LegalNameContract + + + AccountReceivableByDocumentsLegalNameContractExtendedTooltip + 1062 + true + true + + true + + Label + true + true + + Left + + + + AccountReceivableByDocumentsLegalNameContractContextMenu + 1061 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + AccountReceivableByDocumentsCurrency + 745 + true + true + + true + + + Object.AccountReceivableByDocuments.Currency + + + AccountReceivableByDocumentsCurrencyExtendedTooltip + 747 + true + true + + true + + Label + true + true + + Left + + + + AccountReceivableByDocumentsCurrencyContextMenu + 746 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + AccountReceivableByDocumentsAmount + 748 + true + true + + true + + + Object.AccountReceivableByDocuments.Amount + + + AccountReceivableByDocumentsAmountExtendedTooltip + 750 + true + true + + true + + Label + true + true + + Left + + + + AccountReceivableByDocumentsAmountContextMenu + 749 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + AccountReceivableByDocumentsCommandBar + 715 + + EditCurrenciesAccountReceivableByDocuments + 1154 + true + true + + true + + + EditCurrenciesAccountReceivableByDocumentsExtendedTooltip + 1155 + true + true + + true + + Label + true + true + + Left + + + Form.Command.EditCurrenciesAccountReceivableByDocuments + Auto + true + true + UserCmds + Auto + + true + true + + true + + Left + true + + + OnActivateRow + AccountReceivableByDocumentsOnActivateRow + + + AfterDeleteRow + AccountReceivableByDocumentsAfterDeleteRow + + + OnActivateCell + AccountReceivableByDocumentsOnActivateCell + + + OnChange + MainTableOnChange + + + true + true + + true + + AccountReceivableByDocumentsSearchString + 718 + + AccountReceivableByDocumentsSearchStringExtendedTooltip + 720 + true + true + + true + + Label + true + true + + Left + + + + AccountReceivableByDocumentsSearchStringContextMenu + 719 + true + true + + true + + true + + AccountReceivableByDocumentsSearchString + + true + + + + true + true + + true + + AccountReceivableByDocumentsViewStatus + 724 + + AccountReceivableByDocumentsViewStatusExtendedTooltip + 726 + true + true + + true + + Label + true + true + + Left + + + + AccountReceivableByDocumentsViewStatusContextMenu + 725 + true + true + + true + + true + + ViewStatusAddition + AccountReceivableByDocumentsViewStatus + + true + Left + + + + true + true + + true + + AccountReceivableByDocumentsSearchControl + 721 + + AccountReceivableByDocumentsSearchControlExtendedTooltip + 723 + true + true + + true + + Label + true + true + + Left + + + + AccountReceivableByDocumentsSearchControlContextMenu + 722 + true + true + + true + + true + + SearchControlAddition + AccountReceivableByDocumentsSearchControl + + true + + + + AccountReceivableByDocumentsExtendedTooltip + 717 + true + true + + true + + Label + true + true + + Left + + + + AccountReceivableByDocumentsContextMenu + 716 + true + true + + true + + true + + true + true + true + true + true + MultiRow +
true
+ 1 + 1 + AutoUse + AutoUse + true + true + Auto + Auto + true + true + AsFileRef + + + + CustomersPaymentTerms + 974 + true + true + + true + + + Object.CustomersPaymentTerms + + None + + CustomersPaymentTermsKey + 1141 + true + + true + + + Object.CustomersPaymentTerms.Key + + + CustomersPaymentTermsKeyExtendedTooltip + 1143 + true + true + + true + + Label + true + true + + Left + + + + CustomersPaymentTermsKeyContextMenu + 1142 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + CustomersPaymentTermsCalculationType + 1005 + true + true + + true + + + Object.CustomersPaymentTerms.CalculationType + + + CustomersPaymentTermsCalculationTypeExtendedTooltip + 1007 + true + true + + true + + Label + true + true + + Left + + + + CustomersPaymentTermsCalculationTypeContextMenu + 1006 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + CustomersPaymentTermsDate + 993 + true + true + + true + + + Object.CustomersPaymentTerms.Date + + + CustomersPaymentTermsDateExtendedTooltip + 995 + true + true + + true + + Label + true + true + + Left + + + + CustomersPaymentTermsDateContextMenu + 994 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + CustomersPaymentTermsAmount + 1002 + true + true + + true + + + Object.CustomersPaymentTerms.Amount + + + CustomersPaymentTermsAmountExtendedTooltip + 1004 + true + true + + true + + Label + true + true + + Left + + + + CustomersPaymentTermsAmountContextMenu + 1003 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + CustomersPaymentTermsCommandBar + 975 + true + true + + true + + Left + true + + + BeforeAddRow + CustomersPaymentTermsBeforeAddRow + + + true + true + + true + + CustomersPaymentTermsSearchString + 978 + + CustomersPaymentTermsSearchStringExtendedTooltip + 980 + true + true + + true + + Label + true + true + + Left + + + + CustomersPaymentTermsSearchStringContextMenu + 979 + true + true + + true + + true + + CustomersPaymentTermsSearchString + + true + + + + true + true + + true + + CustomersPaymentTermsViewStatus + 984 + + CustomersPaymentTermsViewStatusExtendedTooltip + 986 + true + true + + true + + Label + true + true + + Left + + + + CustomersPaymentTermsViewStatusContextMenu + 985 + true + true + + true + + true + + ViewStatusAddition + CustomersPaymentTermsViewStatus + + true + + + + true + true + + true + + CustomersPaymentTermsSearchControl + 981 + + CustomersPaymentTermsSearchControlExtendedTooltip + 983 + true + true + + true + + Label + true + true + + Left + + + + CustomersPaymentTermsSearchControlContextMenu + 982 + true + true + + true + + true + + SearchControlAddition + CustomersPaymentTermsSearchControl + + true + + + + CustomersPaymentTermsExtendedTooltip + 977 + true + true + + true + + Label + true + true + + Left + + + + CustomersPaymentTermsContextMenu + 976 + true + true + + true + + true + + true + true + true + 5 + true + true + MultiRow +
true
+ 1 + 1 + AutoUse + AutoUse + true + true + Auto + Auto + true + true + AsFileRef + + + true + true + + true + + + <key>en</key> + <value>By documents</value> + + + <key>ru</key> + <value>По документам</value> + + + <key>tr</key> + <value>Evrak detaylı</value> + + + GroupAccountReceivableByDocumentsExtendedTooltip + 608 + true + true + + true + + Label + true + true + + Left + + + Page + + Vertical + true + + + true + true + + true + + + <key>en</key> + <value>Group account receivable by agreements and by documents</value> + + + <key>ru</key> + <value>Группа взаиморасчеты с покупателями по соглашениям и по документам</value> + + + <key>tr</key> + <value>Grup Cari hesap (A/R müşteri), sözleşme ve evrak detaylı</value> + + + GroupAccountReceivableByAgreementsAndByDocumentsExtendedTooltip + 604 + true + true + + true + + Label + true + true + + Left + + + Pages + + TabsOnTop + Auto + + + true + true + + true + + + <key>en</key> + <value>Account receivable</value> + + + <key>ru</key> + <value>Взаиморасчеты с покупателями</value> + + + <key>tr</key> + <value>Cari hesap borçları</value> + + + GroupAccountReceivableExtendedTooltip + 602 + true + true + + true + + Label + true + true + + Left + + + Page + + Vertical + true + + + + GroupAccountPayableOther + 1404 + + AccountPayableOther + 1410 + true + true + + true + + + Object.AccountPayableOther + + None + + AccountPayableOtherLineNumber + 1423 + true + true + + true + + + Object.AccountPayableOther.LineNumber + + + AccountPayableOtherLineNumberExtendedTooltip + 1425 + true + true + + true + + Label + true + true + + Left + + + + AccountPayableOtherLineNumberContextMenu + 1424 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + AccountPayableOtherKey + 1426 + true + + true + + + Object.AccountPayableOther.Key + + + AccountPayableOtherKeyExtendedTooltip + 1428 + true + true + + true + + Label + true + true + + Left + + + + AccountPayableOtherKeyContextMenu + 1427 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + AccountPayableOtherPartner + 1429 + true + true + + true + + + Object.AccountPayableOther.Partner + + + OnChange + AccountPayableOtherPartnerOnChange + + + AccountPayableOtherPartnerExtendedTooltip + 1431 + true + true + + true + + Label + true + true + + Left + + + + AccountPayableOtherPartnerContextMenu + 1430 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + AccountPayableOtherLegalName + 1432 + true + true + + true + + + Object.AccountPayableOther.LegalName + + + AccountPayableOtherLegalNameExtendedTooltip + 1434 + true + true + + true + + Label + true + true + + Left + + + + AccountPayableOtherLegalNameContextMenu + 1433 + true + true + + true + + true + + InputField + Enter + true + Left + true + + + EditTextChange + MainTableLegalNameEditTextChange + + + StartChoice + MainTableLegalNameStartChoice + + true + true + true + true + true + true + + + + AccountPayableOtherAgreement + 1435 + true + true + + true + + + Object.AccountPayableOther.Agreement + + + OnChange + AgreementOnChange + + + AccountPayableOtherAgreementExtendedTooltip + 1437 + true + true + + true + + Label + true + true + + Left + + + + AccountPayableOtherAgreementContextMenu + 1436 + true + true + + true + + true + + InputField + Enter + true + Left + true + + + StartChoice + AccountPayableOtherAgreementStartChoice + + + EditTextChange + AccountPayableOtherAgreementEditTextChange + + true + true + true + true + true + true + + + + AccountPayableOtherLegalNameContract + 1444 + true + true + + true + + + Object.AccountPayableOther.LegalNameContract + + + AccountPayableOtherLegalNameContractExtendedTooltip + 1446 + true + true + + true + + Label + true + true + + Left + + + + AccountPayableOtherLegalNameContractContextMenu + 1445 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + AccountPayableOtherCurrency + 1438 + true + true + + true + + + Object.AccountPayableOther.Currency + + + AccountPayableOtherCurrencyExtendedTooltip + 1440 + true + true + + true + + Label + true + true + + Left + + + + AccountPayableOtherCurrencyContextMenu + 1439 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + AccountPayableOtherAmount + 1441 + true + true + + true + + + Object.AccountPayableOther.Amount + + + AccountPayableOtherAmountExtendedTooltip + 1443 + true + true + + true + + Label + true + true + + Left + + + + AccountPayableOtherAmountContextMenu + 1442 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + AccountPayableOtherCommandBar + 1411 + + EditCurrenciesAccountPayableOther + 1523 + true + true + + true + + + EditCurrenciesAccountPayableOtherExtendedTooltip + 1524 + true + true + + true + + Label + true + true + + Left + + + Form.Command.EditCurrenciesAccountPayableOther + Auto + true + true + UserCmds + Auto + + true + true + + true + + Left + true + + + OnChange + MainTableOnChange + + + OnActivateCell + AccountPayableOtherOnActivateCell + + + true + true + + true + + AccountPayableOtherSearchString + 1414 + + AccountPayableOtherSearchStringExtendedTooltip + 1416 + true + true + + true + + Label + true + true + + Left + + + + AccountPayableOtherSearchStringContextMenu + 1415 + true + true + + true + + true + + + true + + + + true + true + + true + + AccountPayableOtherViewStatus + 1420 + + AccountPayableOtherViewStatusExtendedTooltip + 1422 + true + true + + true + + Label + true + true + + Left + + + + AccountPayableOtherViewStatusContextMenu + 1421 + true + true + + true + + true + + ViewStatusAddition + + true + + + + true + true + + true + + AccountPayableOtherSearchControl + 1417 + + AccountPayableOtherSearchControlExtendedTooltip + 1419 + true + true + + true + + Label + true + true + + Left + + + + AccountPayableOtherSearchControlContextMenu + 1418 + true + true + + true + + true + + SearchControlAddition + + true + + + + AccountPayableOtherExtendedTooltip + 1413 + true + true + + true + + Label + true + true + + Left + + + + AccountPayableOtherContextMenu + 1412 + true + true + + true + + true + + true + true + true + true + true + MultiRow +
true
+ 1 + 1 + AutoUse + AutoUse + true + true + Auto + Auto + true + true + AsFileRef + + true + true + + true + + + <key>en</key> + <value>Account payable (other)</value> + + + <key>ru</key> + <value>Account payable (other)</value> + + + <key>tr</key> + <value>Account payable (other)</value> + + + GroupAccountPayableOtherExtendedTooltip + 1405 + true + true + + true + + Label + true + true + + Left + + + Page + + Vertical + true + + + + GroupAccountReceivableOther + 1406 + + AccountReceivableOther + 1447 + true + true + + true + + + Object.AccountReceivableOther + + None + + AccountReceivableOtherLineNumber + 1460 + true + true + + true + + + Object.AccountReceivableOther.LineNumber + + + AccountReceivableOtherLineNumberExtendedTooltip + 1462 + true + true + + true + + Label + true + true + + Left + + + + AccountReceivableOtherLineNumberContextMenu + 1461 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + AccountReceivableOtherKey + 1463 + true + + true + + + Object.AccountReceivableOther.Key + + + AccountReceivableOtherKeyExtendedTooltip + 1465 + true + true + + true + + Label + true + true + + Left + + + + AccountReceivableOtherKeyContextMenu + 1464 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + AccountReceivableOtherPartner + 1466 + true + true + + true + + + Object.AccountReceivableOther.Partner + + + OnChange + AccountReceivableOtherPartnerOnChange + + + AccountReceivableOtherPartnerExtendedTooltip + 1468 + true + true + + true + + Label + true + true + + Left + + + + AccountReceivableOtherPartnerContextMenu + 1467 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + AccountReceivableOtherLegalName + 1469 + true + true + + true + + + Object.AccountReceivableOther.LegalName + + + AccountReceivableOtherLegalNameExtendedTooltip + 1471 + true + true + + true + + Label + true + true + + Left + + + + AccountReceivableOtherLegalNameContextMenu + 1470 + true + true + + true + + true + + InputField + Enter + true + Left + true + - AfterDeleteRow - AccountReceivableByDocumentsAfterDeleteRow + EditTextChange + MainTableLegalNameEditTextChange - OnActivateCell - AccountReceivableByDocumentsOnActivateCell + StartChoice + MainTableLegalNameStartChoice + true + true + true + true + true + true + + + + AccountReceivableOtherAgreement + 1472 + true + true + + true + + + Object.AccountReceivableOther.Agreement + + + OnChange + AgreementOnChange + + + AccountReceivableOtherAgreementExtendedTooltip + 1474 + true + true + + true + + Label + true + true + + Left + + + + AccountReceivableOtherAgreementContextMenu + 1473 + true + true + + true + + true + + InputField + Enter + true + Left + true + - OnChange - MainTableOnChange - - - true - true - - true - - AccountReceivableByDocumentsSearchString - 718 - - AccountReceivableByDocumentsSearchStringExtendedTooltip - 720 - true - true - - true - - Label - true - true - - Left - - - - AccountReceivableByDocumentsSearchStringContextMenu - 719 - true - true - - true - - true - - AccountReceivableByDocumentsSearchString - - true - - - - true - true - - true - - AccountReceivableByDocumentsViewStatus - 724 - - AccountReceivableByDocumentsViewStatusExtendedTooltip - 726 - true - true - - true - - Label - true - true - - Left - - - - AccountReceivableByDocumentsViewStatusContextMenu - 725 - true - true - - true - - true - - ViewStatusAddition - AccountReceivableByDocumentsViewStatus - - true - Left - - - - true - true - - true - - AccountReceivableByDocumentsSearchControl - 721 - - AccountReceivableByDocumentsSearchControlExtendedTooltip - 723 - true - true - - true - - Label - true - true - - Left - - - - AccountReceivableByDocumentsSearchControlContextMenu - 722 - true - true - - true - - true - - SearchControlAddition - AccountReceivableByDocumentsSearchControl - - true - - - - AccountReceivableByDocumentsExtendedTooltip - 717 - true - true - - true - - Label - true - true - - Left - - - - AccountReceivableByDocumentsContextMenu - 716 - true - true - - true - - true - - true - true + StartChoice + AccountReceivableOtherAgreementStartChoice + + + EditTextChange + AccountReceivableOtherAgreementEditTextChange + true true - true - MultiRow -
true
- 1 - 1 - AutoUse - AutoUse - true - true - Auto - Auto - true - true - AsFileRef - - - - CustomersPaymentTerms - 974 + true + true + true + true + + + + AccountReceivableOtherLegalNameContract + 1481 + true + true + + true + + + Object.AccountReceivableOther.LegalNameContract + + + AccountReceivableOtherLegalNameContractExtendedTooltip + 1483 true true true - - Object.CustomersPaymentTerms - - None - - CustomersPaymentTermsKey - 1141 - true - - true - - - Object.CustomersPaymentTerms.Key - - - CustomersPaymentTermsKeyExtendedTooltip - 1143 - true - true - - true - - Label - true - true - - Left - - - - CustomersPaymentTermsKeyContextMenu - 1142 - true - true - - true - - true - - InputField - Enter - true - Left - true - - true - true - true - true - true - true - - - - CustomersPaymentTermsCalculationType - 1005 - true - true - - true - - - Object.CustomersPaymentTerms.CalculationType - - - CustomersPaymentTermsCalculationTypeExtendedTooltip - 1007 - true - true - - true - - Label - true - true - - Left - - - - CustomersPaymentTermsCalculationTypeContextMenu - 1006 - true - true - - true - - true - - InputField - Enter - true - Left - true - - true - true - true - true - true - true - - - - CustomersPaymentTermsDate - 993 - true - true - - true - - - Object.CustomersPaymentTerms.Date - - - CustomersPaymentTermsDateExtendedTooltip - 995 - true - true - - true - - Label - true - true - - Left - - - - CustomersPaymentTermsDateContextMenu - 994 - true - true - - true - - true - - InputField - Enter - true - Left - true - - true - true - true - true - true - true - - - - CustomersPaymentTermsAmount - 1002 - true - true - - true - - - Object.CustomersPaymentTerms.Amount - - - CustomersPaymentTermsAmountExtendedTooltip - 1004 - true - true - - true - - Label - true - true - - Left - - - - CustomersPaymentTermsAmountContextMenu - 1003 - true - true - - true - - true - - InputField - Enter - true - Left - true - - true - true - true - true - true - true - - - - CustomersPaymentTermsCommandBar - 975 - true - true - - true - + Label + true + true + + Left + + + + AccountReceivableOtherLegalNameContractContextMenu + 1482 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + AccountReceivableOtherCurrency + 1475 + true + true + + true + + + Object.AccountReceivableOther.Currency + + + AccountReceivableOtherCurrencyExtendedTooltip + 1477 + true + true + + true + + Label + true + true + Left - true - - - BeforeAddRow - CustomersPaymentTermsBeforeAddRow - - - true - true - - true - - CustomersPaymentTermsSearchString - 978 - - CustomersPaymentTermsSearchStringExtendedTooltip - 980 - true - true - - true - - Label - true - true - - Left - - - - CustomersPaymentTermsSearchStringContextMenu - 979 - true - true - - true - - true - - CustomersPaymentTermsSearchString - - true - - - - true - true - - true - - CustomersPaymentTermsViewStatus - 984 - - CustomersPaymentTermsViewStatusExtendedTooltip - 986 - true - true - - true - - Label - true - true - - Left - - - - CustomersPaymentTermsViewStatusContextMenu - 985 - true - true - - true - - true - - ViewStatusAddition - CustomersPaymentTermsViewStatus - - true - - - - true - true - - true - - CustomersPaymentTermsSearchControl - 981 - - CustomersPaymentTermsSearchControlExtendedTooltip - 983 - true - true - - true - - Label - true - true - - Left - - - - CustomersPaymentTermsSearchControlContextMenu - 982 - true - true - - true - - true - - SearchControlAddition - CustomersPaymentTermsSearchControl - - true - - + + + + AccountReceivableOtherCurrencyContextMenu + 1476 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + AccountReceivableOtherAmount + 1478 + true + true + + true + + + Object.AccountReceivableOther.Amount + + + AccountReceivableOtherAmountExtendedTooltip + 1480 + true + true + + true + + Label + true + true + + Left + + + + AccountReceivableOtherAmountContextMenu + 1479 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + AccountReceivableOtherCommandBar + 1448 + + EditCurrenciesAccountReceivableOther + 1525 + true + true + + true + - CustomersPaymentTermsExtendedTooltip - 977 + EditCurrenciesAccountReceivableOtherExtendedTooltip + 1526 true true @@ -6904,62 +8849,45 @@ Label true - true - - Left - - - - CustomersPaymentTermsContextMenu - 976 - true - true - - true - - true - - true - true + true + + Left + + + Form.Command.EditCurrenciesAccountReceivableOther + Auto true - 5 true - true - MultiRow -
true
- 1 - 1 - AutoUse - AutoUse - true - true - Auto - Auto - true - true - AsFileRef - + UserCmds + Auto true true true - - <key>en</key> - <value>By documents</value> - - - <key>ru</key> - <value>По документам</value> - - - <key>tr</key> - <value>Evrak detaylı</value> - + Left + true + + + OnChange + MainTableOnChange + + + OnActivateCell + AccountReceivableOtherOnActivateCell + + + true + true + + true + + AccountReceivableOtherSearchString + 1451 - GroupAccountReceivableByDocumentsExtendedTooltip - 608 + AccountReceivableOtherSearchStringExtendedTooltip + 1453 true true @@ -6972,32 +8900,99 @@ Left - Page - - Vertical - true + + AccountReceivableOtherSearchStringContextMenu + 1452 + true + true + + true + + true + + + true - - true - true - - true - - - <key>en</key> - <value>Group account receivable by agreements and by documents</value> - - - <key>ru</key> - <value>Группа взаиморасчеты с покупателями по соглашениям и по документам</value> - - - <key>tr</key> - <value>Grup Cari hesap (A/R müşteri), sözleşme ve evrak detaylı</value> - + + + true + true + + true + + AccountReceivableOtherViewStatus + 1457 + + AccountReceivableOtherViewStatusExtendedTooltip + 1459 + true + true + + true + + Label + true + true + + Left + + + + AccountReceivableOtherViewStatusContextMenu + 1458 + true + true + + true + + true + + ViewStatusAddition + + true + + + + true + true + + true + + AccountReceivableOtherSearchControl + 1454 + + AccountReceivableOtherSearchControlExtendedTooltip + 1456 + true + true + + true + + Label + true + true + + Left + + + + AccountReceivableOtherSearchControlContextMenu + 1455 + true + true + + true + + true + + SearchControlAddition + + true + + - GroupAccountReceivableByAgreementsAndByDocumentsExtendedTooltip - 604 + AccountReceivableOtherExtendedTooltip + 1450 true true @@ -7010,11 +9005,34 @@ Left - Pages - - TabsOnTop - Auto - + + AccountReceivableOtherContextMenu + 1449 + true + true + + true + + true + + true + true + true + true + true + MultiRow +
true
+ 1 + 1 + AutoUse + AutoUse + true + true + Auto + Auto + true + true + AsFileRef true true @@ -7023,19 +9041,19 @@ <key>en</key> - <value>Account receivable</value> + <value>Account receivable (other)</value> <key>ru</key> - <value>Взаиморасчеты с покупателями</value> + <value>Account receivable (other)</value> <key>tr</key> - <value>Cari hesap borçları</value> + <value>Account receivable (other)</value> - GroupAccountReceivableExtendedTooltip - 602 + GroupAccountReceivableOtherExtendedTooltip + 1407 true true @@ -11759,6 +13777,93 @@ Picture Auto + + EditCurrenciesAccountPayableOther + + <key>en</key> + <value>Edit currencies account payable other</value> + + + <key>ru</key> + <value>Edit currencies account payable other</value> + + + <key>tr</key> + <value>Edit currencies account payable other</value> + + 14 + + true + + + CommonPicture.EditCurrencies + + + + EditCurrenciesAccountPayableOther + + + Picture + Auto + + + EditCurrenciesAccountReceivableOther + + <key>en</key> + <value>Edit currencies account receivable other</value> + + + <key>ru</key> + <value>Edit currencies account receivable other</value> + + + <key>tr</key> + <value>Edit currencies account receivable other</value> + + 15 + + true + + + CommonPicture.EditCurrencies + + + + EditCurrenciesAccountReceivableOther + + + Picture + Auto + + + EditCurrenciesCashInTransit + + <key>en</key> + <value>Edit currencies cash in transit</value> + + + <key>ru</key> + <value>Edit currencies cash in transit</value> + + + <key>tr</key> + <value>Edit currencies cash in transit</value> + + 16 + + true + + + CommonPicture.EditCurrencies + + + + EditCurrenciesCashInTransit + + + Picture + Auto + diff --git a/IRP/src/Documents/OpeningEntry/Forms/DocumentForm/Module.bsl b/IRP/src/Documents/OpeningEntry/Forms/DocumentForm/Module.bsl index 5ba34daffd..04d2a5ea33 100644 --- a/IRP/src/Documents/OpeningEntry/Forms/DocumentForm/Module.bsl +++ b/IRP/src/Documents/OpeningEntry/Forms/DocumentForm/Module.bsl @@ -80,7 +80,10 @@ Procedure SetVisibilityAvailability(Object, Form) Form.Items.EditCurrenciesEmployeeCashAdvance.Enabled = Not Form.ReadOnly; Form.Items.EditCurrenciesAdvanceFromRetailCustomers.Enabled = Not Form.ReadOnly; Form.Items.EditCurrenciesSalaryPayment.Enabled = Not Form.ReadOnly; - + Form.Items.EditCurrenciesCashInTransit.Enabled = Not Form.ReadOnly; + Form.Items.EditCurrenciesAccountPayableOther.Enabled = Not Form.ReadOnly; + Form.Items.EditCurrenciesAccountReceivableOther.Enabled = Not Form.ReadOnly; + UseCommissionTrading = FOServer.IsUseCommissionTrading(); Form.Items.GroupReceiptFromConsignor.Visible = UseCommissionTrading; @@ -298,7 +301,7 @@ EndProcedure &AtClient Procedure AccountBalanceBeforeAddRow(Item, Cancel, Clone, Parent, IsFolder, Parameter) - DocOpeningEntryClient.AccountBalanceBeforeAddRow(Object, ThisObject, Item, Cancel, Clone, Parent, IsFolder, Parameter) + DocOpeningEntryClient.AccountBalanceBeforeAddRow(Object, ThisObject, Item, Cancel, Clone, Parent, IsFolder, Parameter); EndProcedure &AtClient @@ -321,6 +324,33 @@ EndProcedure #EndRegion +#Region CASH_IN_TRANSIT + +&AtClient +Procedure CashInTransitBeforeAddRow(Item, Cancel, Clone, Parent, IsFolder, Parameter) + DocOpeningEntryClient.CashInTransitBeforeAddRow(Object, ThisObject, Item, Cancel, Clone, Parent, IsFolder, Parameter); +EndProcedure + +&AtClient +Procedure CashInTransitAfterDeleteRow(Item) + DocOpeningEntryClient.CashInTransitAfterDeleteRow(Object, ThisObject, Item); +EndProcedure + +#Region CASH_IN_TRANSIT_COLUMNS + +#Region RECEIPTING_ACCOUNT + +&AtClient +Procedure CashInTransitReceiptingAccountOnChange(Item) + DocOpeningEntryClient.CashInTransitReceiptingAccountOnChange(Object, ThisObject, Item); +EndProcedure + +#EndRegion + +#EndRegion + +#EndRegion + #Region EMPLOYEE_CASH_ADVANCE &AtClient @@ -427,6 +457,11 @@ Procedure AccountPayableByDocumentsOnActivateCell(Item) AccountByDocumentsMainTableOnActivateCell("AccountPayableByDocuments", Item); EndProcedure +&AtClient +Procedure AccountPayableOtherOnActivateCell(Item) + AccountByAgreementsMainTableOnActivateCell("AccountPayableOther", Item); +EndProcedure + &AtClient Procedure AccountReceivableByAgreementsOnActivateCell(Item) AccountByAgreementsMainTableOnActivateCell("AccountReceivableByAgreements", Item); @@ -437,6 +472,11 @@ Procedure AccountReceivableByDocumentsOnActivateCell(Item) AccountByDocumentsMainTableOnActivateCell("AccountReceivableByDocuments", Item); EndProcedure +&AtClient +Procedure AccountReceivableOtherOnActivateCell(Item) + AccountByAgreementsMainTableOnActivateCell("AccountReceivableOther", Item); +EndProcedure + &AtClient Procedure AdvanceMainTableOnActivateCell(TableName, Item) CurrentData = Items[TableName].CurrentData; @@ -476,11 +516,11 @@ Procedure AdvanceMainTablePartnerOnChange(Item) EndProcedure &AtClient -Function AccountByAgreementsMainTablePartnerOnChange(Item, AgreementType, ApArPostingDetail) +Procedure AccountByAgreementsMainTablePartnerOnChange(Item, AgreementType, ApArPostingDetail) TableName = StrReplace(Item.Name, "Partner", ""); CurrentData = Items[TableName].CurrentData; If CurrentData = Undefined Then - Return Undefined; + Return; EndIf; CurrentData.LegalName = DocumentsServer.GetLegalNameByPartner(CurrentData.Partner, CurrentData.LegalName); AgreementParameters = New Structure(); @@ -497,15 +537,14 @@ Function AccountByAgreementsMainTablePartnerOnChange(Item, AgreementType, ApArPo CurrentData.Agreement = DocumentsServer.GetAgreementByPartner(AgreementParameters); AgreementInfo = CatAgreementsServer.GetAgreementInfo(CurrentData.Agreement); CurrentData.Currency = AgreementInfo.Currency; - Return TableName; -EndFunction +EndProcedure &AtClient -Function AccountByDocumentsMainTablePartnerOnChange(Item, AgreementType, ApArPostingDetail) +Procedure AccountByDocumentsMainTablePartnerOnChange(Item, AgreementType, ApArPostingDetail) TableName = StrReplace(Item.Name, "Partner", ""); CurrentData = Items[TableName].CurrentData; If CurrentData = Undefined Then - Return Undefined; + Return; EndIf; CurrentData.LegalName = DocumentsServer.GetLegalNameByPartner(CurrentData.Partner, CurrentData.LegalName); AgreementParameters = New Structure(); @@ -519,35 +558,42 @@ Function AccountByDocumentsMainTablePartnerOnChange(Item, AgreementType, ApArPos CurrentData.Agreement = DocumentsServer.GetAgreementByPartner(AgreementParameters); AgreementInfo = CatAgreementsServer.GetAgreementInfo(CurrentData.Agreement); CurrentData.Currency = AgreementInfo.Currency; - Return TableName; -EndFunction +EndProcedure &AtClient Procedure AccountPayableByAgreementsPartnerOnChange(Item, AddInfo = Undefined) Export - TableName = AccountByAgreementsMainTablePartnerOnChange(Item, PredefinedValue("Enum.AgreementTypes.Vendor"), + AccountByAgreementsMainTablePartnerOnChange(Item, PredefinedValue("Enum.AgreementTypes.Vendor"), + PredefinedValue("Enum.ApArPostingDetail.ByAgreements")); +EndProcedure + +&AtClient +Procedure AccountPayableOtherPartnerOnChange(Item, AddInfo = Undefined) Export + AccountByAgreementsMainTablePartnerOnChange(Item, PredefinedValue("Enum.AgreementTypes.Other"), PredefinedValue("Enum.ApArPostingDetail.ByAgreements")); - CommonFunctionsClientServer.PutToAddInfo(AddInfo, "Currencies_CurrentTableName", TableName); EndProcedure &AtClient Procedure AccountReceivableByAgreementsPartnerOnChange(Item, AddInfo = Undefined) Export - TableName = AccountByAgreementsMainTablePartnerOnChange(Item, PredefinedValue("Enum.AgreementTypes.Customer"), + AccountByAgreementsMainTablePartnerOnChange(Item, PredefinedValue("Enum.AgreementTypes.Customer"), + PredefinedValue("Enum.ApArPostingDetail.ByAgreements")); +EndProcedure + +&AtClient +Procedure AccountReceivableOtherPartnerOnChange(Item, AddInfo = Undefined) Export + AccountByAgreementsMainTablePartnerOnChange(Item, PredefinedValue("Enum.AgreementTypes.Other"), PredefinedValue("Enum.ApArPostingDetail.ByAgreements")); - CommonFunctionsClientServer.PutToAddInfo(AddInfo, "Currencies_CurrentTableName", TableName); EndProcedure &AtClient Procedure AccountPayableByDocumentsPartnerOnChange(Item, AddInfo = Undefined) Export - TableName = AccountByDocumentsMainTablePartnerOnChange(Item, PredefinedValue("Enum.AgreementTypes.Vendor"), + AccountByDocumentsMainTablePartnerOnChange(Item, PredefinedValue("Enum.AgreementTypes.Vendor"), PredefinedValue("Enum.ApArPostingDetail.ByDocuments")); - CommonFunctionsClientServer.PutToAddInfo(AddInfo, "Currencies_CurrentTableName", TableName); EndProcedure &AtClient Procedure AccountReceivableByDocumentsPartnerOnChange(Item, AddInfo = Undefined) Export - TableName = AccountByDocumentsMainTablePartnerOnChange(Item, PredefinedValue("Enum.AgreementTypes.Customer"), + AccountByDocumentsMainTablePartnerOnChange(Item, PredefinedValue("Enum.AgreementTypes.Customer"), PredefinedValue("Enum.ApArPostingDetail.ByDocuments")); - CommonFunctionsClientServer.PutToAddInfo(AddInfo, "Currencies_CurrentTableName", TableName); EndProcedure &AtClient @@ -563,8 +609,7 @@ Procedure MainTableLegalNameEditTextChange(Item, Text, StandardProcessing) AdditionalParameters.Insert("Partner", CurrentData.Partner); AdditionalParameters.Insert("FilterByPartnerHierarchy", True); EndIf; - DocumentsClient.CompanyEditTextChange(Object, ThisObject, Item, Text, StandardProcessing, ArrayOfFilters, - AdditionalParameters); + DocumentsClient.CompanyEditTextChange(Object, ThisObject, Item, Text, StandardProcessing, ArrayOfFilters, AdditionalParameters); EndProcedure &AtClient @@ -605,6 +650,26 @@ Procedure AccountPayableByDocumentsAgreementStartChoice(Item, ChoiceData, Standa ArrayOfApArPostingDetail, Item, ChoiceData, StandardProcessing); EndProcedure +&AtClient +Procedure AccountReceivableOtherAgreementStartChoice(Item, ChoiceData, StandardProcessing) + ArrayOfApArPostingDetail = New Array(); + ArrayOfApArPostingDetail.Add(PredefinedValue("Enum.ApArPostingDetail.ByAgreements")); + ArrayOfApArPostingDetail.Add(PredefinedValue("Enum.ApArPostingDetail.ByStandardAgreement")); + + AgreementStartChoice("AccountReceivableOther", PredefinedValue("Enum.AgreementTypes.Other"), + ArrayOfApArPostingDetail, Item, ChoiceData, StandardProcessing); +EndProcedure + +&AtClient +Procedure AccountPayableOtherAgreementStartChoice(Item, ChoiceData, StandardProcessing) + ArrayOfApArPostingDetail = New Array(); + ArrayOfApArPostingDetail.Add(PredefinedValue("Enum.ApArPostingDetail.ByAgreements")); + ArrayOfApArPostingDetail.Add(PredefinedValue("Enum.ApArPostingDetail.ByStandardAgreement")); + + AgreementStartChoice("AccountPayableOther", PredefinedValue("Enum.AgreementTypes.Other"), + ArrayOfApArPostingDetail, Item, ChoiceData, StandardProcessing); +EndProcedure + &AtClient Procedure AgreementStartChoice(TableName, AgreementType, ArrayOfApArPostingDetail, Item, ChoiceData, StandardProcessing) CurrentData = Items[TableName].CurrentData; @@ -676,6 +741,26 @@ Procedure AccountPayableByDocumentsAgreementEditTextChange(Item, Text, StandardP ArrayOfApArPostingDetail, Item, Text, StandardProcessing); EndProcedure +&AtClient +Procedure AccountReceivableOtherAgreementEditTextChange(Item, Text, StandardProcessing) + ArrayOfApArPostingDetail = New Array(); + ArrayOfApArPostingDetail.Add(PredefinedValue("Enum.ApArPostingDetail.ByAgreements")); + ArrayOfApArPostingDetail.Add(PredefinedValue("Enum.ApArPostingDetail.ByStandardAgreement")); + + AgreementEditTextChange("AccountReceivableOther", PredefinedValue("Enum.AgreementTypes.Other"), + ArrayOfApArPostingDetail, Item, Text, StandardProcessing); +EndProcedure + +&AtClient +Procedure AccountPayableOtherAgreementEditTextChange(Item, Text, StandardProcessing) + ArrayOfApArPostingDetail = New Array(); + ArrayOfApArPostingDetail.Add(PredefinedValue("Enum.ApArPostingDetail.ByAgreements")); + ArrayOfApArPostingDetail.Add(PredefinedValue("Enum.ApArPostingDetail.ByStandardAgreement")); + + AgreementEditTextChange("AccountPayableOther", PredefinedValue("Enum.AgreementTypes.Other"), + ArrayOfApArPostingDetail, Item, Text, StandardProcessing); +EndProcedure + &AtClient Procedure AgreementEditTextChange(TableName, AgreementType, ArrayOfApArPostingDetail, Item, Text, StandardProcessing) CurrentData = Items[TableName].CurrentData; @@ -700,13 +785,11 @@ EndProcedure &AtClient Procedure AgreementOnChange(Item, AddInfo = Undefined) Export - CountLeftSymbols = 29; - TableName = Left("AccountReceivableByAgreementsAgreement", CountLeftSymbols); - CommonFunctionsClientServer.PutToAddInfo(AddInfo, "Currencies_CurrentTableName", TableName); + TableName = Left(Item.Name, StrFind(Item.Name, "Agreement", SearchDirection.FromEnd) - 1); CurrentData = Items[TableName].CurrentData; If CurrentData = Undefined Then Return; - EndIf; + EndIf; AgreementInfo = CatAgreementsServer.GetAgreementInfo(CurrentData.Agreement); CurrentData.Currency = AgreementInfo.Currency; EndProcedure @@ -871,6 +954,20 @@ Procedure EditCurrenciesAccountBalance(Command) OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow); EndProcedure +&AtClient +Procedure EditCurrenciesCashInTransit(Command) + CurrentData = ThisObject.Items.CashInTransit.CurrentData; + If CurrentData = Undefined Then + Return; + EndIf; + FormParameters = CurrenciesClientServer.GetParameters_V6(Object, CurrentData); + NotifyParameters = New Structure(); + NotifyParameters.Insert("Object", Object); + NotifyParameters.Insert("Form" , ThisObject); + Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters); + OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow); +EndProcedure + &AtClient Procedure EditCurrenciesEmployeeCashAdvance(Command) CurrentData = ThisObject.Items.EmployeeCashAdvance.CurrentData; @@ -969,6 +1066,20 @@ Procedure EditCurrenciesAccountReceivableByDocuments(Command) OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow); EndProcedure +&AtClient +Procedure EditCurrenciesAccountReceivableOther(Command) + CurrentData = ThisObject.Items.AccountReceivableOther.CurrentData; + If CurrentData = Undefined Then + Return; + EndIf; + FormParameters = CurrenciesClientServer.GetParameters_V4(Object, CurrentData); + NotifyParameters = New Structure(); + NotifyParameters.Insert("Object", Object); + NotifyParameters.Insert("Form" , ThisObject); + Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters); + OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow); +EndProcedure + &AtClient Procedure EditCurrenciesAccountPayableByAgreements(Command) CurrentData = ThisObject.Items.AccountPayableByAgreements.CurrentData; @@ -997,6 +1108,20 @@ Procedure EditCurrenciesAccountPayableByDocuments(Command) OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow); EndProcedure +&AtClient +Procedure EditCurrenciesAccountPayableOther(Command) + CurrentData = ThisObject.Items.AccountPayableOther.CurrentData; + If CurrentData = Undefined Then + Return; + EndIf; + FormParameters = CurrenciesClientServer.GetParameters_V4(Object, CurrentData); + NotifyParameters = New Structure(); + NotifyParameters.Insert("Object", Object); + NotifyParameters.Insert("Form" , ThisObject); + Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters); + OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow); +EndProcedure + &AtClient Procedure EditCurrenciesReceiptFromConsignor(Command) CurrentData = ThisObject.Items.ReceiptFromConsignor.CurrentData; @@ -1422,5 +1547,6 @@ MainTables = "AccountBalance, AdvanceFromCustomers, AdvanceToSuppliers, |AccountReceivableByDocuments, AccountReceivableByAgreements, |Inventory, |ShipmentToTradeAgent, ReceiptFromConsignor, - |EmployeeCashAdvance, AdvanceFromRetailCustomers, SalaryPayment"; + |EmployeeCashAdvance, AdvanceFromRetailCustomers, SalaryPayment, + |AccountReceivableOther, AccountPayableOther, CashInTransit"; diff --git a/IRP/src/Documents/OpeningEntry/ManagerModule.bsl b/IRP/src/Documents/OpeningEntry/ManagerModule.bsl index 27de4e734a..22d39a3f1c 100644 --- a/IRP/src/Documents/OpeningEntry/ManagerModule.bsl +++ b/IRP/src/Documents/OpeningEntry/ManagerModule.bsl @@ -107,7 +107,31 @@ Function PostingGetDocumentDataTables(Ref, Cancel, PostingMode, Parameters, AddI Query.SetParameter("T1", BatchKeysInfo_DataTableGrouped); Query.Execute(); - Return New Structure; + AccReg = Metadata.AccumulationRegisters; + Tables = New Structure; + Tables.Insert("RegCashInTransit", PostingServer.CreateTable(AccReg.CashInTransit)); + + Query = New Query(); + Query.Text = + "SELECT + | VALUE(AccumulationRecordType.Receipt) AS RecordType, + | OpeningEntryCashInTransit.Ref.Date AS Period, + | OpeningEntryCashInTransit.Ref.Company, + | OpeningEntryCashInTransit.Account AS FromAccount, + | OpeningEntryCashInTransit.ReceiptingAccount AS ToAccount, + | OpeningEntryCashInTransit.Currency, + | OpeningEntryCashInTransit.Amount, + | OpeningEntryCashInTransit.Key + |FROM + | Document.OpeningEntry.CashInTransit AS OpeningEntryCashInTransit + |WHERE + | OpeningEntryCashInTransit.Ref = &Ref"; + Query.SetParameter("Ref", Ref); + QueryResult = Query.Execute(); + QueryTable = QueryResult.Unload(); + Tables.RegCashInTransit = QueryTable; + + Return Tables; EndFunction Function PostingGetLockDataSource(Ref, Cancel, PostingMode, Parameters, AddInfo = Undefined) Export @@ -128,12 +152,19 @@ Procedure PostingCheckBeforeWrite(Ref, Cancel, PostingMode, Parameters, AddInfo Tables.R8015T_ConsignorPrices.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); Tables.R3027B_EmployeeCashAdvance.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); Tables.R9510B_SalaryPayment.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); + Tables.R5015B_OtherPartnersTransactions.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); + Tables.R3021B_CashInTransitIncoming.Columns.Add("Key", Metadata.DefinedTypes.typeRowID.Type); PostingServer.FillPostingTables(Tables, Ref, QueryArray, Parameters); EndProcedure Function PostingGetPostingDataTables(Ref, Cancel, PostingMode, Parameters, AddInfo = Undefined) Export PostingDataTables = New Map; + + // CashInIransit + PostingDataTables.Insert(Parameters.Object.RegisterRecords.CashInTransit, + New Structure("RecordType, RecordSet", AccumulationRecordType.Receipt, Parameters.DocumentDataTables.RegCashInTransit)); + PostingServer.SetPostingDataTables(PostingDataTables, Parameters); Return PostingDataTables; EndFunction @@ -226,6 +257,9 @@ Function GetQueryTextsSecondaryTables() QueryArray.Add(EmployeeCashAdvance()); QueryArray.Add(AdvanceFromRetailCustomers()); QueryArray.Add(SalaryPayment()); + QueryArray.Add(OtherVendorsTransactions()); + QueryArray.Add(OtherCustomersTransactions()); + QueryArray.Add(CashInTransit()); QueryArray.Add(PostingServer.Exists_R4010B_ActualStocks()); QueryArray.Add(PostingServer.Exists_R4011B_FreeStocks()); QueryArray.Add(PostingServer.Exists_R4014B_SerialLotNumber()); @@ -341,6 +375,26 @@ Function VendorsTransactions() | OpeningEntryAccountPayableByAgreements.Ref = &Ref"; EndFunction +Function OtherVendorsTransactions() + Return + "SELECT + | OpeningEntryAccountPayableOther.Ref.Date AS Period, + | OpeningEntryAccountPayableOther.Key, + | OpeningEntryAccountPayableOther.Ref.Company AS Company, + | OpeningEntryAccountPayableOther.Ref.Branch AS Branch, + | OpeningEntryAccountPayableOther.Partner, + | OpeningEntryAccountPayableOther.LegalName, + | OpeningEntryAccountPayableOther.LegalNameContract, + | OpeningEntryAccountPayableOther.Agreement AS Agreement, + | OpeningEntryAccountPayableOther.Currency, + | OpeningEntryAccountPayableOther.Amount AS Amount + |INTO OtherVendorsTransactions + |FROM + | Document.OpeningEntry.AccountPayableOther AS OpeningEntryAccountPayableOther + |WHERE + | OpeningEntryAccountPayableOther.Ref = &Ref"; +EndFunction + Function AdvancesFromCustomers() Return "SELECT | OpeningEntryAdvanceFromCustomers.Ref.Company AS Company, @@ -410,6 +464,26 @@ Function CustomersTransactions() | OpeningEntryAccountReceivableByAgreements.Ref = &Ref"; EndFunction +Function OtherCustomersTransactions() + Return + "SELECT + | OpeningEntryAccountReceivableOther.Key, + | OpeningEntryAccountReceivableOther.Ref.Date AS Period, + | OpeningEntryAccountReceivableOther.Ref.Company AS Company, + | OpeningEntryAccountReceivableOther.Ref.Branch AS Branch, + | OpeningEntryAccountReceivableOther.Partner, + | OpeningEntryAccountReceivableOther.LegalName, + | OpeningEntryAccountReceivableOther.LegalNameContract, + | OpeningEntryAccountReceivableOther.Agreement AS Agreement, + | OpeningEntryAccountReceivableOther.Currency, + | OpeningEntryAccountReceivableOther.Amount AS Amount + |INTO OtherCustomersTransactions + |FROM + | Document.OpeningEntry.AccountReceivableOther AS OpeningEntryAccountReceivableOther + |WHERE + | OpeningEntryAccountReceivableOther.Ref = &Ref"; +EndFunction + Function CustomersAging() Return "SELECT | OpeningEntryCustomersPaymentTerms.Ref.Date AS Period, @@ -562,6 +636,23 @@ Function SalaryPayment() | SalaryPayment.Ref = &Ref"; EndFunction +Function CashInTransit() + Return + "SELECT + | CashInTransit.Key, + | CashInTransit.Ref.Date AS Period, + | CashInTransit.Ref.Company AS Company, + | CashInTransit.ReceiptingBranch AS Branch, + | CashInTransit.ReceiptingAccount, + | CashInTransit.Currency, + | CashInTransit.Amount + |INTO CashInTransit + |FROM + | Document.OpeningEntry.CashInTransit AS CashInTransit + |WHERE + | CashInTransit.Ref = &Ref"; +EndFunction + #EndRegion #Region Posting_MainTables @@ -593,6 +684,8 @@ Function GetQueryTextsMasterTables() QueryArray.Add(T2015S_TransactionsInfo()); QueryArray.Add(T6010S_BatchesInfo()); QueryArray.Add(T6020S_BatchKeysInfo()); + QueryArray.Add(R5015B_OtherPartnersTransactions()); + QueryArray.Add(R3021B_CashInTransitIncoming()); Return QueryArray; EndFunction @@ -837,61 +930,142 @@ Function R3010B_CashOnHand() | TRUE"; EndFunction +Function R3021B_CashInTransitIncoming() + Return + "SELECT + | VALUE(AccumulationRecordType.Receipt) AS RecordType, + | CashInTransit.Key, + | CashInTransit.Period, + | CashInTransit.Company, + | CashInTransit.Branch, + | CashInTransit.ReceiptingAccount AS Account, + | CashInTransit.Currency, + | CashInTransit.Amount + |INTO R3021B_CashInTransitIncoming + |FROM + | CashInTransit AS CashInTransit + |WHERE + | TRUE"; +EndFunction + +Function R5015B_OtherPartnersTransactions() + Return + "SELECT + | VALUE(AccumulationRecordType.Expense) AS RecordType, + | OtherVendorsTransactions.Key, + | OtherVendorsTransactions.Period, + | OtherVendorsTransactions.Company, + | OtherVendorsTransactions.Branch, + | OtherVendorsTransactions.Partner, + | OtherVendorsTransactions.LegalName, + | OtherVendorsTransactions.Agreement, + | OtherVendorsTransactions.Currency, + | OtherVendorsTransactions.Amount + |INTO R5015B_OtherPartnersTransactions + |FROM + | OtherVendorsTransactions AS OtherVendorsTransactions + | + |UNION ALL + | + |SELECT + | VALUE(AccumulationRecordType.Receipt) AS RecordType, + | OtherCustomersTransactions.Key, + | OtherCustomersTransactions.Period, + | OtherCustomersTransactions.Company, + | OtherCustomersTransactions.Branch, + | OtherCustomersTransactions.Partner, + | OtherCustomersTransactions.LegalName, + | OtherCustomersTransactions.Agreement, + | OtherCustomersTransactions.Currency, + | OtherCustomersTransactions.Amount + |FROM + | OtherCustomersTransactions AS OtherCustomersTransactions"; +EndFunction + Function R5010B_ReconciliationStatement() - Return "SELECT - | VALUE(AccumulationRecordType.Expense) AS RecordType, - | VendorsTransactions.Period, - | VendorsTransactions.Company, - | VendorsTransactions.Branch, - | VendorsTransactions.LegalName, - | VendorsTransactions.LegalNameContract, - | VendorsTransactions.Currency, - | VendorsTransactions.Amount - |INTO R5010B_ReconciliationStatement - |FROM - | VendorsTransactions AS VendorsTransactions - | - |UNION ALL - | - |SELECT - | VALUE(AccumulationRecordType.Receipt) AS RecordType, - | AdvancesToVendors.Period, - | AdvancesToVendors.Company, - | AdvancesToVendors.Branch, - | AdvancesToVendors.LegalName, - | AdvancesToVendors.LegalNameContract, - | AdvancesToVendors.Currency, - | AdvancesToVendors.Amount - |FROM - | AdvancesToVendors AS AdvancesToVendors - | - |UNION ALL - | - |SELECT - | VALUE(AccumulationRecordType.Receipt) AS RecordType, - | CustomersTransactions.Period, - | CustomersTransactions.Company, - | CustomersTransactions.Branch, - | CustomersTransactions.LegalName, - | CustomersTransactions.LegalNameContract, - | CustomersTransactions.Currency, - | CustomersTransactions.Amount - |FROM - | CustomersTransactions AS CustomersTransactions - | - |UNION ALL - | - |SELECT - | VALUE(AccumulationRecordType.Expense) AS RecordType, - | AdvancesFromCustomers.Period, - | AdvancesFromCustomers.Company, - | AdvancesFromCustomers.Branch, - | AdvancesFromCustomers.LegalName, - | AdvancesFromCustomers.LegalNameContract, - | AdvancesFromCustomers.Currency, - | AdvancesFromCustomers.Amount - |FROM - | AdvancesFromCustomers AS AdvancesFromCustomers"; + Return + "SELECT + | VALUE(AccumulationRecordType.Expense) AS RecordType, + | VendorsTransactions.Period, + | VendorsTransactions.Company, + | VendorsTransactions.Branch, + | VendorsTransactions.LegalName, + | VendorsTransactions.LegalNameContract, + | VendorsTransactions.Currency, + | VendorsTransactions.Amount + |INTO R5010B_ReconciliationStatement + |FROM + | VendorsTransactions AS VendorsTransactions + | + |UNION ALL + | + |SELECT + | VALUE(AccumulationRecordType.Expense) AS RecordType, + | OtherVendorsTransactions.Period, + | OtherVendorsTransactions.Company, + | OtherVendorsTransactions.Branch, + | OtherVendorsTransactions.LegalName, + | OtherVendorsTransactions.LegalNameContract, + | OtherVendorsTransactions.Currency, + | OtherVendorsTransactions.Amount + |FROM + | OtherVendorsTransactions AS OtherVendorsTransactions + | + |UNION ALL + | + |SELECT + | VALUE(AccumulationRecordType.Receipt) AS RecordType, + | AdvancesToVendors.Period, + | AdvancesToVendors.Company, + | AdvancesToVendors.Branch, + | AdvancesToVendors.LegalName, + | AdvancesToVendors.LegalNameContract, + | AdvancesToVendors.Currency, + | AdvancesToVendors.Amount + |FROM + | AdvancesToVendors AS AdvancesToVendors + | + |UNION ALL + | + |SELECT + | VALUE(AccumulationRecordType.Receipt) AS RecordType, + | CustomersTransactions.Period, + | CustomersTransactions.Company, + | CustomersTransactions.Branch, + | CustomersTransactions.LegalName, + | CustomersTransactions.LegalNameContract, + | CustomersTransactions.Currency, + | CustomersTransactions.Amount + |FROM + | CustomersTransactions AS CustomersTransactions + | + |UNION ALL + | + |SELECT + | VALUE(AccumulationRecordType.Receipt) AS RecordType, + | OtherCustomersTransactions.Period, + | OtherCustomersTransactions.Company, + | OtherCustomersTransactions.Branch, + | OtherCustomersTransactions.LegalName, + | OtherCustomersTransactions.LegalNameContract, + | OtherCustomersTransactions.Currency, + | OtherCustomersTransactions.Amount + |FROM + | OtherCustomersTransactions AS OtherCustomersTransactions + | + |UNION ALL + | + |SELECT + | VALUE(AccumulationRecordType.Expense) AS RecordType, + | AdvancesFromCustomers.Period, + | AdvancesFromCustomers.Company, + | AdvancesFromCustomers.Branch, + | AdvancesFromCustomers.LegalName, + | AdvancesFromCustomers.LegalNameContract, + | AdvancesFromCustomers.Currency, + | AdvancesFromCustomers.Amount + |FROM + | AdvancesFromCustomers AS AdvancesFromCustomers"; EndFunction Function T2014S_AdvancesInfo() diff --git a/IRP/src/Documents/OpeningEntry/ObjectModule.bsl b/IRP/src/Documents/OpeningEntry/ObjectModule.bsl index 514277d264..2aca5d208c 100644 --- a/IRP/src/Documents/OpeningEntry/ObjectModule.bsl +++ b/IRP/src/Documents/OpeningEntry/ObjectModule.bsl @@ -17,6 +17,9 @@ Procedure BeforeWrite(Cancel, WriteMode, PostingMode) ArrayOfTableNames.Add("EmployeeCashAdvance"); ArrayOfTableNames.Add("AdvanceFromRetailCustomers"); ArrayOfTableNames.Add("SalaryPayment"); + ArrayOfTableNames.Add("AccountReceivableOther"); + ArrayOfTableNames.Add("AccountPayableOther"); + ArrayOfTableNames.Add("CashInTransit"); For Each TableName In ArrayOfTableNames Do For Each Row In ThisObject[TableName] Do @@ -31,6 +34,11 @@ Procedure BeforeWrite(Cancel, WriteMode, PostingMode) CurrenciesClientServer.DeleteRowsByKeyFromCurrenciesTable(ThisObject.Currencies, Row.Key); CurrenciesServer.UpdateCurrencyTable(Parameters, ThisObject.Currencies); EndDo; + For Each Row In ThisObject.CashInTransit Do + Parameters = CurrenciesClientServer.GetParameters_V6(ThisObject, Row); + CurrenciesClientServer.DeleteRowsByKeyFromCurrenciesTable(ThisObject.Currencies, Row.Key); + CurrenciesServer.UpdateCurrencyTable(Parameters, ThisObject.Currencies); + EndDo; For Each Row In ThisObject.AdvanceFromCustomers Do Parameters = CurrenciesClientServer.GetParameters_V6(ThisObject, Row); CurrenciesClientServer.DeleteRowsByKeyFromCurrenciesTable(ThisObject.Currencies, Row.Key); @@ -51,6 +59,11 @@ Procedure BeforeWrite(Cancel, WriteMode, PostingMode) CurrenciesClientServer.DeleteRowsByKeyFromCurrenciesTable(ThisObject.Currencies, Row.Key); CurrenciesServer.UpdateCurrencyTable(Parameters, ThisObject.Currencies); EndDo; + For Each Row In ThisObject.AccountReceivableOther Do + Parameters = CurrenciesClientServer.GetParameters_V4(ThisObject, Row); + CurrenciesClientServer.DeleteRowsByKeyFromCurrenciesTable(ThisObject.Currencies, Row.Key); + CurrenciesServer.UpdateCurrencyTable(Parameters, ThisObject.Currencies); + EndDo; For Each Row In ThisObject.AccountPayableByAgreements Do Parameters = CurrenciesClientServer.GetParameters_V4(ThisObject, Row); CurrenciesClientServer.DeleteRowsByKeyFromCurrenciesTable(ThisObject.Currencies, Row.Key); @@ -61,6 +74,11 @@ Procedure BeforeWrite(Cancel, WriteMode, PostingMode) CurrenciesClientServer.DeleteRowsByKeyFromCurrenciesTable(ThisObject.Currencies, Row.Key); CurrenciesServer.UpdateCurrencyTable(Parameters, ThisObject.Currencies); EndDo; + For Each Row In ThisObject.AccountPayableOther Do + Parameters = CurrenciesClientServer.GetParameters_V4(ThisObject, Row); + CurrenciesClientServer.DeleteRowsByKeyFromCurrenciesTable(ThisObject.Currencies, Row.Key); + CurrenciesServer.UpdateCurrencyTable(Parameters, ThisObject.Currencies); + EndDo; For Each Row In ThisObject.ReceiptFromConsignor Do Parameters = CurrenciesClientServer.GetParameters_V9(ThisObject, Row); CurrenciesClientServer.DeleteRowsByKeyFromCurrenciesTable(ThisObject.Currencies, Row.Key); diff --git a/IRP/src/Documents/OpeningEntry/OpeningEntry.mdo b/IRP/src/Documents/OpeningEntry/OpeningEntry.mdo index 012f853e7b..759f8a09a5 100644 --- a/IRP/src/Documents/OpeningEntry/OpeningEntry.mdo +++ b/IRP/src/Documents/OpeningEntry/OpeningEntry.mdo @@ -108,6 +108,9 @@ AccumulationRegister.R3027B_EmployeeCashAdvance AccumulationRegister.R2023B_AdvancesFromRetailCustomers AccumulationRegister.R9510B_SalaryPayment + AccumulationRegister.R5015B_OtherPartnersTransactions + AccumulationRegister.R3021B_CashInTransitIncoming + AccumulationRegister.CashInTransit true true DontUse @@ -3217,4 +3220,546 @@ Use + + + + + + AccountReceivableOther + + en + Account receivable other + + + ru + Account receivable other + + + tr + Account receivable other + + + Key + + en + Key + + + ru + Ключ + + + tr + Anahtar + + + DefinedType.typeRowID + + + + Use + Use + + + Partner + + en + Partner + + + ru + Партнер + + + tr + Cari hesap + + + CatalogRef.Partners + + + + ShowError + Use + Use + + + LegalName + + en + Legal name + + + ru + Контрагент + + + tr + Fatura hesabı + + + CatalogRef.Companies + + + + ShowError + Use + Use + + + Agreement + + en + Partner term + + + ru + Соглашение + + + tr + Sözleşme + + + CatalogRef.Agreements + + + + ShowError + Use + Use + + + Currency + + en + Currency + + + ru + Валюта + + + tr + Döviz + + + CatalogRef.Currencies + + + + ShowError + Use + Use + + + Amount + + en + Amount + + + ru + Сумма + + + tr + Tutar + + + DefinedType.typeAmount + + + + ShowError + Use + Use + + + LegalNameContract + + en + Legal name contract + + + ru + Договор контрагента + + + tr + Fatura hesap kontratı + + + CatalogRef.LegalNameContracts + + + + + Filter.Company + Document.OpeningEntry.Attribute.Company + + Use + Use + + + + + + + + AccountPayableOther + + en + Account payable other + + + ru + Account payable other + + + tr + Account payable other + + + Key + + en + Key + + + ru + Ключ + + + tr + Anahtar + + + DefinedType.typeRowID + + + + Use + Use + + + Partner + + en + Partner + + + ru + Партнер + + + tr + Cari hesap + + + CatalogRef.Partners + + + + ShowError + Use + Use + + + LegalName + + en + Legal name + + + ru + Контрагент + + + tr + Fatura hesabı + + + CatalogRef.Companies + + + + ShowError + Use + Use + + + Agreement + + en + Partner term + + + ru + Соглашение + + + tr + Sözleşme + + + CatalogRef.Agreements + + + + ShowError + Use + Use + + + Currency + + en + Currency + + + ru + Валюта + + + tr + Döviz + + + CatalogRef.Currencies + + + + ShowError + Use + Use + + + Amount + + en + Amount + + + ru + Сумма + + + tr + Tutar + + + DefinedType.typeAmount + + + + ShowError + Use + Use + + + LegalNameContract + + en + Legal name contract + + + ru + Договор контрагента + + + tr + Fatura hesap kontratı + + + CatalogRef.LegalNameContracts + + + + + Filter.Company + Document.OpeningEntry.Attribute.Company + + Use + Use + + + + + + + + CashInTransit + + en + Cash in transit + + + ru + Денежные средства в пути + + + tr + Yoldaki paralar (CashInTransit) + + + Key + + en + Key + + + ru + Ключ + + + tr + Anahtar + + + DefinedType.typeRowID + + + + Use + Use + + + Account + + en + Account + + + ru + Касса/банк + + + tr + Hesap + + + CatalogRef.CashAccounts + + + + ShowError + Use + Use + + + Currency + + en + Currency + + + ru + Валюта + + + tr + Döviz + + + CatalogRef.Currencies + + + + ShowError + Use + Use + + + Amount + + en + Amount + + + ru + Сумма + + + tr + Tutar + + + DefinedType.typeAmount + + + + ShowError + Use + Use + + + IsFixedCurrency + + en + Is fixed currency + + + ru + Фиксированная валюта + + + tr + Döviz sabittir + + + Boolean + + + + Use + Use + + + ReceiptingAccount + + en + Receipting account + + + ru + Касса/банк получатель + + + tr + Alıcı kasa/banka + + + CatalogRef.CashAccounts + + + + ShowError + Use + Use + + + ReceiptingBranch + + en + Receipting branch + + + ru + Структурное подразделение получатель + + + tr + Receipting branch + + + CatalogRef.BusinessUnits + + + + ShowError + Use + Use + + \ No newline at end of file diff --git a/features/External/ImportData.feature b/features/External/ImportData.feature index 5dd456aa98..32f284fd5a 100644 --- a/features/External/ImportData.feature +++ b/features/External/ImportData.feature @@ -3043,23 +3043,23 @@ Scenario: Create OtherPartners objects // Catalog.Partners And I check or create catalog "Partners" objects: - | 'Ref' | 'DeletionMark' | 'Parent' | 'Code' | 'Customer' | 'Vendor' | 'Employee' | 'Consignor' | 'TradeAgent' | 'Other' | 'ManagerSegment' | 'Description_en' | 'Description_hash' | 'Description_ru' | 'Description_tr' | - | 'e1cib/data/Catalog.Partners?ref=b79ea93fec1998ed11ee09140139bba0' | 'False' | '' | 80 | 'False' | 'False' | 'False' | 'False' | 'False' | 'True' | '' | 'Other partner 1' | '' | '' | '' | - | 'e1cib/data/Catalog.Partners?ref=b79ea93fec1998ed11ee09140139bba3' | 'False' | '' | 81 | 'False' | 'False' | 'False' | 'False' | 'False' | 'True' | '' | 'Other partner 2' | '' | '' | '' | + | 'Ref' | 'DeletionMark' | 'Parent' | 'Customer' | 'Vendor' | 'Employee' | 'Consignor' | 'TradeAgent' | 'Other' | 'ManagerSegment' | 'Description_en' | 'Description_hash' | 'Description_ru' | 'Description_tr' | + | 'e1cib/data/Catalog.Partners?ref=b79ea93fec1998ed11ee09140139bba0' | 'False' | '' | 'False' | 'False' | 'False' | 'False' | 'False' | 'True' | '' | 'Other partner 1' | '' | '' | '' | + | 'e1cib/data/Catalog.Partners?ref=b79ea93fec1998ed11ee09140139bba3' | 'False' | '' | 'False' | 'False' | 'False' | 'False' | 'False' | 'True' | '' | 'Other partner 2' | '' | '' | '' | // Catalog.Companies And I check or create catalog "Companies" objects: - | 'Ref' | 'DeletionMark' | 'Code' | 'Country' | 'MainCompany' | 'Partner' | 'Type' | 'OurCompany' | 'LandedCostCurrencyMovementType' | 'LandedCostExpenseType' | 'LandedCostFillEmptyAmount' | 'LandedCostPriceTypeForEmptyAmount' | 'TradeAgentStore' | 'TaxID' | 'Description_en' | 'Description_hash' | 'Description_ru' | 'Description_tr' | - | 'e1cib/data/Catalog.Companies?ref=b79ea93fec1998ed11ee09140139bba1' | 'False' | 120 | '' | '' | 'e1cib/data/Catalog.Partners?ref=b79ea93fec1998ed11ee09140139bba0' | 'Enum.CompanyLegalType.Company' | 'False' | '' | '' | 'False' | '' | '' | '' | 'Other partner 1' | '' | '' | '' | - | 'e1cib/data/Catalog.Companies?ref=b79ea93fec1998ed11ee09140139bba4' | 'False' | 121 | '' | '' | 'e1cib/data/Catalog.Partners?ref=b79ea93fec1998ed11ee09140139bba3' | 'Enum.CompanyLegalType.Company' | 'False' | '' | '' | 'False' | '' | '' | '' | 'Other partner 2' | '' | '' | '' | + | 'Ref' | 'DeletionMark' | 'Country' | 'MainCompany' | 'Partner' | 'Type' | 'OurCompany' | 'LandedCostCurrencyMovementType' | 'LandedCostExpenseType' | 'LandedCostFillEmptyAmount' | 'LandedCostPriceTypeForEmptyAmount' | 'TradeAgentStore' | 'TaxID' | 'Description_en' | 'Description_hash' | 'Description_ru' | 'Description_tr' | + | 'e1cib/data/Catalog.Companies?ref=b79ea93fec1998ed11ee09140139bba1' | 'False' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b79ea93fec1998ed11ee09140139bba0' | 'Enum.CompanyLegalType.Company' | 'False' | '' | '' | 'False' | '' | '' | '' | 'Other partner 1' | '' | '' | '' | + | 'e1cib/data/Catalog.Companies?ref=b79ea93fec1998ed11ee09140139bba4' | 'False' | '' | '' | 'e1cib/data/Catalog.Partners?ref=b79ea93fec1998ed11ee09140139bba3' | 'Enum.CompanyLegalType.Company' | 'False' | '' | '' | 'False' | '' | '' | '' | 'Other partner 2' | '' | '' | '' | // Catalog.Agreements And I check or create catalog "Agreements" objects: - | 'Ref' | 'DeletionMark' | 'Code' | 'Number' | 'Date' | 'PartnerSegment' | 'Partner' | 'Company' | 'PriceType' | 'ItemSegment' | 'StartUsing' | 'EndOfUse' | 'ManagerSegment' | 'PriceIncludeTax' | 'DaysBeforeDelivery' | 'Store' | 'Type' | 'LegalName' | 'CurrencyMovementType' | 'ApArPostingDetail' | 'StandardAgreement' | 'Kind' | 'UseCreditLimit' | 'CreditLimitAmount' | 'PaymentTerm' | 'TradeAgentFeeType' | 'TradeAgentFeePercent' | 'TradeAgentFeeItem' | 'TradeAgentFeeItemKey' | 'TradeAgentFeeProfitLossCenter' | 'TradeAgentFeeExpenseRevenueType' | 'Description_en' | 'Description_hash' | 'Description_ru' | 'Description_tr' | - | 'e1cib/data/Catalog.Agreements?ref=b79ea93fec1998ed11ee09140139bba2' | 'False' | 130 | '1' | '01.01.2023 00:00:00' | '' | 'e1cib/data/Catalog.Partners?ref=b79ea93fec1998ed11ee09140139bba0' | '' | '' | '' | '01.01.2023 00:00:00' | '01.01.0001 00:00:00' | '' | 'False' | | '' | 'Enum.AgreementTypes.Other' | 'e1cib/data/Catalog.Companies?ref=b79ea93fec1998ed11ee09140139bba1' | 'e1cib/data/ChartOfCharacteristicTypes.CurrencyMovementType?ref=aa78120ed92fbced11eaf113ba6c185f' | 'Enum.ApArPostingDetail.ByAgreements' | '' | 'Enum.AgreementKinds.Regular' | 'False' | | '' | '' | | '' | '' | '' | '' | 'Other partner 1' | '' | '' | '' | - | 'e1cib/data/Catalog.Agreements?ref=b79ea93fec1998ed11ee09140139bba5' | 'False' | 131 | '' | '01.01.2023 00:00:00' | '' | 'e1cib/data/Catalog.Partners?ref=b79ea93fec1998ed11ee09140139bba3' | '' | '' | '' | '01.01.2023 00:00:00' | '01.01.0001 00:00:00' | '' | 'False' | | '' | 'Enum.AgreementTypes.Other' | 'e1cib/data/Catalog.Companies?ref=b79ea93fec1998ed11ee09140139bba4' | 'e1cib/data/ChartOfCharacteristicTypes.CurrencyMovementType?ref=aa78120ed92fbced11eaf113ba6c185f' | 'Enum.ApArPostingDetail.ByAgreements' | '' | 'Enum.AgreementKinds.Regular' | 'False' | | '' | '' | | '' | '' | '' | '' | 'Other partner 2' | '' | '' | '' | + | 'Ref' | 'DeletionMark' | 'Number' | 'Date' | 'PartnerSegment' | 'Partner' | 'Company' | 'PriceType' | 'ItemSegment' | 'StartUsing' | 'EndOfUse' | 'ManagerSegment' | 'PriceIncludeTax' | 'DaysBeforeDelivery' | 'Store' | 'Type' | 'LegalName' | 'CurrencyMovementType' | 'ApArPostingDetail' | 'StandardAgreement' | 'Kind' | 'UseCreditLimit' | 'CreditLimitAmount' | 'PaymentTerm' | 'TradeAgentFeeType' | 'TradeAgentFeePercent' | 'TradeAgentFeeItem' | 'TradeAgentFeeItemKey' | 'TradeAgentFeeProfitLossCenter' | 'TradeAgentFeeExpenseRevenueType' | 'Description_en' | 'Description_hash' | 'Description_ru' | 'Description_tr' | + | 'e1cib/data/Catalog.Agreements?ref=b79ea93fec1998ed11ee09140139bba2' | 'False' | '1' | '01.01.2023 00:00:00' | '' | 'e1cib/data/Catalog.Partners?ref=b79ea93fec1998ed11ee09140139bba0' | '' | '' | '' | '01.01.2023 00:00:00' | '01.01.0001 00:00:00' | '' | 'False' | | '' | 'Enum.AgreementTypes.Other' | 'e1cib/data/Catalog.Companies?ref=b79ea93fec1998ed11ee09140139bba1' | 'e1cib/data/ChartOfCharacteristicTypes.CurrencyMovementType?ref=aa78120ed92fbced11eaf113ba6c185f' | 'Enum.ApArPostingDetail.ByAgreements' | '' | 'Enum.AgreementKinds.Regular' | 'False' | | '' | '' | | '' | '' | '' | '' | 'Other partner 1' | '' | '' | '' | + | 'e1cib/data/Catalog.Agreements?ref=b79ea93fec1998ed11ee09140139bba5' | 'False' | '' | '01.01.2023 00:00:00' | '' | 'e1cib/data/Catalog.Partners?ref=b79ea93fec1998ed11ee09140139bba3' | '' | '' | '' | '01.01.2023 00:00:00' | '01.01.0001 00:00:00' | '' | 'False' | | '' | 'Enum.AgreementTypes.Other' | 'e1cib/data/Catalog.Companies?ref=b79ea93fec1998ed11ee09140139bba4' | 'e1cib/data/ChartOfCharacteristicTypes.CurrencyMovementType?ref=aa78120ed92fbced11eaf113ba6c185f' | 'Enum.ApArPostingDetail.ByAgreements' | '' | 'Enum.AgreementKinds.Regular' | 'False' | | '' | '' | | '' | '' | '' | '' | 'Other partner 2' | '' | '' | '' | Scenario: Create catalog SpecialOffers objects (Document discount for row) diff --git a/features/Internal/_2800 Posting opening entries/_2800PostingOpeningEntries.feature b/features/Internal/_2800 Posting opening entries/_2800PostingOpeningEntries.feature index dfd4b8e33c..3272ab0a6d 100644 --- a/features/Internal/_2800 Posting opening entries/_2800PostingOpeningEntries.feature +++ b/features/Internal/_2800 Posting opening entries/_2800PostingOpeningEntries.feature @@ -1,4 +1,4 @@ -#language: en +#language: en @tree @Positive @OpeningEntries @@ -32,6 +32,8 @@ Scenario: _400000 preparation (Opening entries) When Create catalog ObjectStatuses objects When Create catalog ItemKeys objects When Create catalog ItemTypes objects + When Create catalog BusinessUnits objects + When Create OtherPartners objects When Create catalog Units objects When Create catalog Items objects When Create catalog PriceTypes objects @@ -1434,6 +1436,129 @@ Scenario: _400014 create OpeningEntry (advance from retail customer) | '1 200,00' | 'Sam Jons' | 'TRY' | And I close all client application windows +Scenario: _400019 create OpeningEntry (cash in transit) + And I close all client application windows + * Open document form opening entry + Given I open hyperlink "e1cib/list/Document.OpeningEntry" + And I click the button named "FormCreate" + * Filling in company info + And I click Select button of "Company" field + And I go to line in "List" table + | Description | + | Main Company | + And I select current line in "List" table + * Filling cash in transit tab + And I move to "Cash in transit" tab + And in the table "CashInTransit" I click the button named "CashInTransitAdd" + And I activate field named "CashInTransitAccount" in "CashInTransit" table + And I select current line in "CashInTransit" table + And I click choice button of the attribute named "CashInTransitAccount" in "CashInTransit" table + And I go to line in "List" table + | 'Description' | + | 'Bank account, EUR' | + And I select current line in "List" table + And I activate "Receipting account" field in "CashInTransit" table + And I click choice button of "Receipting account" attribute in "CashInTransit" table + And I go to line in "List" table + | 'Description' | + | 'Bank account 2, EUR' | + And I select current line in "List" table + And I click choice button of "Receipting branch" attribute in "CashInTransit" table + And I go to line in "List" table + | 'Description' | + | 'Front office' | + And I select current line in "List" table + And I activate field named "CashInTransitAmount" in "CashInTransit" table + And I input "50,00" text in the field named "CashInTransitAmount" of "CashInTransit" table + And I finish line editing in "CashInTransit" table + And in the table "CashInTransit" I click the button named "CashInTransitAdd" + And I activate field named "CashInTransitAccount" in "CashInTransit" table + And I select current line in "CashInTransit" table + And I click choice button of the attribute named "CashInTransitAccount" in "CashInTransit" table + And I go to line in "List" table + | 'Description' | + | 'Cash desk №1' | + And I select current line in "List" table + And I activate "Receipting account" field in "CashInTransit" table + And I click choice button of "Receipting account" attribute in "CashInTransit" table + And I go to line in "List" table + | 'Description' | + | 'Cash desk №4' | + And I select current line in "List" table + And I click choice button of "Receipting branch" attribute in "CashInTransit" table + And I go to line in "List" table + | 'Description' | + | 'Front office' | + And I select current line in "List" table + And I activate field named "CashInTransitAmount" in "CashInTransit" table + And I input "50,00" text in the field named "CashInTransitAmount" of "CashInTransit" table + And I finish line editing in "CashInTransit" table + And I click the button named "FormPost" + And I delete "$$NumberOpeningEntry400019$$" variable + And I delete "$$OpeningEntry400019$$" variable + And I save the value of "Number" field as "$$NumberOpeningEntry400019$$" + And I save the window as "$$OpeningEntry400019$$" + * Check creation + Given I open hyperlink "e1cib/list/Document.OpeningEntry" + And "List" table contains lines + | 'Number' | + | '$$NumberOpeningEntry400019$$' | + + + +Scenario: _400020 create OpeningEntry (account payble other and account receivable other) + And I close all client application windows + * Open document form opening entry + Given I open hyperlink "e1cib/list/Document.OpeningEntry" + And I click the button named "FormCreate" + * Filling in company info + And I click Select button of "Company" field + And I go to line in "List" table + | Description | + | Main Company | + And I select current line in "List" table + * Filling Account payble (other) + And I move to "Account payable (other)" tab + And in the table "AccountPayableOther" I click the button named "AccountPayableOtherAdd" + And I click choice button of the attribute named "AccountPayableOtherPartner" in "AccountPayableOther" table + And I go to line in "List" table + | 'Description' | + | 'Other partner 1' | + And I select current line in "List" table + And I activate field named "AccountPayableOtherAmount" in "AccountPayableOther" table + And I input "50,00" text in the field named "AccountPayableOtherAmount" of "AccountPayableOther" table + And I finish line editing in "AccountPayableOther" table + And in the table "AccountPayableOther" I click the button named "AccountPayableOtherAdd" + And I click choice button of the attribute named "AccountPayableOtherPartner" in "AccountPayableOther" table + And I go to line in "List" table + | 'Description' | + | 'Other partner 2' | + And I select current line in "List" table + And I activate field named "AccountPayableOtherAmount" in "AccountPayableOther" table + And I input "70,00" text in the field named "AccountPayableOtherAmount" of "AccountPayableOther" table + And I finish line editing in "AccountPayableOther" table + And I move to "Account receivable (other)" tab + And in the table "AccountReceivableOther" I click the button named "AccountReceivableOtherAdd" + And I click choice button of the attribute named "AccountReceivableOtherPartner" in "AccountReceivableOther" table + And I go to line in "List" table + | 'Description' | + | 'Other' | + And I select current line in "List" table + And I activate field named "AccountReceivableOtherAmount" in "AccountReceivableOther" table + And I input "10,00" text in the field named "AccountReceivableOtherAmount" of "AccountReceivableOther" table + And I finish line editing in "AccountReceivableOther" table + And I click the button named "FormPost" + And I delete "$$NumberOpeningEntry400020$$" variable + And I delete "$$OpeningEntry400020$$" variable + And I save the value of "Number" field as "$$NumberOpeningEntry400020$$" + And I save the window as "$$OpeningEntry400020$$" + * Check creation + Given I open hyperlink "e1cib/list/Document.OpeningEntry" + And "List" table contains lines + | 'Number' | + | '$$NumberOpeningEntry400020$$' | + + Scenario: _999999 close TestClient session diff --git a/features/Internal/_8510 FiscalPrinter/_8510FiscalPrinter.feature b/features/Internal/_8510 FiscalPrinter/_8510FiscalPrinter.feature index 2c37d512a8..ae02f29ff6 100644 --- a/features/Internal/_8510 FiscalPrinter/_8510FiscalPrinter.feature +++ b/features/Internal/_8510 FiscalPrinter/_8510FiscalPrinter.feature @@ -12,12 +12,12 @@ SalesReceiptXML1 = """xml - + - + - + @@ -27,11 +27,11 @@ SalesReceiptXML2 = """xml - + - - - + + + @@ -41,12 +41,12 @@ SalesReceiptXML3 = """xml - + - - - - + + + + @@ -56,9 +56,9 @@ SalesReceiptXML4 = """xml - + - + @@ -67,9 +67,9 @@ SalesReceiptXML5 = """xml - + - + @@ -79,11 +79,11 @@ SalesReceiptXML6 = """xml - + - + - + """ @@ -91,9 +91,9 @@ SalesReceiptXML7 = """xml - + - + @@ -103,9 +103,9 @@ SalesReceiptXML8 = """xml - + - + @@ -115,18 +115,18 @@ SalesReceiptXML9 = """xml - + - + - + - + - + @@ -136,10 +136,10 @@ SalesReceiptXML10 = """xml - + - - + + @@ -149,9 +149,9 @@ SalesReceiptXML11 = """xml - + - + @@ -161,9 +161,9 @@ SalesReceiptXML12 = """xml - + - + @@ -959,9 +959,9 @@ Scenario: _0850019 create retail sales receipt from POS (own stock, card 03, use And I parsed the log of the fiscal emulator by the path '$$LogPath$$' into the variable "ParsingResult" And I check "$ParsingResult$" with "0" and method is "ProcessCheck" And I check "$ParsingResult$" with "0" and data in "In.Parameter3" the same as "SalesReceiptXML10" - And I check "$ParsingResult$" with "7" and method is "PrintTextDocument" - And I check "$ParsingResult$" with "7" and data in "In.Parameter2" contains 'TextString Text="ОПЛАТА' - And I check "$ParsingResult$" with "7" and data in "In.Parameter2" contains '620.00' + And I check "$ParsingResult$" with "6" and method is "PrintTextDocument" + And I check "$ParsingResult$" with "6" and data in "In.Parameter2" contains 'TextString Text="ОПЛАТА' + And I check "$ParsingResult$" with "6" and data in "In.Parameter2" contains '620.00' * Check acquiring log And I parsed the log of the fiscal emulator by the path '$$LogPathAcquiring$$' into the variable "ParsingResult1" And I check "$ParsingResult1$" with "1" and method is "PayByPaymentCard" @@ -1008,9 +1008,9 @@ Scenario: _0850020 check auto payment form by acquiring (Enter) And I check "$ParsingResult$" with "7" and method is "PrintTextDocument" And I check "$ParsingResult$" with "7" and data in "In.Parameter2" contains 'TextString Text="ОПЛАТА' And I check "$ParsingResult$" with "7" and data in "In.Parameter2" contains '50.00' - And I check "$ParsingResult$" with "8" and method is "PrintTextDocument" - And I check "$ParsingResult$" with "8" and data in "In.Parameter2" contains 'TextString Text="ОПЛАТА' - And I check "$ParsingResult$" with "8" and data in "In.Parameter2" contains '50.00' + And I check "$ParsingResult$" with "7" and method is "PrintTextDocument" + And I check "$ParsingResult$" with "7" and data in "In.Parameter2" contains 'TextString Text="ОПЛАТА' + And I check "$ParsingResult$" with "7" and data in "In.Parameter2" contains '50.00' * Check acquiring log And Delay 5 And I parsed the log of the fiscal emulator by the path '$$LogPathAcquiring$$' into the variable "ParsingResult1" @@ -1136,12 +1136,12 @@ Scenario: _0850023 check return payment by card and cash (sales by card) And I check "$ParsingResult$" with "0" and method is "ProcessCheck" And I check "$ParsingResult$" with "0" and data in "In.Parameter3" contains 'ElectronicPayment="90"' And I check "$ParsingResult$" with "0" and data in "In.Parameter3" contains 'Cash="10"' + And I check "$ParsingResult$" with "6" and method is "PrintTextDocument" + And I check "$ParsingResult$" with "6" and data in "In.Parameter2" contains 'TextString Text="ОТМЕНА ПЛАТЕЖА' + And I check "$ParsingResult$" with "6" and data in "In.Parameter2" contains '40.00' And I check "$ParsingResult$" with "7" and method is "PrintTextDocument" And I check "$ParsingResult$" with "7" and data in "In.Parameter2" contains 'TextString Text="ОТМЕНА ПЛАТЕЖА' - And I check "$ParsingResult$" with "7" and data in "In.Parameter2" contains '40.00' - And I check "$ParsingResult$" with "8" and method is "PrintTextDocument" - And I check "$ParsingResult$" with "8" and data in "In.Parameter2" contains 'TextString Text="ОТМЕНА ПЛАТЕЖА' - And I check "$ParsingResult$" with "8" and data in "In.Parameter2" contains '50.00' + And I check "$ParsingResult$" with "7" and data in "In.Parameter2" contains '50.00' And I close all client application windows Scenario: _0850024 return by card without basis document (without RRN) @@ -2246,8 +2246,8 @@ Scenario: _0260159 check marking code without check code string * Check fiscal log And I parsed the log of the fiscal emulator by the path '$$LogPath$$' into the variable "ParsingResult" And Delay 5 - And I check "$ParsingResult$" with "2" and method is "ProcessCheck" - And I check "$ParsingResult$" with "2" and data in "In.Parameter3" the same as "SalesReceiptXML12" + And I check "$ParsingResult$" with "0" and method is "ProcessCheck" + And I check "$ParsingResult$" with "0" and data in "In.Parameter3" the same as "SalesReceiptXML12" Scenario: _0260152 close session