ivanszabo/SISBusiness
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Other

Browse Source
This commit is contained in:
ivanszabo
2018-10-14 23:26:09 +02:00
parent 8956813183
commit 4ceb9fcd09
40 changed files with 10331 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SISBusiness.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceHeader.vb
+44
View File
@@ -143,6 +143,10 @@ Public Class InvoiceHeader
Private _InvoiceFactoringParameter As InvoiceFactoringParameter ' Faktorálási paraméter !!!
Private _InvoiceFactoringBank As InvoiceFactoringBank 'Bankba küldési csomag !
Private _NAV_transactionId As String
Private _NAV_InvoiceStatus As String
Private _NAV_queryDate As DateTime
'-- Nonpersistent objektumok a számla sor rögzítéséhez
Private _row_CustomsTariffs As CustomsTariffs 'ITJ, SZJ, Vámtarifaszám stb.
Private _row_ShortName As String 'Megnevezés
@@ -1051,6 +1055,46 @@ Public Class InvoiceHeader
SetPropertyValue("InvoiceFactoringBank", _InvoiceFactoringBank, value)
End Set
End Property
'NAV onlineszámla miatt
''' <summary>
''' NAV tranzakció azonosító Onlineszámla miatt
''' </summary>
''' <returns></returns>
Property NAV_transactionId As String
Get
Return _NAV_transactionId
End Get
Set(value As String)
SetPropertyValue("NAV_transactionId", _NAV_transactionId, value)
End Set
End Property
''' <summary>
''' NAV számla állapota Online számla miatt
''' </summary>
''' <returns></returns>
<Size(255)>
Property NAV_InvoiceStatus As String
Get
Return _NAV_InvoiceStatus
End Get
Set(value As String)
SetPropertyValue("NAV_InvoiceStatus", _NAV_InvoiceStatus, value)
End Set
End Property
''' <summary>
''' NAV lekérdezés dátuma Onlineszámla miatt
''' </summary>
''' <returns></returns>
Property NAV_queryDate As Date
Get
Return _NAV_queryDate
End Get
Set(value As Date)
SetPropertyValue("NAV_queryDate", _NAV_queryDate, value)
End Set
End Property
'-- Nonpersistent property-k a számla sor rögzítéséhez
<NonPersistent()>
<VisibleInListView(False)>
SISBusiness.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceType.vb
+9
View File
@@ -36,6 +36,7 @@ Public Class InvoiceType
Private _ReportData_HUF_DEV As ReportData '-- Számla nyomtatványa DEv és HUF devizás
Private _WorkflowSystem As WorkflowSystem
Private _Rule5DMatrix As Rule5DMatrix
Private _NoNAVTransfer As Boolean
Public Sub New(ByVal session As Session)
MyBase.New(session)
@@ -153,4 +154,12 @@ Public Class InvoiceType
SetPropertyValue("Rule5DMatrix", _Rule5DMatrix, value)
End Set
End Property
Property NoNAVTransfer As Boolean
Get
Return _NoNAVTransfer
End Get
Set(value As Boolean)
SetPropertyValue("NoNAVTransfer", _NoNAVTransfer, value)
End Set
End Property
End Class
SISBusiness.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceVC.vb
+33 -20
View File
@@ -22,7 +22,8 @@ Public Class InvoiceVC
Inherits DevExpress.ExpressApp.ViewController
Public Event InitWork(ByVal _Minimum As Long, ByVal _Step As Long, ByVal _Maximum As Long)
Public Event DoWork()
Public Event FinalWork
Public Event FinalWork()
Public Event FireNAVmanageInvoiceFinalWork(ByVal _InvoiceHeader As InvoiceHeader)
Public Sub New()
MyBase.New()
@@ -355,7 +356,7 @@ Public Class InvoiceVC
If Not String.IsNullOrEmpty(_InvoiceHeader.UserCreated.Email) Then
_MailMessage.To.Clear()
_MailMessage.To.Add(_InvoiceHeader.UserCreated.Email)
_MailMessage.Body = String.Format("Ön {0} számmal új számlát véglegesített a(z) {1} ügyfél részére.", _
_MailMessage.Body = String.Format("Ön {0} számmal új számlát véglegesített a(z) {1} ügyfél részére.",
_InvoiceHeader.DocumentNumber, _InvoiceHeader.Customers.FullName)
_SmtpClient.Send(_MailMessage)
@@ -474,8 +475,8 @@ Public Class InvoiceVC
_CS.BeginUpdateCriteria()
_CS.Criteria.Clear()
_CS.Criteria("First") = CriteriaOperator.Parse("Contracts.ContractTemplate.PartnerType=0 AND Contracts.CustomersFrom=? AND Contracts.Customers=? AND DateExecution=? and InvoiceRows=?", _
_InvoiceHeader.CustomersFrom, _InvoiceHeader.Customers, _
_CS.Criteria("First") = CriteriaOperator.Parse("Contracts.ContractTemplate.PartnerType=0 AND Contracts.CustomersFrom=? AND Contracts.Customers=? AND DateExecution=? and InvoiceRows=?",
_InvoiceHeader.CustomersFrom, _InvoiceHeader.Customers,
_InvoiceHeader.DateExecution, Nothing)
_CS.EndUpdateCriteria()
@@ -755,6 +756,17 @@ Public Class InvoiceVC
_p_InvoiceHeader.RecalculateInvoice(_p_InvoiceHeader, _ocur)
_ocur.CommitChanges()
'NAV feladás !!!
If _p_InvoiceHeader.DateCreated >= #2018-07-01# And
_p_InvoiceHeader.IsEditable = False And
_p_InvoiceHeader.InvoiceType.NoNAVTransfer <> True And
String.IsNullOrEmpty(_p_InvoiceHeader.DocumentNumber) = False And
_p_InvoiceHeader.IsProforma = False Then
If Math.Abs(_p_InvoiceHeader.TotalVATHUF) >= 100000 Then
RaiseEvent FireNAVmanageInvoiceFinalWork(_p_InvoiceHeader)
End If
End If
Dim _uow_pci As New UnitOfWork(_ocur.Session.DataLayer)
GLFunctions.ReconfigurePCI(_uow_pci, _p_InvoiceHeader.CustomersFrom, _p_InvoiceHeader.Customers, 0, _p_InvoiceHeader.ConnectInfo)
@@ -1302,10 +1314,10 @@ CheckError:
Dim _CS_Description As New CollectionSource(_onew, GetType(InvoiceHeader_DescriptionChanger_PopUp))
Dim _InvoiceHeader_xpquery = New XPQuery(Of InvoiceHeader)(_ocur.Session)
Dim query = From _InvoiceHeader In _InvoiceHeader_xpquery _
Where _InvoiceHeader.Description IsNot Nothing _
Group _InvoiceHeader By _InvoiceHeader.Description Into g = Group _
Select New With {Key .Description = Description}
Dim query = From _InvoiceHeader In _InvoiceHeader_xpquery
Where _InvoiceHeader.Description IsNot Nothing
Group _InvoiceHeader By _InvoiceHeader.Description Into g = Group
Select New With {Key .Description = Description}
For Each item In query
_InvoiceHeader_DescriptionChanger_PopUp = _onew.CreateObject(Of InvoiceHeader_DescriptionChanger_PopUp)()
_InvoiceHeader_DescriptionChanger_PopUp.Description = item.Description
@@ -1457,7 +1469,7 @@ CheckError:
End If
Next
_ocur.CommitChanges()
RaiseEvent FinalWork
RaiseEvent FinalWork()
Else
Throw New Exception("*Nincs egy kijelölt sor sem!")
End If
@@ -1584,10 +1596,10 @@ CheckError:
Dim _CS_Description As New CollectionSource(_onew, GetType(InvoiceHeader_DescriptionChanger_PopUp))
Dim _InvoiceHeader_xpquery = New XPQuery(Of InvoiceHeader)(_ocur.Session)
Dim query = From _InvoiceHeader In _InvoiceHeader_xpquery _
Where _InvoiceHeader.DescriptionHeader IsNot Nothing _
Group _InvoiceHeader By _InvoiceHeader.DescriptionHeader Into g = Group _
Select New With {Key .DescriptionHeader = DescriptionHeader}
Dim query = From _InvoiceHeader In _InvoiceHeader_xpquery
Where _InvoiceHeader.DescriptionHeader IsNot Nothing
Group _InvoiceHeader By _InvoiceHeader.DescriptionHeader Into g = Group
Select New With {Key .DescriptionHeader = DescriptionHeader}
For Each item In query
_InvoiceHeader_DescriptionChanger_PopUp = _onew.CreateObject(Of InvoiceHeader_DescriptionChanger_PopUp)()
_InvoiceHeader_DescriptionChanger_PopUp.Description = item.DescriptionHeader
@@ -1616,7 +1628,7 @@ CheckError:
GLFunctions.ReconfigurePCI(_uow, _InvoiceHeader.CustomersFrom, _InvoiceHeader.Customers, 0, _InvoiceHeader.ConnectInfo)
End If
Next
RaiseEvent FinalWork
RaiseEvent FinalWork()
Frame.GetController(Of RefreshController).RefreshAction.DoExecute()
End Sub
@@ -1626,8 +1638,8 @@ CheckError:
Dim _ocur As Xpo.XPObjectSpace = TryCast(View.ObjectSpace, Xpo.XPObjectSpace)
Dim _InvoiceHeader As InvoiceHeader = TryCast(View.SelectedObjects(0), InvoiceHeader)
ViewPDCI.ViewPDCIDetail(_onew, Application, e, _InvoiceHeader.CustomersFrom, _
_InvoiceHeader.Customers, ePartnerType.eReceivables, _
ViewPDCI.ViewPDCIDetail(_onew, Application, e, _InvoiceHeader.CustomersFrom,
_InvoiceHeader.Customers, ePartnerType.eReceivables,
_InvoiceHeader.ConnectInfo)
End Sub
@@ -1682,7 +1694,7 @@ CheckError:
Catch ex As Exception
MsgBox(ex.Message, MsgBoxStyle.OkOnly + MsgBoxStyle.Critical, String.Format(CaptionHelper.GetLocalizedText("Exceptions\SISBusinessExceptions", "MsgBoxCheckItAgain")))
Finally
RaiseEvent FinalWork
RaiseEvent FinalWork()
End Try
End Sub
Private Sub InvoiceHeader_ListView_Editable_DeleteAction_Executing(sender As Object, e As CancelEventArgs)
@@ -1873,7 +1885,8 @@ CheckError:
Catch ex As Exception
MsgBox(ex.Message, MsgBoxStyle.OkOnly + MsgBoxStyle.Critical, String.Format(CaptionHelper.GetLocalizedText("Exceptions\SISBusinessExceptions", "MsgBoxCheckItAgain")))
Finally
RaiseEvent FinalWork
RaiseEvent FinalWork()
If _NOEmail.Count > 0 Then
Dim _ErrorMessage As String = "A következő számlák küldése nem lehetséges:" + vbNewLine
@@ -1908,10 +1921,10 @@ CheckError:
Next
_uow.CommitChanges()
_ocur.CommitChanges()
RaiseEvent FinalWork
RaiseEvent FinalWork()
End Sub
Private Sub aGeneratePDFandSendDefaultMailClient_Invoice_Execute(sender As Object, e As SimpleActionExecuteEventArgs) Handles aGeneratePDFandSendDefaultMailClient_Invoice.Execute
End Sub
SISBusiness.Module/BusinessObjects/GeneralObjects/Customers/Customers.vb
+40
View File
@@ -89,6 +89,10 @@ Public Class Customers
Private _PriceColumn As Integer 'Ároszlop, melyik PriceColumnBruttoHUFXX ára van
Private _NAV_queryTaxpayer As String
Private _NAV_valid As Boolean
Private _NAV_queryDate As DateTime
Public Sub New(ByVal session As Session)
MyBase.New(session)
End Sub
@@ -647,6 +651,42 @@ Public Class Customers
SetPropertyValue("PriceColumn", _PriceColumn, value)
End Set
End Property
''' <summary>
''' NAV adószám ellenőrzés
''' </summary>
''' <returns></returns>
Property NAV_queryTaxpayer As String
Get
Return _NAV_queryTaxpayer
End Get
Set(value As String)
SetPropertyValue("NAV_queryTaxpayer", _NAV_queryTaxpayer, value)
End Set
End Property
''' <summary>
''' NAV adószám rendben van ?
''' </summary>
''' <returns></returns>
Property NAV_valid As Boolean
Get
Return _NAV_valid
End Get
Set(value As Boolean)
SetPropertyValue("NAV_valid", _NAV_valid, value)
End Set
End Property
''' <summary>
''' NAV adószámlekérdezés utolsó dátuma
''' </summary>
''' <returns></returns>
Property NAV_queryDate As DateTime
Get
Return _NAV_queryDate
End Get
Set(value As DateTime)
SetPropertyValue("NAV_queryDate", _NAV_queryDate, value)
End Set
End Property
'-----ReadOnly---------------
Overloads ReadOnly Property IsDeleted As Boolean
Get
SISBusiness.Module/BusinessObjects/GeneralObjects/Customers/CustomersFrom.vb
+53 -1
View File
@@ -31,6 +31,11 @@ Public Class CustomersFrom '-- Ezek azok a cégek akik használják a programot
Private _RabbitMQServerPassword As String
Private _RabbitMQBodyEncryptCode As String
Private _NAV_login As String
Private _NAV_xmlSignkey As String
Private _NAV_password As String
Private _NAV_exchangeKey As String
Public Overrides Sub AfterConstruction()
MyBase.AfterConstruction()
IsDefault = False
@@ -116,7 +121,54 @@ Public Class CustomersFrom '-- Ezek azok a cégek akik használják a programot
SetPropertyValue("RabbitMQBodyEncryptCode", _RabbitMQBodyEncryptCode, value)
End Set
End Property
''' <summary>
''' NAV felhasználó az Online számlához
''' </summary>
''' <returns></returns>
Property NAV_login As String
Get
Return _NAV_login
End Get
Set(value As String)
SetPropertyValue("NAV_login", _NAV_login, value)
End Set
End Property
''' <summary>
''' NAV aláírókulcs az Online számlához
''' </summary>
''' <returns></returns>
Property NAV_xmlSignkey As String
Get
Return _NAV_xmlSignkey
End Get
Set(value As String)
SetPropertyValue("NAV_xmlSignkey", _NAV_xmlSignkey, value)
End Set
End Property
''' <summary>
''' NAV jelszó az Online számlához
''' </summary>
''' <returns></returns>
Property NAV_password As String
Get
Return _NAV_password
End Get
Set(value As String)
SetPropertyValue("NAV_password", _NAV_password, value)
End Set
End Property
''' <summary>
''' NAV cserekulcs az Online számlához
''' </summary>
''' <returns></returns>
Property NAV_exchangeKey As String
Get
Return _NAV_exchangeKey
End Get
Set(value As String)
SetPropertyValue("NAV_exchangeKey", _NAV_exchangeKey, value)
End Set
End Property
ReadOnly Property DefaultCustomerBankAccounts As CustomerBankAccounts
Get
Dim _CustomerBankAccounts As CustomerBankAccounts = Nothing
SISBusiness.Module/My Project/AssemblyInfo.vb
+1 -1
View File
@@ -28,5 +28,5 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("15.2.5.1001")>
<Assembly: AssemblyVersion("17.2.3.1004")>
SISBusiness.Module/SISBusiness.Module.vbproj.user
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup>
</Project>