3.4.7: weitere kleinere Korrekturen

nsw/Source/bsmd.ExcelReadService/Util.cs

@@ -1294,7 +1294,7 @@ namespace bsmd.ExcelReadService
 				waste.WasteAmountGeneratedTillNextPort_MTQ = reader.ReadNumberDefaultZero(amountGen);				
 				waste.WasteDisposedAtLastPort_MTQ = reader.ReadNumberDefaultZero(wasteDis);
 
-
+                /*
 				if ((reader.Mode == ExcelReader.CountryMode.DE) &&
 					((i == 6) || (i == 8) || (i == 9)))
 				{
@@ -1305,12 +1305,13 @@ namespace bsmd.ExcelReadService
 					waste.WasteDisposalPort = "ZZUKN";
 					waste.WasteAmountGeneratedTillNextPort_MTQ = 0;
 				}
+                */
 
                 if(i==15) // falls letzte Zeile leer, entfernen: Christin 22.3.17
                 {
                     if ((waste.WasteDescription.IsNullOrEmpty() || waste.WasteDescription == "-") &&
                         ((waste.WasteDisposalAmount_MTQ ?? 0) == 0) &&
-                        ((waste.WasteType ?? 0) == 1300))
+                        (((waste.WasteType ?? 0) == 1300) || !waste.WasteType.HasValue))
                         was.Waste.Remove(waste);
                 }
 

nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs

@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("Informatikbüro Daniel Schick")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("3.4.6")]
+[assembly: AssemblyInformationalVersion("3.4.7")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2017 Informatikbüro Daniel Schick. All rights reserved.")]
 [assembly: AssemblyTrademark("")]

nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.4.6.*")]
+[assembly: AssemblyVersion("3.4.7.*")]