Merge branch 'master' of https://github.com/stephanstapel/ZUGFeRD-csharp

Author: stephanstapel

ZUGFeRD/InvoiceDescriptor20Writer.cs

@@ -625,8 +625,8 @@ public override void Save(InvoiceDescriptor descriptor, Stream stream, ZUGFeRDFo
             //   4. InvoiceCurrencyCode (optional)
             _Writer.WriteElementString("ram", "InvoiceCurrencyCode", this._Descriptor.Currency.EnumToString());
 
-            //   5. InvoiceIssuerReference (optional)
-            _Writer.WriteElementString("ram", "InvoiceIssuerReference", this._Descriptor.SellerReferenceNo, profile: Profile.Extended);
+            //   5. InvoiceIssuerReference (optional), BT-X-204
+            _Writer.WriteOptionalElementString("ram", "InvoiceIssuerReference", this._Descriptor.SellerReferenceNo, Profile.Extended);
 
             //   6. InvoicerTradeParty (optional)
             _writeOptionalParty(_Writer, "ram", "InvoicerTradeParty", this._Descriptor.Invoicer);

ZUGFeRD/InvoiceDescriptor23CIIWriter.cs

@@ -313,6 +313,8 @@ public override void Save(InvoiceDescriptor descriptor, Stream stream, ZUGFeRDFo
                     {
                         _Writer.WriteStartElement("ram", "ContractReferencedDocument", Profile.Extended);
 
+                        _Writer.WriteOptionalElementString("ram", "IssuerAssignedID", tradeLineItem.ContractReferencedDocument.ID);
+
                         // reference to the contract position
                         _Writer.WriteOptionalElementString("ram", "LineID", tradeLineItem.ContractReferencedDocument.LineID);
 
@@ -325,7 +327,6 @@ public override void Save(InvoiceDescriptor descriptor, Stream stream, ZUGFeRDFo
                             _Writer.WriteEndElement(); // !udt:DateTimeString
                             _Writer.WriteEndElement(); // !ram:IssueDateTime
                         }
-                        _Writer.WriteOptionalElementString("ram", "IssuerAssignedID", tradeLineItem.ContractReferencedDocument.ID);
                         _Writer.WriteEndElement(); // !ram:ContractReferencedDocument(Extended)
                     }
                     #endregion

ZUGFeRD/TradeCurrencyExchange.cs

@@ -50,11 +50,11 @@ public class TradeCurrencyExchange
 
 
         /// <summary>
-        /// Constructor
+        /// Constructor without exchange rate date
         /// </summary>
-        /// <param name="sourceCurrency"></param>
-        /// <param name="targetCurrency"></param>
-        /// <param name="conversionRate"></param>
+        /// <param name="sourceCurrency">Invoice currency</param>
+        /// <param name="targetCurrency">Local currency</param>
+        /// <param name="conversionRate">Exchange rate</param>
         public TradeCurrencyExchange(CurrencyCodes sourceCurrency, CurrencyCodes targetCurrency, decimal conversionRate)
         {
             SourceCurrency = sourceCurrency;
@@ -64,12 +64,12 @@ public TradeCurrencyExchange(CurrencyCodes sourceCurrency, CurrencyCodes targetC
 
 
         /// <summary>
-        /// Constructor
+        /// Constructor with exchange rate date
         /// </summary>
-        /// <param name="sourceCurrency"></param>
-        /// <param name="targetCurrency"></param>
-        /// <param name="conversionRate"></param>
-        /// <param name="conversionRateTimestamp"></param>
+        /// <param name="sourceCurrency">Invoice currency</param>
+        /// <param name="targetCurrency">Local currency</param>
+        /// <param name="conversionRate">Exchange rate</param>
+        /// <param name="conversionRateTimestamp">Exchange rate date</param>
         public TradeCurrencyExchange(CurrencyCodes sourceCurrency, CurrencyCodes targetCurrency, decimal conversionRate, DateTime conversionRateTimestamp)
         {
             SourceCurrency = sourceCurrency;