Merge pull request #706 from tipa/master

Fixed invoice validation for ZUGFeRDVersion.Version23

Author: stephanstapel

ZUGFeRD/InvoiceValidator.cs

@@ -48,7 +48,6 @@ public static void ValidateAndPrint(InvoiceDescriptor descriptor, ZUGFeRDVersion
             }
         } // !ValidateAndPrint()
 
-
         public static ValidationResult Validate(InvoiceDescriptor descriptor, ZUGFeRDVersion version)
         {
             ValidationResult retval = new ValidationResult()
@@ -241,7 +240,7 @@ public static ValidationResult Validate(InvoiceDescriptor descriptor, ZUGFeRDVer
             }
 
             if (Math.Abs(chargesTotalSummedPerTradeAllowanceCharge - chargeTotal) < 0.01m)
-            { 
+            {
                 retval.Messages.Add(String.Format("trade.settlement.monetarySummation.chargeTotal  Message: Berechneter Wert ist wie vorhanden:[{0:0.0000}]", chargesTotalSummedPerTradeAllowanceCharge));
             }
             else
@@ -251,30 +250,27 @@ public static ValidationResult Validate(InvoiceDescriptor descriptor, ZUGFeRDVer
             }
 
             // version-specific validation
-            ValidationResult versionSpecificResults = new ValidationResult();
+            ValidationResult versionSpecificResults;
             switch (version)
             {
                 case ZUGFeRDVersion.Version1:
-                    {
-                        versionSpecificResults = _ValidateAccordingToVersion1(descriptor);
-                        break;
-                    }
+                {
+                    versionSpecificResults = _ValidateAccordingToVersion1(descriptor);
+                    break;
+                }
                 default:
-                    {
-                        break;
-                    }
+                {
+                    versionSpecificResults = new ValidationResult { IsValid = true };
+                    break;
+                }
             }
 
-            if (versionSpecificResults.IsValid == false)
-            {
-                retval.IsValid = false;                
-            }
+            retval.IsValid = retval.IsValid && versionSpecificResults.IsValid;
             retval.Messages.AddRange(versionSpecificResults.Messages);
 
             return retval;
         } // !Validate()
 
-
         private static ValidationResult _ValidateAccordingToVersion1(InvoiceDescriptor descriptor)
         {
             ValidationResult retval = new ValidationResult()
@@ -305,7 +301,7 @@ private static ValidationResult _ValidateAccordingToVersion1(InvoiceDescriptor d
                 retval.IsValid = false;
                 retval.Messages.Add($"Global identifier scheme {descriptor.Buyer?.GlobalID?.SchemeID} is not supported for recipients (ShipTo) in ZUGFeRD 1.0");
             }
-            
+
             return retval;
         } // !_ValidateAccordingToVersion1()
     }