decimal code optimization for ZUGFeRD 2.0

Author: stephanstapel

ZUGFeRD/IInvoiceDescriptorReader.cs

@@ -80,7 +80,7 @@ protected XmlNamespaceManager _GenerateNamespaceManagerFromNode(XmlNode node)
 
         protected bool _IsReadableByThisReaderVersion(Stream stream, IList<string> validURIs)
         {
-            long _oldStreamPosition = stream.Position;
+            long oldStreamPosition = stream.Position;
             stream.Position = 0;
             using (StreamReader reader = new StreamReader(stream, Encoding.UTF8, true, 1024, true))
             {
@@ -89,14 +89,14 @@ protected bool _IsReadableByThisReaderVersion(Stream stream, IList<string> valid
                 {
                     if (data.IndexOf(String.Format(">{0}<", validURI), StringComparison.OrdinalIgnoreCase) >= 0)
                     {
-                        stream.Position = _oldStreamPosition;
+                        stream.Position = oldStreamPosition;
                         return true;
                     }
                 }
             }
 
-            stream.Position = _oldStreamPosition;
+            stream.Position = oldStreamPosition;
             return false;
         } // !_IsReadableByThisReaderVersion()
     }
-}
+}

ZUGFeRD/InvoiceDescriptor20Writer.cs

@@ -299,15 +299,8 @@ public override void Save(InvoiceDescriptor descriptor, Stream stream, ZUGFeRDFo
                         Writer.WriteElementString("udt", "Indicator", tradeAllowanceCharge.ChargeIndicator ? "true" : "false");
                         Writer.WriteEndElement(); // !ram:ChargeIndicator
 
-                        if (tradeAllowanceCharge.BasisAmount.HasValue)
-                        {
-                            Writer.WriteStartElement("ram", "BasisAmount");
-                            Writer.WriteValue(_formatDecimal(tradeAllowanceCharge.BasisAmount.Value, 4)); // BT-X-35
-                            Writer.WriteEndElement();
-                        }
-                        Writer.WriteStartElement("ram", "ActualAmount");
-                        Writer.WriteValue(_formatDecimal(tradeAllowanceCharge.ActualAmount, 4)); // BT-147
-                        Writer.WriteEndElement();
+                        _writeOptionalAdaptiveAmount(Writer, "ram", "BasisAmount", tradeAllowanceCharge.BasisAmount, 2, 4, forceCurrency: false); // BT-X-35
+                        _writeOptionalAdaptiveAmount(Writer, "ram", "ActualAmount", tradeAllowanceCharge.ActualAmount, 2, 4, forceCurrency: false); // BT-147
 
                         Writer.WriteOptionalElementString("ram", "Reason", tradeAllowanceCharge.Reason, Profile.Comfort | Profile.Extended);
                         // "ReasonCode" nicht im 2.0 Standard!