From 525cf789391e3398d8390053f41a2e250bf7c5a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szab=C3=B3=20Iv=C3=A1n?= Date: Thu, 10 Sep 2020 16:30:26 +0200 Subject: [PATCH] InstantFeedBackView --- .../BusinessObjects/Migration/Migration_VC.cs | 16 ++-- .../Reports/VAT/VATReportVC.vb | 92 ++++++++++--------- .../Controllers/InLineEditVC.vb | 14 ++- Nuvolar.Module/Model.DesignedDiffs.xafml | 45 +++++---- Nuvolar.WIN.Debranet.GL/Model.xafml | 2 +- 5 files changed, 94 insertions(+), 75 deletions(-) diff --git a/Nuvolar.Module.CSharp/BusinessObjects/Migration/Migration_VC.cs b/Nuvolar.Module.CSharp/BusinessObjects/Migration/Migration_VC.cs index 7cd5a9e..015355d 100644 --- a/Nuvolar.Module.CSharp/BusinessObjects/Migration/Migration_VC.cs +++ b/Nuvolar.Module.CSharp/BusinessObjects/Migration/Migration_VC.cs @@ -1527,7 +1527,7 @@ namespace Nuvolar.Module.BusinessObjects.Migration if (_SqlConnection.State == ConnectionState.Open) { - _SQL = string.Format(" select count(*) FROM InvoiceHeader t1 WHERE DateExecution>='{0}' AND t1.DateExecution <='{1}'", + _SQL = string.Format(" select count(*) FROM InvoiceHeader t1 WHERE DateExecution>='{0}' AND t1.DateExecution <='{1}' AND t1.GCRecord IS NULL AND t1.IsEditable<>1 AND ISNULL(t1.DocumentNumber,'')<>''", _MigrationParameters.DateFrom.Date.ToString("yyyy-MM-dd"), _MigrationParameters.DateTo.Date.ToString("yyyy-MM-dd")); using (SqlCommand _SqlCommand = new SqlCommand(_SQL, _SqlConnection)) { @@ -1536,7 +1536,7 @@ namespace Nuvolar.Module.BusinessObjects.Migration if (_Count != null) { - _SQL = string.Format(" select t1.Oid FROM InvoiceHeader t1 WHERE DateExecution>='{0}' AND t1.DateExecution <='{1}'", + _SQL = string.Format(" select t1.Oid FROM InvoiceHeader t1 WHERE DateExecution>='{0}' AND t1.DateExecution <='{1}' AND t1.GCRecord IS NULL AND t1.IsEditable<>1 AND ISNULL(t1.DocumentNumber,'')<>''", _MigrationParameters.DateFrom.Date.ToString("yyyy-MM-dd"), _MigrationParameters.DateTo.Date.ToString("yyyy-MM-dd")); using (SqlCommand _SqlCommand = new SqlCommand(_SQL, _SqlConnection)) @@ -2047,7 +2047,7 @@ namespace Nuvolar.Module.BusinessObjects.Migration if (_SqlConnection.State == ConnectionState.Open) { - _SQL = string.Format(" select count(*) FROM GLHeader t1 join GLAccounts t2 on t1.Oid = t2.Oid WHERE t1.DateExecution>='{0}' AND t1.DateExecution <='{1}'", + _SQL = string.Format(" select count(*) FROM GLHeader t1 join GLAccounts t2 on t1.Oid = t2.Oid WHERE t1.DateExecution>='{0}' AND t1.DateExecution <='{1}' AND t1.GCRecord IS NULL AND t1.IsEditable=False AND ISNULL(t1.DocumentNumber,'')<>''", _MigrationParameters.DateFrom.Date.ToString("yyyy-MM-dd"), _MigrationParameters.DateTo.Date.ToString("yyyy-MM-dd")); using (SqlCommand _SqlCommand = new SqlCommand(_SQL, _SqlConnection)) { @@ -2057,7 +2057,7 @@ namespace Nuvolar.Module.BusinessObjects.Migration if (_Count != null) { _SQL = string.Format(" SELECT t1.Oid FROM GLHeader t1 join GLAccounts t2 on t1.Oid = t2.Oid " + - " WHERE t1.DateExecution>='{0}' AND t1.DateExecution <='{1}' AND t1.GCRecord IS NULL AND t1.IsEditable=False", + " WHERE t1.DateExecution>='{0}' AND t1.DateExecution <='{1}' AND t1.GCRecord IS NULL AND t1.IsEditable=False AND ISNULL(t1.DocumentNumber,'')<>''", _MigrationParameters.DateFrom.Date.ToString("yyyy-MM-dd"), _MigrationParameters.DateTo.Date.ToString("yyyy-MM-dd")); using (SqlCommand _SqlCommand = new SqlCommand(_SQL, _SqlConnection)) @@ -2193,7 +2193,7 @@ namespace Nuvolar.Module.BusinessObjects.Migration " t1.Controlling=t7.Controlling AND t7.AccountYear=Year(t4.DateExecution)" + " WHERE t1.InvoiceHeader ='{0}' AND t1.GCRecord IS NULL AND t7.GCRecord IS NULL AND t5.GCRecord IS NULL" + - " GROUP BY t1.Controlling,t3.Name,t1.VAT", _InvoiceHeader_OID); + " GROUP BY t1.Controlling,t3.Name,t1.VAT", _GLHeader_OID); using (SqlCommand _SqlCommand = new SqlCommand(_SQL, _SqlConnection)) { using (SqlDataReader _SqlDataReader = _SqlCommand.ExecuteReader()) @@ -2207,7 +2207,7 @@ namespace Nuvolar.Module.BusinessObjects.Migration { _GLRows = new GLRows(_uow); _GLRows.GLHeader = _GLAccounts; - _GLRows.NoteRows = "ÉRTÉKESÍTÉS NETTÓ"; + _GLRows.NoteRows = "BESZERZÉS NETTÓ"; _GLRows.DebitChartOfAccounts = _uow.GetObjectByKey(_SqlDataReader["ChartOfAccountsT"]); _GLRows.CreditChartOfAccounts = _uow.GetObjectByKey(_SqlDataReader["ChartOfAccountsK"]); _GLRows.AmountHUF = (double)_SqlDataReader["SumPriceHUF"]; @@ -2246,7 +2246,7 @@ namespace Nuvolar.Module.BusinessObjects.Migration " t2.Customers=t3.Oid LEFT JOIN CustomersGLParametersYear t4 ON" + " Year(t2.DateExecution) = t4.AccountYear AND t4.CustomersGLParameters = t3.CustomersGLParameters LEFT JOIN VATYear t5 on" + " Year(t2.DateExecution) = t5.AccountYear AND t1.VAT=t5.VAT" + - " WHERE t2.Oid = '{0}' AND t1.GCRecord IS NULL", _InvoiceHeader_OID); + " WHERE t2.Oid = '{0}' AND t1.GCRecord IS NULL", _GLHeader_OID); using (SqlCommand _SqlCommand = new SqlCommand(_SQL, _SqlConnection)) { using (SqlDataReader _SqlDataReader = _SqlCommand.ExecuteReader()) @@ -2264,7 +2264,7 @@ namespace Nuvolar.Module.BusinessObjects.Migration _GLRows = new GLRows(_uow); _GLRows.GLHeader = _GLAccounts; - _GLRows.NoteRows = "ÉRTÉKESÍTÉS ÁFA"; + _GLRows.NoteRows = "BESZERZÉS ÁFA"; _GLRows.DebitChartOfAccounts = _uow.GetObjectByKey(_SqlDataReader["ChartOfAccountsT"]); _GLRows.CreditChartOfAccounts = _uow.GetObjectByKey(_SqlDataReader["ChartOfAccountsK"]); _GLRows.AmountHUF = (double)_SqlDataReader["AmountVATHUF"]; diff --git a/Nuvolar.Module.Win/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Reports/VAT/VATReportVC.vb b/Nuvolar.Module.Win/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Reports/VAT/VATReportVC.vb index 3ea8b59..1baf3ff 100644 --- a/Nuvolar.Module.Win/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Reports/VAT/VATReportVC.vb +++ b/Nuvolar.Module.Win/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Reports/VAT/VATReportVC.vb @@ -15,6 +15,7 @@ Imports System.IO Imports DevExpress.ExpressApp.CloneObject Imports DevExpress.ExpressApp.SystemModule Imports DevExpress.XtraSplashScreen +Imports DevExpress.ExpressApp.Xpo Structure VATReportNAVCodes_Structure Public VATCode As String @@ -138,9 +139,9 @@ Public Class VATReportVC If _SaveFileDialog.ShowDialog() = System.Windows.Forms.DialogResult.OK Then _FileName65 = _SaveFileDialog.FileName - Me.Create65XML(_ocur, _FileName65, _VATReport) + Me.Create1465XML(_ocur, _FileName65, _VATReport) - MsgBox(String.Format("Az XML file ""{0}"" nvvel a kvetkez helyen kerlt elmentsre:" + vbNewLine + "{1}", System.IO.Path.GetFileName(_SaveFileDialog.FileName), IO.Path.GetFullPath(_SaveFileDialog.FileName)), _ + MsgBox(String.Format("Az XML file ""{0}"" nvvel a kvetkez helyen kerlt elmentsre:" + vbNewLine + "{1}", System.IO.Path.GetFileName(_SaveFileDialog.FileName), IO.Path.GetFullPath(_SaveFileDialog.FileName)), MsgBoxStyle.OkOnly + MsgBoxStyle.Information, "Exportls befejezdtt!") End If End If @@ -249,7 +250,7 @@ Public Class VATReportVC _XmlTextWriter.WriteString(Mid(_VATReport.DateFrom.Year.ToString, 3, 2) & "65A") 'vente vltozhat !!!!!! _XmlTextWriter.WriteEndElement() _XmlTextWriter.WriteStartElement("nyomtatvanyverzio") - _XmlTextWriter.WriteString("2.0") + _XmlTextWriter.WriteString("4.0") _XmlTextWriter.WriteEndElement() _XmlTextWriter.WriteStartElement("adozo") _XmlTextWriter.WriteStartElement("nev") @@ -272,9 +273,9 @@ Public Class VATReportVC _XmlTextWriter.WriteEndElement() _XmlTextWriter.WriteStartElement("mezok") UploadField(_XmlTextWriter, "0A0001E001A", _VATReport.CustomersFrom.VATNumber.Replace("-", "")) - UploadField(_XmlTextWriter, "0A0001E005A", _VATReport.CustomersFrom.FullName) - UploadField(_XmlTextWriter, "0A0001E006A", _VATReport.CustomersFrom.AdministratorName) - UploadField(_XmlTextWriter, "0A0001E007A", _VATReport.CustomersFrom.AdministratorPhoneNumber) + UploadField(_XmlTextWriter, "0A0001E006A", _VATReport.CustomersFrom.FullName) + UploadField(_XmlTextWriter, "0A0001E007A", _VATReport.CustomersFrom.AdministratorName) + UploadField(_XmlTextWriter, "0A0001E008A", _VATReport.CustomersFrom.AdministratorPhoneNumber) 'UploadField(_XmlTextWriter, "0A0001F004A", "O") UploadField(_XmlTextWriter, "0A0001F006A", "H") @@ -408,6 +409,9 @@ Public Class VATReportVC Dim _VATReportGroup_12_Payabels_DB_Collection As New XPCollection(Of VATReportDetail)(_ocur.Session, CriteriaOperator.Parse("VATReport=? AND VAT.KeyValuePercent=12 AND PartnerType=1 AND VAT.ClaimState=True and VAT.InversState<>True and VAT.ShortName = 'Komp 12%'", _VATReport)) + UploadFieldByCode(_ocur, _XmlTextWriter, "0C0001C0069BA", "0C0001C0069CA", CriteriaOperator.Parse("VATReport=? AND VAT.KeyValuePercent=0 AND VAT.InversKeyValue=0.27 AND VAT.InversState=True AND PartnerType=1 AND VAT.ClaimState=True", _VATReport)) + UploadFieldByCode(_ocur, _XmlTextWriter, "0B0001C0014BA", "0B0001C0014CA", CriteriaOperator.Parse("VATReport=? AND VAT.KeyValuePercent=0 AND VAT.InversKeyValue=0.27 AND VAT.InversState=True AND PartnerType=0 AND VAT.ClaimState=True", _VATReport)) + If _VATReportGroup_5_Payabels_Collection.Count > 0 Then For Each _VATReportGroup As VATReportGroup In _VATReportGroup_5_Payabels_Collection _SumAmountVATIn += _VATReportGroup.AmountVATIn @@ -434,8 +438,10 @@ Public Class VATReportVC If _VATReportGroup_27_Payabels_Collection.Count > 0 Then For Each _VATReportGroup As VATReportGroup In _VATReportGroup_27_Payabels_Collection - _SumAmountVATIn += _VATReportGroup.AmountVATIn - _SumAmountVATInBase += _VATReportGroup.AmountVATInBase + If _VATReportGroup.VAT.XML65AFieldIDBaseValueIn = "0C0001C0066BA" Then + _SumAmountVATIn += _VATReportGroup.AmountVATIn + _SumAmountVATInBase += _VATReportGroup.AmountVATInBase + End If Next UploadField(_XmlTextWriter, "0C0001C0066BA", Math.Round(_SumAmountVATInBase / 1000, 0, MidpointRounding.AwayFromZero)) UploadField(_XmlTextWriter, "0C0001C0066CA", Math.Round(_SumAmountVATIn / 1000, 0, MidpointRounding.AwayFromZero)) @@ -446,8 +452,10 @@ Public Class VATReportVC If _VATReportGroup_0_Payabels_Collection.Count > 0 Then For Each _VATReportGroup As VATReportGroup In _VATReportGroup_0_Payabels_Collection - _SumAmountVATIn += _VATReportGroup.AmountVATIn - _SumAmountVATInBase += _VATReportGroup.AmountVATInBase + If _VATReportGroup.VAT.XML65AFieldIDBaseValueIn = "0C0001C0063BA" Then + _SumAmountVATIn += _VATReportGroup.AmountVATIn + _SumAmountVATInBase += _VATReportGroup.AmountVATInBase + End If Next UploadField(_XmlTextWriter, "0C0001C0063BA", Math.Round(_SumAmountVATInBase / 1000, 0, MidpointRounding.AwayFromZero)) End If @@ -495,7 +503,7 @@ Public Class VATReportVC UploadField(_XmlTextWriter, "0H0001B002A", _VATReport.CustomersFrom.VATNumber.Replace("-", "")) UploadField(_XmlTextWriter, "0H0001B004A", _VATReport.DateFrom.Year.ToString + _VATReport.DateFrom.Month.ToString("00") + _VATReport.DateFrom.Day.ToString("00")) UploadField(_XmlTextWriter, "0H0001B005A", _VATReport.DateTo.Year.ToString + _VATReport.DateTo.Month.ToString("00") + _VATReport.DateTo.Day.ToString("00")) - UploadField(_XmlTextWriter, "0H0001B006A", _VATReport.CustomersFrom.FullName) + 'UploadField(_XmlTextWriter, "0H0001B006A", _VATReport.CustomersFrom.FullName) 'UploadField(_XmlTextWriter, "0H0001B001A", _VATReport.CustomersFrom.VATNumber.Replace("-", "")) '_VATReport.DateFrom.Year.ToString + _VATReport.DateFrom.Month.ToString("00") + _VATReport.DateFrom.Day.ToString("00")) ' UploadField(_XmlTextWriter, "0H0001B002A", _VATReport.DateTo.Year.ToString + _VATReport.DateTo.Month.ToString("00") + _VATReport.DateTo.Day.ToString("00")) @@ -811,6 +819,21 @@ Public Class VATReportVC _XmlTextWriter.Flush() _XmlTextWriter.Close() End Sub + Private Sub UploadFieldByCode(_ocur As XPObjectSpace, _XmlTextWriter As XmlWriter, _FieldIDBase As String, _FieldID As String, _CriteriaOperator As CriteriaOperator) + Dim _SumAmountVATInBase As Double = 0 + Dim _SumAmountVATIn As Double = 0 + Dim _VATReportGroup_Collection As New XPCollection(Of VATReportGroup)(_ocur.Session, _CriteriaOperator) + + If _VATReportGroup_Collection.Count > 0 Then + For Each _VATReportGroup As VATReportGroup In _VATReportGroup_Collection + _SumAmountVATIn += _VATReportGroup.AmountVATIn + _SumAmountVATInBase += _VATReportGroup.AmountVATInBase + Next + UploadField(_XmlTextWriter, _FieldIDBase, Math.Round(_SumAmountVATInBase / 1000, 0, MidpointRounding.AwayFromZero)) + UploadField(_XmlTextWriter, _FieldID, Math.Round(_SumAmountVATIn / 1000, 0, MidpointRounding.AwayFromZero)) + End If + + End Sub Private Sub Create1465XML(_ocur As Xpo.XPObjectSpace, _FileName65 As String, _VATReport As VATReport) On Error Resume Next @@ -828,7 +851,7 @@ Public Class VATReportVC _XmlTextWriter.WriteString("96b82602300312ce6edd8ef0c784ef4419ba4186") _XmlTextWriter.WriteEndElement() _XmlTextWriter.WriteStartElement("programverzio") - _XmlTextWriter.WriteString("v.2.50.0") + _XmlTextWriter.WriteString("v.2.70.0") _XmlTextWriter.WriteEndElement() _XmlTextWriter.WriteEndElement() _XmlTextWriter.WriteStartElement("nyomtatvany") @@ -837,7 +860,7 @@ Public Class VATReportVC _XmlTextWriter.WriteString(Mid(_VATReport.DateFrom.Year.ToString, 3, 2) & "65A") 'vente vltozhat !!!!!! _XmlTextWriter.WriteEndElement() _XmlTextWriter.WriteStartElement("nyomtatvanyverzio") - _XmlTextWriter.WriteString("3.0") + _XmlTextWriter.WriteString("4.0") _XmlTextWriter.WriteEndElement() _XmlTextWriter.WriteStartElement("adozo") _XmlTextWriter.WriteStartElement("nev") @@ -859,30 +882,11 @@ Public Class VATReportVC _XmlTextWriter.WriteEndElement() _XmlTextWriter.WriteEndElement() _XmlTextWriter.WriteStartElement("mezok") + UploadField(_XmlTextWriter, "0A0001E001A", _VATReport.CustomersFrom.VATNumber.Replace("-", "")) - UploadField(_XmlTextWriter, "0A0001E008A", _VATReport.CustomersFrom.FullName) - ' UploadField(_XmlTextWriter, "0A0001E009A", "X") - UploadField(_XmlTextWriter, "0A0001E011A", _VATReport.CustomersFrom.Address1.ZipPostal) - UploadField(_XmlTextWriter, "0A0001E012A", _VATReport.CustomersFrom.Address1.City) - UploadField(_XmlTextWriter, "0A0001E013A", _VATReport.CustomersFrom.Address1.Street) - UploadField(_XmlTextWriter, "0A0001E014A", _VATReport.CustomersFrom.PublicLandAddress1) - - If _VATReport.CustomersFrom.Address2 IsNot Nothing Then - ' UploadField(_XmlTextWriter, "0A0001E020A", "X") - UploadField(_XmlTextWriter, "0A0001E022A", _VATReport.CustomersFrom.Address2.ZipPostal) - UploadField(_XmlTextWriter, "0A0001E023A", _VATReport.CustomersFrom.Address2.City) - UploadField(_XmlTextWriter, "0A0001E024A", _VATReport.CustomersFrom.Address2.Street) - UploadField(_XmlTextWriter, "0A0001E025A", _VATReport.CustomersFrom.PublicLandAddress2) - Else - ' UploadField(_XmlTextWriter, "0A0001E020A", "X") - UploadField(_XmlTextWriter, "0A0001E022A", _VATReport.CustomersFrom.Address1.ZipPostal) - UploadField(_XmlTextWriter, "0A0001E023A", _VATReport.CustomersFrom.Address1.City) - UploadField(_XmlTextWriter, "0A0001E024A", _VATReport.CustomersFrom.Address1.Street) - UploadField(_XmlTextWriter, "0A0001E025A", _VATReport.CustomersFrom.PublicLandAddress2) - End If - - UploadField(_XmlTextWriter, "0A0001E031A", _VATReport.CustomersFrom.AdministratorName) - UploadField(_XmlTextWriter, "0A0001E032A", _VATReport.CustomersFrom.AdministratorPhoneNumber) + UploadField(_XmlTextWriter, "0A0001E006A", _VATReport.CustomersFrom.FullName) + UploadField(_XmlTextWriter, "0A0001E007A", _VATReport.CustomersFrom.AdministratorName) + UploadField(_XmlTextWriter, "0A0001E008A", _VATReport.CustomersFrom.AdministratorPhoneNumber) 'UploadField(_XmlTextWriter, "0A0001F004A", "O") UploadField(_XmlTextWriter, "0A0001F005A", "H") @@ -1099,7 +1103,7 @@ Public Class VATReportVC For Each _VATReportGroup As VATReportGroup In _VATReport.VATReportGroup For _ik = 0 To _VATReportNAVCodes_Structure_Collection.Count - 1 - Dim _VATReportNAVCodes_Structure As VATReportNAVCodes_Structure = _ + Dim _VATReportNAVCodes_Structure As VATReportNAVCodes_Structure = CType(_VATReportNAVCodes_Structure_Collection(_ik), VATReportNAVCodes_Structure) If _VATReportNAVCodes_Structure.VATCode = _VATReportGroup.VAT.XML65AFieldIDBaseValueIn Then @@ -1111,7 +1115,7 @@ Public Class VATReportVC For _ik = 0 To _VATReportNAVCodes_Structure_Collection.Count - 1 - Dim _VATReportNAVCodes_Structure As VATReportNAVCodes_Structure = _ + Dim _VATReportNAVCodes_Structure As VATReportNAVCodes_Structure = CType(_VATReportNAVCodes_Structure_Collection(_ik), VATReportNAVCodes_Structure) If _VATReportNAVCodes_Structure.VATCode = _VATReportGroup.VAT.XML65AFieldIDBaseValueOut Then @@ -1122,7 +1126,7 @@ Public Class VATReportVC Next For _ik = 0 To _VATReportNAVCodes_Structure_Collection.Count - 1 - Dim _VATReportNAVCodes_Structure As VATReportNAVCodes_Structure = _ + Dim _VATReportNAVCodes_Structure As VATReportNAVCodes_Structure = CType(_VATReportNAVCodes_Structure_Collection(_ik), VATReportNAVCodes_Structure) If _VATReportNAVCodes_Structure.VATCode = _VATReportGroup.VAT.XML65AFieldIDValueIn Then @@ -1133,7 +1137,7 @@ Public Class VATReportVC Next For _ik = 0 To _VATReportNAVCodes_Structure_Collection.Count - 1 - Dim _VATReportNAVCodes_Structure As VATReportNAVCodes_Structure = _ + Dim _VATReportNAVCodes_Structure As VATReportNAVCodes_Structure = CType(_VATReportNAVCodes_Structure_Collection(_ik), VATReportNAVCodes_Structure) If _VATReportNAVCodes_Structure.VATCode = _VATReportGroup.VAT.XML65AFieldIDValueOut Then @@ -1144,7 +1148,7 @@ Public Class VATReportVC Next For _ik = 0 To _VATReportNAVCodes_Structure_Collection.Count - 1 - Dim _VATReportNAVCodes_Structure As VATReportNAVCodes_Structure = _ + Dim _VATReportNAVCodes_Structure As VATReportNAVCodes_Structure = CType(_VATReportNAVCodes_Structure_Collection(_ik), VATReportNAVCodes_Structure) If _VATReportNAVCodes_Structure.VATCode = _VATReportGroup.VAT.XML65AFieldIDBaseValueInSum Then @@ -1155,7 +1159,7 @@ Public Class VATReportVC Next For _ik = 0 To _VATReportNAVCodes_Structure_Collection.Count - 1 - Dim _VATReportNAVCodes_Structure As VATReportNAVCodes_Structure = _ + Dim _VATReportNAVCodes_Structure As VATReportNAVCodes_Structure = CType(_VATReportNAVCodes_Structure_Collection(_ik), VATReportNAVCodes_Structure) If _VATReportNAVCodes_Structure.VATCode = _VATReportGroup.VAT.XML65AFieldIDBaseValueOutSum Then @@ -1166,7 +1170,7 @@ Public Class VATReportVC Next For _ik = 0 To _VATReportNAVCodes_Structure_Collection.Count - 1 - Dim _VATReportNAVCodes_Structure As VATReportNAVCodes_Structure = _ + Dim _VATReportNAVCodes_Structure As VATReportNAVCodes_Structure = CType(_VATReportNAVCodes_Structure_Collection(_ik), VATReportNAVCodes_Structure) If _VATReportNAVCodes_Structure.VATCode = _VATReportGroup.VAT.XML65AFieldIDValueInSum Then @@ -1177,7 +1181,7 @@ Public Class VATReportVC Next For _ik = 0 To _VATReportNAVCodes_Structure_Collection.Count - 1 - Dim _VATReportNAVCodes_Structure As VATReportNAVCodes_Structure = _ + Dim _VATReportNAVCodes_Structure As VATReportNAVCodes_Structure = CType(_VATReportNAVCodes_Structure_Collection(_ik), VATReportNAVCodes_Structure) If _VATReportNAVCodes_Structure.VATCode = _VATReportGroup.VAT.XML65AFieldIDValueOutSum Then diff --git a/Nuvolar.Module.Win/Controllers/InLineEditVC.vb b/Nuvolar.Module.Win/Controllers/InLineEditVC.vb index 5910078..6fe744e 100644 --- a/Nuvolar.Module.Win/Controllers/InLineEditVC.vb +++ b/Nuvolar.Module.Win/Controllers/InLineEditVC.vb @@ -147,7 +147,7 @@ Public Class InLineEditVC EnableInlineEdit(gridColumn) End Select - Case "ImmovablesPriceListHeader_ImmovablesPriceListRowsA_ListView", "ImmovablesPriceListHeader_ImmovablesPriceListRowsO_ListView", _ + Case "ImmovablesPriceListHeader_ImmovablesPriceListRowsA_ListView", "ImmovablesPriceListHeader_ImmovablesPriceListRowsO_ListView", "ImmovablesPriceListHeader_ImmovablesPriceListRowsG_ListView", "ImmovablesPriceListHeader_ImmovablesPriceListRowsC_ListView" Select Case name Case "ListPriceBruttoDEV", "ListPriceBruttoHUF", "ListPriceBruttoDEVRent", "ListPriceBruttoHUFRent" @@ -384,7 +384,7 @@ Public Class InLineEditVC EnableInlineEdit(gridColumn) End Select - Case "StorageInfromDeliveryNoteInRowsHeader_StorageInfromDeliveryNoteInRowsRows_ListView", _ + Case "StorageInfromDeliveryNoteInRowsHeader_StorageInfromDeliveryNoteInRowsRows_ListView", "DeliveryNoteInFromOrderOutRowsHeader_DeliveryNoteInFromOrderOutRowsRows_ListView" Select Case name Case "QTT_Process" @@ -504,12 +504,20 @@ Public Class InLineEditVC 'End If If modelColumn IsNot Nothing Then If modelColumn.HideValueIfZero = True Then - If e.Value = 0 Then e.DisplayText = "" + Try + If e.Value = 0 Then e.DisplayText = "" + Catch + + End Try + + End If End If End If End If + + End Sub Private Sub TreeListEditor_CellValueChanged(sender As Object, e As DevExpress.XtraTreeList.CellValueChangedEventArgs) diff --git a/Nuvolar.Module/Model.DesignedDiffs.xafml b/Nuvolar.Module/Model.DesignedDiffs.xafml index 5964584..7f3d0c4 100644 --- a/Nuvolar.Module/Model.DesignedDiffs.xafml +++ b/Nuvolar.Module/Model.DesignedDiffs.xafml @@ -3414,7 +3414,14 @@ - + + + + + + + + @@ -15828,7 +15835,7 @@ - + @@ -15848,7 +15855,7 @@ - + @@ -15868,7 +15875,7 @@ - + @@ -15878,7 +15885,7 @@ - + @@ -15897,7 +15904,7 @@ - + @@ -15918,7 +15925,7 @@ - + @@ -15942,7 +15949,7 @@ - + @@ -15959,7 +15966,7 @@ - + @@ -15992,7 +15999,7 @@ - + @@ -16012,7 +16019,7 @@ - + @@ -16032,7 +16039,7 @@ - + @@ -16052,7 +16059,7 @@ - + @@ -16072,7 +16079,7 @@ - + @@ -16092,7 +16099,7 @@ - + @@ -16110,7 +16117,7 @@ - + @@ -16165,7 +16172,7 @@ - + @@ -16180,7 +16187,7 @@ - + @@ -16200,7 +16207,7 @@ - + diff --git a/Nuvolar.WIN.Debranet.GL/Model.xafml b/Nuvolar.WIN.Debranet.GL/Model.xafml index 157bed3..80ffa1b 100644 --- a/Nuvolar.WIN.Debranet.GL/Model.xafml +++ b/Nuvolar.WIN.Debranet.GL/Model.xafml @@ -593,7 +593,7 @@ - +