Skip to content

Added BT-19 AccountingCost to UBL output #802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 12, 2025
Merged

Added BT-19 AccountingCost to UBL output #802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c61b25
Added BT-19 AccountingCost to UBL output
Sep 10, 2025
36489f6
Added test case for Accounting Cost
Nov 12, 2025
b4e8060
Added UBL reader for Accounting Cost
Nov 12, 2025
87bb011
Merged upstream changes
Nov 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion ZUGFeRD.Test/ZUGFeRD22Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3622,6 +3622,27 @@ public void TestRSMInvoice()
Assert.AreEqual(desc.Profile, Profile.XRechnung1);
Assert.AreEqual(desc.InvoiceNo, "0815-99-1-a");
Assert.AreEqual(desc.InvoiceDate, new DateTime(2020, 06, 21));
} // !TestRSMInvoice()
} // !TestRSMInvoice()

[TestMethod]
public void TestAccountingCost()
{
var d = new InvoiceDescriptor();
d.Type = InvoiceType.Invoice;
d.InvoiceNo = "471103";
d.Currency = CurrencyCodes.EUR;
d.InvoiceDate = new DateTime(2025, 11, 11);
d.AddReceivableSpecifiedTradeAccountingAccount("BRE");

using (var stream = new MemoryStream())
{
d.Save(stream, ZUGFeRDVersion.Version23, Profile.XRechnung, ZUGFeRDFormats.UBL);

stream.Seek(0, SeekOrigin.Begin);

var d2 = InvoiceDescriptor.Load(stream);
Assert.IsTrue(d2.GetReceivableSpecifiedTradeAccountingAccounts().Any(account => account.TradeAccountID == "BRE"));
}
} // !TestAccountingCost()
}
}
32 changes: 24 additions & 8 deletions ZUGFeRD/InvoiceDescriptor22UBLWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,22 @@ public override void Save(InvoiceDescriptor descriptor, Stream stream, ZUGFeRDFo
_Writer.WriteElementString("cbc", "TaxCurrencyCode", this._Descriptor.TaxCurrency.Value.EnumToString());
}

// BT-19
if (this._Descriptor.AnyReceivableSpecifiedTradeAccountingAccounts())
{
foreach (ReceivableSpecifiedTradeAccountingAccount traceAccountingAccount in this._Descriptor.GetReceivableSpecifiedTradeAccountingAccounts())
{
if (string.IsNullOrWhiteSpace(traceAccountingAccount.TradeAccountID))
{
continue;
}

_Writer.WriteOptionalElementString("cbc", "AccountingCost", traceAccountingAccount.TradeAccountID);

break; // Cardinality 0..1
}
}

_Writer.WriteOptionalElementString("cbc", "BuyerReference", this._Descriptor.ReferenceOrderNo);

if (this._Descriptor.BillingPeriodEnd.HasValue || this._Descriptor.BillingPeriodEnd.HasValue)
Expand Down Expand Up @@ -458,7 +474,7 @@ public override void Save(InvoiceDescriptor descriptor, Stream stream, ZUGFeRDFo
}

#region AllowanceCharge
foreach(TradeAllowance allowance in descriptor.GetTradeAllowances())
foreach (TradeAllowance allowance in descriptor.GetTradeAllowances())
{
_WriteDocumentLevelAllowanceCharges(_Writer, allowance);
} // !foreach(allowance)
Expand Down Expand Up @@ -678,7 +694,7 @@ private void _WriteTradeLineItem(TradeLineItem tradeLineItem, bool isInvoice = t
{
_WriteItemLevelSpecifiedTradeAllowanceCharge(specifiedTradeAllowanceCharge);
}

foreach (var specifiedTradeAllowanceCharge in tradeLineItem.GetSpecifiedTradeCharges())
{
_WriteItemLevelSpecifiedTradeAllowanceCharge(specifiedTradeAllowanceCharge);
Expand Down Expand Up @@ -726,8 +742,8 @@ private void _WriteTradeLineItem(TradeLineItem tradeLineItem, bool isInvoice = t
_WriteComment(_Writer, options, InvoiceCommentConstants.NetPriceProductTradePriceComment);
_Writer.WriteStartElement("cbc", "PriceAmount");
_Writer.WriteAttributeString("currencyID", this._Descriptor.Currency.EnumToString());
// UBL-DT-01 explicitly excempts the price amount from the 2 decimal rule for amount elements,
// thus allowing for 4 decimal places (needed for e.g. fuel prices)
// UBL-DT-01 explicitly excempts the price amount from the 2 decimal rule for amount elements,
// thus allowing for 4 decimal places (needed for e.g. fuel prices)
_Writer.WriteValue(_formatDecimal(tradeLineItem.NetUnitPrice, 4));
_Writer.WriteEndElement();

Expand All @@ -753,7 +769,7 @@ private void _WriteTradeLineItem(TradeLineItem tradeLineItem, bool isInvoice = t
else
{
_Writer.WriteElementString("cbc", "ChargeIndicator", "true");
}
}

_Writer.WriteStartElement("cbc", "Amount"); // BT-147
_Writer.WriteAttributeString("currencyID", this._Descriptor.Currency.EnumToString());
Expand Down Expand Up @@ -799,7 +815,7 @@ private void _WriteItemLevelSpecifiedTradeAllowanceCharge(AbstractTradeAllowance
_Writer.WriteOptionalElementString("cbc", "AllowanceChargeReasonCode", charge.ReasonCode.EnumToString()); // BT-145
break;
}

_Writer.WriteOptionalElementString("cbc", "AllowanceChargeReason",
specifiedTradeAllowanceCharge.Reason); // BT-139, BT-144

Expand Down Expand Up @@ -884,7 +900,7 @@ private void _writeOptionalParty(ProfileAwareXmlTextWriter writer, PartyTypes pa
{
switch (partyType)
{
case PartyTypes.SellerTradeParty:
case PartyTypes.SellerTradeParty:
writer.WriteStartElement("cac", "AccountingSupplierParty", this._Descriptor.Profile);
break;
case PartyTypes.BuyerTradeParty:
Expand Down Expand Up @@ -1096,7 +1112,7 @@ private void _writeNotes(ProfileAwareXmlTextWriter writer, List<Note> notes)
}
}
} // !_writeNotes()

private void _writeOptionalAmount(ProfileAwareXmlTextWriter writer, string prefix, string tagName, decimal? value, int numDecimals = 2, bool forceCurrency = false, Profile profile = Profile.Unknown)
{
if (!value.HasValue)
Expand Down
14 changes: 6 additions & 8 deletions ZUGFeRD/InvoiceDescriptor22UblReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,14 +406,12 @@ public override InvoiceDescriptor Load(Stream stream)
retval.TotalPrepaidAmount = XmlUtils.NodeAsDecimal(doc.DocumentElement, "//cac:LegalMonetaryTotal/cbc:PrepaidAmount", nsmgr);
retval.DuePayableAmount = XmlUtils.NodeAsDecimal(doc.DocumentElement, "//cac:LegalMonetaryTotal/cbc:PayableAmount", nsmgr);

// TODO: Find value //foreach (XmlNode node in doc.SelectNodes("//ram:ApplicableHeaderTradeSettlement/ram:ReceivableSpecifiedTradeAccountingAccount", nsmgr))
//{
// retval._ReceivableSpecifiedTradeAccountingAccounts.Add(new ReceivableSpecifiedTradeAccountingAccount()
// {
// TradeAccountID = XmlUtils.NodeAsString(node, ".//ram:ID", nsmgr),
// TradeAccountTypeCode = (AccountingAccountTypeCodes)_nodeAsInt(node, ".//ram:TypeCode", nsmgr),
// });
//}
foreach (XmlNode node in doc.SelectNodes("//cbc:AccountingCost", nsmgr))
{
string content = XmlUtils.NodeAsString(node, ".", nsmgr);
if (string.IsNullOrWhiteSpace(content)) continue;
retval.AddReceivableSpecifiedTradeAccountingAccount(content);
}

// TODO: Find value //retval.OrderDate = XmlUtils.NodeAsDateTime(doc.DocumentElement, "//cac:OrderReference/ram:BuyerOrderReferencedDocument/ram:FormattedIssueDateTime/qdt:DateTimeString", nsmgr);
retval.OrderNo = XmlUtils.NodeAsString(doc.DocumentElement, "//cac:OrderReference/cbc:ID", nsmgr);
Expand Down