From 103f4650e11d7e9a2b47d81369836c99a4232303 Mon Sep 17 00:00:00 2001 From: "ivan.szabo" Date: Mon, 3 Apr 2017 12:59:10 +0200 Subject: [PATCH] =?UTF-8?q?to=20=C3=A9s=20tonna=20figyelembev=C3=A9tele?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DeliveryNote/DeliveryNoteOut/DeliveryNoteOutRows.vb | 2 +- .../FinancialTransactions/Reports/VAT/VATReportVC.vb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/DeliveryNote/DeliveryNoteOut/DeliveryNoteOutRows.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/DeliveryNote/DeliveryNoteOut/DeliveryNoteOutRows.vb index e9928af..325fde2 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/DeliveryNote/DeliveryNoteOut/DeliveryNoteOutRows.vb +++ b/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 diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Reports/VAT/VATReportVC.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Reports/VAT/VATReportVC.vb index 9a9b754..44ff513 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Reports/VAT/VATReportVC.vb +++ b/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()