to és tonna figyelembevétele

Related Work Items: #5

Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/DeliveryNote/DeliveryNoteOut/DeliveryNoteOutRows.vb

@@ -46,7 +46,7 @@ Public Class DeliveryNoteOutRows 'Szállítólevél sorok
                         Case eADRPackingUnit.eUnit_III
                             _ADRFactor = 1
                     End Select
-                    If StorageOutRowsInRows.StorageOutRows.Products.Units.ShortName = "to" Then
+                    If StorageOutRowsInRows.StorageOutRows.Products.Units.ShortName = "to" Or StorageOutRowsInRows.StorageOutRows.Products.Units.ShortName = "tonna" Then
                         ADRNumber = _ADRFactor * QTT * 1000
                     Else
                         ADRNumber = _ADRFactor * QTT

Nuvolar.Module/BusinessObjects/Business/Products/PopUp/ModifyProductsParameters.vb

@@ -78,7 +78,6 @@ Public Class ModifyProductsParameters
     <NonPersistent()> Property DecimalIn As Double
     <NonPersistent()> Property DecimalOut As Double
 
-
     <NonPersistent()>
     <ImmediatePostData(True)> _
     Property CurrencyName As CurrencyName
@@ -120,7 +119,11 @@ Public Class ModifyProductsParameters
             SetPropertyValue("ProductType", _ProductType, value)
         End Set
     End Property
-    <NonPersistent()> _
+    ''' <summary>
+    ''' Termék tipus módosuljon ?
+    ''' </summary>
+    ''' <returns></returns>
+    <NonPersistent()>
     Property IsProductType As Boolean
         Get
             Return _IsProductType
@@ -129,4 +132,37 @@ Public Class ModifyProductsParameters
             SetPropertyValue("IsProductType", _IsProductType, value)
         End Set
     End Property
+
+    ''' <summary>
+    ''' ADRPackingUnit módosuljon ?
+    ''' </summary>
+    ''' <returns></returns>
+    <NonPersistent()> Property IsADRPackingUnit As Boolean
+    <NonPersistent()> Property ADRPackingUnit As eADRPackingUnit
+    ''' <summary>
+    ''' Alapértelmezett termék, amelynek a Barcode, UNList,Sentence,Documentations szinkronba jön
+    ''' </summary>
+    ''' <returns></returns>
+    <NonPersistent()> Property ProductsSource As Products
+    ''' <summary>
+    ''' Sentence klónozás legyen ?
+    ''' </summary>
+    ''' <returns></returns>
+    <NonPersistent()> Property CloneSentence As Boolean
+    ''' <summary>
+    ''' UNList klónozás legyen
+    ''' </summary>
+    ''' <returns></returns>
+    <NonPersistent()> Property CloneUNList As Boolean
+    ''' <summary>
+    ''' Documentations klónozás legyen
+    ''' </summary>
+    ''' <returns></returns>
+    <NonPersistent()> Property CloneDocumentations As Boolean
+    <NonPersistent> Property IsPacketMode As Boolean
+    ''' <summary>
+    ''' Csomagolási mód változtatása
+    ''' </summary>
+    ''' <returns></returns>
+    <NonPersistent> Property PacketMode As PacketMode
 End Class

Nuvolar.Module/BusinessObjects/Business/Products/ProductsVC.vb

@@ -95,6 +95,11 @@ Public Class ProductsVC
 
         e.View = Application.CreateDetailView(_onew, _ModifyProductsParameters)
     End Sub
+    ''' <summary>
+    ''' Módosítja a Products objektum adatait csoportosan
+    ''' </summary>
+    ''' <param name="sender"></param>
+    ''' <param name="e"></param>
     Private Sub aModifyProductsParameters_Execute(ByVal sender As System.Object, ByVal e As DevExpress.ExpressApp.Actions.PopupWindowShowActionExecuteEventArgs) Handles aModifyProductsParameters.Execute
         Dim _ModifyProductsParameters As ModifyProductsParameters = TryCast(e.PopupWindow.View.SelectedObjects(0), ModifyProductsParameters)
         Dim _ocur As Xpo.XPObjectSpace = TryCast(View.ObjectSpace, Xpo.XPObjectSpace)
@@ -248,10 +253,51 @@ Public Class ProductsVC
             If _ModifyProductsParameters.IsDecimalIn Then _Products.DecimalIn = _ModifyProductsParameters.DecimalIn
             If _ModifyProductsParameters.IsDecimalOut Then _Products.DecimalOut = _ModifyProductsParameters.DecimalOut
 
+
+            If _ModifyProductsParameters.IsADRPackingUnit Then _Products.ADRPackingUnit = _ModifyProductsParameters.ADRPackingUnit
+
+            If _ModifyProductsParameters.CloneDocumentations Then
+                If _ModifyProductsParameters.ProductsSource IsNot Nothing Then
+                    _ocur.Delete(_Products.ProductsDocumentations)
+                    For Each _ProductsDocumentations As ProductsDocumentations In _ModifyProductsParameters.ProductsSource.ProductsDocumentations
+                        _Products.ProductsDocumentations.Add(_ocur.GetObject(_ProductsDocumentations))
+                    Next
+                Else
+
+                End If
+            End If
+            If _ModifyProductsParameters.CloneSentence Then
+                If _ModifyProductsParameters.ProductsSource IsNot Nothing Then
+                    _ocur.Delete(_Products.ProductsSentence)
+                    For Each _ProductsSentence As ProductsSentence In _ModifyProductsParameters.ProductsSource.ProductsSentence
+                        _Products.ProductsSentence.Add(_ocur.GetObject(_ProductsSentence))
+                    Next
+                Else
+
+                End If
+            End If
+            If _ModifyProductsParameters.CloneUNList Then
+                If _ModifyProductsParameters.ProductsSource IsNot Nothing Then
+                    _ocur.Delete(_Products.ProductsUNList)
+                    For Each _ProductsUNList As ProductsUNList In _ModifyProductsParameters.ProductsSource.ProductsUNList
+                        _Products.ProductsUNList.Add(_ocur.GetObject(_ProductsUNList))
+                    Next
+                Else
+
+                End If
+                If _Products.ProductsUNList.Count > 0 Then
+                    _Products.UNNumber = _Products.ProductsUNList(0).UNList.ShortName
+                End If
+            End If
+
+            If _ModifyProductsParameters.IsPacketMode Then
+                _Products.PacketMode = _ocur.GetObject(_ModifyProductsParameters.PacketMode)
+            End If
+
             _Products.Save()
         Next
         _ocur.CommitChanges()
-        RaiseEvent FinalWork
+        RaiseEvent FinalWork()
     End Sub
     Private Sub aPrintSelectedProductsBarcode_Execute(sender As System.Object, e As DevExpress.ExpressApp.Actions.SimpleActionExecuteEventArgs) Handles aPrintSelectedProductsBarcode.Execute
         Try

Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Reports/VAT/VATReportVC.vb

@@ -771,7 +771,7 @@ Public Class VATReportVC
                 If _InvoiceRows_07.DeliveryNoteOutRows.StorageOutRowsInRows IsNot Nothing Then
                     If _InvoiceRows_07.DeliveryNoteOutRows.StorageOutRowsInRows.StorageInRows.DeliveryNoteInRows IsNot Nothing Then
                         Select Case _InvoiceRows_07.DeliveryNoteOutRows.StorageOutRowsInRows.StorageInRows.DeliveryNoteInRows.Units.ShortName
-                            Case "to"
+                            Case "to", "tonna"
                                 _InvoiceRows_07.DeliveryNoteOutRows.StorageOutRowsInRows.StorageInRows.DeliveryNoteInRows.WeightMode = eWeightMode.eTotalWeightperQuantity
                                 _InvoiceRows_07.DeliveryNoteOutRows.StorageOutRowsInRows.StorageInRows.DeliveryNoteInRows.Weight = _InvoiceRows_07.DeliveryNoteOutRows.StorageOutRowsInRows.StorageInRows.DeliveryNoteInRows.QTT * 1000
                                 _InvoiceRows_07.DeliveryNoteOutRows.StorageOutRowsInRows.StorageInRows.DeliveryNoteInRows.Save()
@@ -796,7 +796,7 @@ Public Class VATReportVC
                 For Each _StorageOutRowsInRows_07 In _InvoiceRows_07.StorageOutRowsInRows
                     If _StorageOutRowsInRows_07.StorageInRows.DeliveryNoteInRows IsNot Nothing Then
                         Select Case _StorageOutRowsInRows_07.StorageInRows.DeliveryNoteInRows.Units.ShortName
-                            Case "to"
+                            Case "to", "tonna"
                                 _StorageOutRowsInRows_07.StorageInRows.DeliveryNoteInRows.WeightMode = eWeightMode.eTotalWeightperQuantity
                                 _StorageOutRowsInRows_07.StorageInRows.DeliveryNoteInRows.Weight = _StorageOutRowsInRows_07.StorageInRows.DeliveryNoteInRows.QTT * 1000
                                 _StorageOutRowsInRows_07.StorageInRows.DeliveryNoteInRows.Save()