Merge branch 'master' into maintenance/reducedIntellisenseWarnings_correctedSomeComments

Author: stephanstapel

ZUGFeRD.Test/ZUGFeRD22Tests.cs

@@ -66,7 +66,7 @@ public void TestComment()
             desc.TaxBasisAmount = 9.9m;
             desc.TaxTotalAmount = 9.9m * 0.19m;
             desc.GrandTotalAmount = 9.9m * 1.19m;
-            desc.DuePayableAmount = 9.9m * 1.19m;
+            desc.DuePayableAmount = 9.9m * 1.19m;
         }
 
 
@@ -1028,7 +1028,7 @@ public void TestLoadingSepaPreNotification()
 
             Assert.AreEqual("DE98ZZZ09999999999", invoiceDescriptor.PaymentMeans.SEPACreditorIdentifier);
             Assert.AreEqual("REF A-123", invoiceDescriptor.PaymentMeans.SEPAMandateReference);
-            Assert.AreEqual(PaymentMeansTypeCodes.SEPADirectDebit, invoiceDescriptor.PaymentMeans.TypeCode);
+            Assert.AreEqual(PaymentMeansTypeCodes.SEPADirectDebit, invoiceDescriptor.PaymentMeans.TypeCode);
             Assert.AreEqual(1, invoiceDescriptor.DebitorBankAccounts.Count);
             Assert.AreEqual("DE21860000000086001055", invoiceDescriptor.DebitorBankAccounts[0].IBAN);
 
@@ -1424,7 +1424,7 @@ public void TestPartyExtensions()
             // Check the output in the XML for Comfort.
             // REM: In Comfort only ID, GlobalID, Name, and SpecifiedLegalOrganization are allowed.
 
-            desc.Payee = new Party()
+            desc.Payee = new Party()
             {
                 ID = new GlobalID(null, "SL1001"),
                 Name = "Max Mustermann"
@@ -1459,12 +1459,12 @@ public void TestPartyExtensions()
 
 
         [TestMethod]
-        public void TestShipTo()
+        public void TestShipTo()
         {
 
             InvoiceDescriptor desc = this._InvoiceProvider.CreateInvoice();
 
-            desc.ShipTo = new Party()
+            desc.ShipTo = new Party()
             {
                 ID = new GlobalID(null, "SL1001"),
                 GlobalID = new GlobalID(GlobalIDSchemeIdentifiers.GLN, "MusterGLN"),
@@ -1629,11 +1629,11 @@ public void TestParty_WithTaxRegistration()
                 City = "Musterstadt",
                 Country = CountryCodes.DE,
                 CountrySubdivisionName = "Hessen"
-            };
-
+            };
+
             desc.AddShipToTaxRegistration("DE123456789", TaxRegistrationSchemeID.VA);
 
-            desc.Invoicee = new Party()
+            desc.Invoicee = new Party()
             {
                 Name = "Invoicee",
                 ContactName = "Max Mustermann",
@@ -1784,8 +1784,8 @@ public void TestOrderInformation()
             s.Close();
 
             MemoryStream ms = new MemoryStream();
-            desc.Save(ms, ZUGFeRDVersion.Version23, Profile.Extended);
-
+            desc.Save(ms, ZUGFeRDVersion.Version23, Profile.Extended);
+
             ms.Seek(0, SeekOrigin.Begin);
             StreamReader reader = new StreamReader(ms);
             string text = reader.ReadToEnd();
@@ -1940,10 +1940,10 @@ public void TestWriteAndReadExtended()
             desc.AddLogisticsServiceCharge(10m, "Logistics service charge", TaxTypes.AAC, TaxCategoryCodes.AC, 7m);
 
             desc.GetTradePaymentTerms().FirstOrDefault().DueDate = timestamp.AddDays(14);
-            desc.AddInvoiceReferencedDocument("RE-12344", timestamp, InvoiceType.PartialInvoice);
-
-
-            //set additional LineItem data
+            desc.AddInvoiceReferencedDocument("RE-12344", timestamp, InvoiceType.PartialInvoice);
+
+
+            //set additional LineItem data
             var lineItem = desc.TradeLineItems.FirstOrDefault(i => i.SellerAssignedID == "TB100A4");
             Assert.IsNotNull(lineItem);
             lineItem.Description = "This is line item TB100A4";
@@ -2092,7 +2092,7 @@ public void TestWriteAndReadExtended()
             Assert.AreEqual(timestamp.AddDays(14), loadedInvoice.BillingPeriodEnd);
 
             //TradeAllowanceCharges
-            Assert.AreEqual(loadedInvoice.GetTradeAllowances().Count, 0);
+            Assert.AreEqual(loadedInvoice.GetTradeAllowances().Count, 0);
             var tradeAllowanceCharge = loadedInvoice.GetTradeCharges().FirstOrDefault(i => i.Reason == "Reason for charge");
             Assert.IsNotNull(tradeAllowanceCharge);
             Assert.IsTrue(tradeAllowanceCharge.ChargeIndicator);
@@ -2250,8 +2250,8 @@ public void TestNoBICIDForDebitorFinancialInstitution()
         {
             DateTime issueDateTime = DateTime.Today;
 
-            InvoiceDescriptor desc = this._InvoiceProvider.CreateInvoice();
-            //PayerSpecifiedDebtorFinancialInstitution
+            InvoiceDescriptor desc = this._InvoiceProvider.CreateInvoice();
+            //PayerSpecifiedDebtorFinancialInstitution
             desc.AddDebitorFinancialAccount("DE02120300000000202051", "MYBIC");
 
             MemoryStream ms = new MemoryStream();
@@ -2915,10 +2915,10 @@ public void TestPaymentTermsXRechnungStructuredEndsWithLineBreak()
             string text = reader.ReadToEnd();
 
             ms.Seek(0, SeekOrigin.Begin);
-            Assert.AreEqual(InvoiceDescriptor.GetVersion(ms), ZUGFeRDVersion.Version23);
-
-
-            // Act
+            Assert.AreEqual(InvoiceDescriptor.GetVersion(ms), ZUGFeRDVersion.Version23);
+
+
+            // Act
             ms.Seek(0, SeekOrigin.Begin);
             InvoiceDescriptor loadedInvoice = InvoiceDescriptor.Load(ms);
 
@@ -2951,8 +2951,8 @@ public void TestPaymentTermsSingleCardinalityXRechnungStructured()
             desc.AddTradePaymentTerms(description, null, PaymentTermsType.Skonto, 14, 2.25m);
 
             MemoryStream ms = new MemoryStream();
-            desc.Save(ms, ZUGFeRDVersion.Version23, Profile.XRechnung);
-
+            desc.Save(ms, ZUGFeRDVersion.Version23, Profile.XRechnung);
+
             ms.Seek(0, SeekOrigin.Begin);
             StreamReader reader = new StreamReader(ms);
             string text = reader.ReadToEnd();
@@ -2987,7 +2987,7 @@ public void TestPaymentTermsSingleCardinalityXRechnungStructured()
             Assert.IsTrue(match.Success);
             Assert.AreEqual(match.Groups[1].Value, "SKONTO");
             Assert.AreEqual(match.Groups[2].Value, "14");
-            Assert.AreEqual(match.Groups[3].Value, "2.25");
+            Assert.AreEqual(match.Groups[3].Value, "2.25");
         }
 
 
@@ -3040,8 +3040,8 @@ and follow the required line-based syntax.
         [TestMethod]
         public void TestPaymentTermsMultiCardinalityXRechnungStructured()
         {
-            DateTime timestamp = DateTime.Now.Date;
-
+            DateTime timestamp = DateTime.Now.Date;
+
             var desc = _InvoiceProvider.CreateInvoice();
             desc.GetTradePaymentTerms().Clear();
             desc.AddTradePaymentTerms(String.Empty, null, PaymentTermsType.Skonto, 14, 2.25m);
@@ -3152,8 +3152,8 @@ public void TestSingleXRechnungStructuredManually()
         public void TestOfficialXRechnungFileForPaymentTerms()
         {
             string path = @"..\..\..\..\documentation\xRechnung\XRechnung 3.0.1\xrechnung-3.0.1-schematron-2.0.1\generated\cii-br-de-18-freespace-test-869-identity.xml";
-            path = _makeSurePathIsCrossPlatformCompatible(path);
-
+            path = _makeSurePathIsCrossPlatformCompatible(path);
+
             Stream s = File.Open(path, FileMode.Open);
             InvoiceDescriptor desc = InvoiceDescriptor.Load(s);
             s.Close();
@@ -3450,9 +3450,9 @@ public void TestApplicableTradeDeliveryTermsIsNull()
 
             Assert.AreEqual(Profile.Extended, loadedInvoice.Profile);
             Assert.IsNull(loadedInvoice.ApplicableTradeDeliveryTermsCode);
-        } // !TestSellerOrderReferencedDocument()
-
-
+        } // !TestSellerOrderReferencedDocument()
+
+
         [TestMethod]
         public void TestInvoiceExemptions()
         {
@@ -3583,14 +3583,14 @@ public void TestLoadingInvoiceType()
         {
             // load standrd invoice
             string path = @"..\..\..\..\demodata\zugferd21\zugferd_2p1_EXTENDED_Warenrechnung-factur-x.xml";
-            path = _makeSurePathIsCrossPlatformCompatible(path);
+            path = _makeSurePathIsCrossPlatformCompatible(path);
             InvoiceDescriptor desc = InvoiceDescriptor.Load(path);
 
             Assert.AreEqual(desc.Type, InvoiceType.Invoice);
 
             // load correction
             path = @"..\..\..\..\documentation\zugferd23en\Examples\4. EXTENDED\EXTENDED_Rechnungskorrektur\factur-x.xml";
-            path = _makeSurePathIsCrossPlatformCompatible(path);
+            path = _makeSurePathIsCrossPlatformCompatible(path);
             desc = InvoiceDescriptor.Load(path);
 
             Assert.AreEqual(desc.Type, InvoiceType.Correction);

ZUGFeRD/AdditionalReferencedDocument.cs

@@ -1,82 +1,82 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace s2industries.ZUGFeRD
-{
-    /// <summary>
-    /// Reference documents are supposed to hold additional data you might want to show on item level.
-    ///
-    /// Reference documents are used e.g. for commissions on item level
-    /// </summary>
-    public class AdditionalReferencedDocument : BaseReferencedDocument
-    {
-        /// <summary>
-        /// External document location
-        /// BT-124, BT-X-28
-        /// </summary>
-        public string URIID { get; set; }
-
-        /// <summary>
-        /// Referenced position
-        /// BT-X-29
-        /// </summary>
-        public string LineID { get; set; }
-
-        /// <summary>
-        /// Type of the reference document
-        /// BT-17-0, BT-18-0, BT-122-0, BT-X-30
-        /// </summary>
-        public AdditionalReferencedDocumentTypeCode? TypeCode { get; set; }
-
-        /// <summary>
-        /// Reference documents are strongly typed, specify ReferenceTypeCode to allow easy processing by invoicee
-        /// BT-18-1
-        /// </summary>
-        public ReferenceTypeCodes? ReferenceTypeCode { get; set; }
-
-        /// <summary>
-        /// Description of document
-        /// BT-123, BT-X-299
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// An attached document embedded as binary object or sent together with the invoice.
-        /// BT-125
-        /// </summary>
-        public byte[] AttachmentBinaryObject { get; set; } = null;
-
-        /// <summary>
-        /// Filename of attachment
-        /// BT-125-2
-        /// </summary>
-        public string Filename { get; set; }
-
-        /// <summary>
-        /// MimeType of the attached document embedded as binary object.
-        /// BT-125-1
-        /// </summary>
-        public string MimeType => MimeTypeMapper.GetMimeType(Filename);
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace s2industries.ZUGFeRD
+{
+    /// <summary>
+    /// Reference documents are supposed to hold additional data you might want to show on item level.
+    ///
+    /// Reference documents are used e.g. for commissions on item level
+    /// </summary>
+    public class AdditionalReferencedDocument : BaseReferencedDocument
+    {
+        /// <summary>
+        /// External document location
+        /// BT-124, BT-X-28
+        /// </summary>
+        public string URIID { get; set; }
+
+        /// <summary>
+        /// Referenced position
+        /// BT-X-29
+        /// </summary>
+        public string LineID { get; set; }
+
+        /// <summary>
+        /// Type of the reference document
+        /// BT-17-0, BT-18-0, BT-122-0, BT-X-30
+        /// </summary>
+        public AdditionalReferencedDocumentTypeCode? TypeCode { get; set; }
+
+        /// <summary>
+        /// Reference documents are strongly typed, specify ReferenceTypeCode to allow easy processing by invoicee
+        /// BT-18-1
+        /// </summary>
+        public ReferenceTypeCodes? ReferenceTypeCode { get; set; }
+
+        /// <summary>
+        /// Description of document
+        /// BT-123, BT-X-299
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// An attached document embedded as binary object or sent together with the invoice.
+        /// BT-125
+        /// </summary>
+        public byte[] AttachmentBinaryObject { get; set; } = null;
+
+        /// <summary>
+        /// Filename of attachment
+        /// BT-125-2
+        /// </summary>
+        public string Filename { get; set; }
+
+        /// <summary>
+        /// MimeType of the attached document embedded as binary object.
+        /// BT-125-1
+        /// </summary>
+        public string MimeType => MimeTypeMapper.GetMimeType(Filename);
+    }
+}