Skip to content

Fixes issue #800. #801

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes issue #800. #801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 17 additions & 1 deletion ZUGFeRD/InvoiceDescriptor22UBLWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,23 @@ private void _WriteTradeLineItem(TradeLineItem tradeLineItem, bool isInvoice = t
_Writer.WriteEndElement(); // !InvoicedQuantity || CreditedQuantity

_WriteComment(_Writer, options, InvoiceCommentConstants.SpecifiedTradeSettlementLineMonetarySummationComment);
_writeOptionalAmount(_Writer, "cbc", "LineExtensionAmount", tradeLineItem.LineTotalAmount, forceCurrency: true);
decimal lineTotalAmount = 0m;
if (tradeLineItem.LineTotalAmount.HasValue)
{
lineTotalAmount = tradeLineItem.LineTotalAmount.Value;
}
else
{
lineTotalAmount = tradeLineItem.NetUnitPrice * tradeLineItem.BilledQuantity;
if (tradeLineItem.NetQuantity.HasValue && (tradeLineItem.NetQuantity.Value != 0))
{
lineTotalAmount /= tradeLineItem.NetQuantity.Value;
}
}
_Writer.WriteStartElement("cbc", "LineExtensionAmount");
_Writer.WriteAttributeString("currencyID", this._Descriptor.Currency.EnumToString());
_Writer.WriteValue(_formatDecimal(lineTotalAmount));
_Writer.WriteEndElement(); // cbc:LineExtensionAmount

if (tradeLineItem.AdditionalReferencedDocuments.Count > 0)
{
Expand Down
10 changes: 5 additions & 5 deletions ZUGFeRD/InvoiceDescriptor23CIIWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,22 +522,22 @@ public override void Save(InvoiceDescriptor descriptor, Stream stream, ZUGFeRDFo
//Detailinformationen zu Positionssummen
_WriteComment(_Writer, options, InvoiceCommentConstants.SpecifiedTradeSettlementLineMonetarySummationComment);
_Writer.WriteStartElement("ram", "SpecifiedTradeSettlementLineMonetarySummation");
decimal total = 0m;
decimal lineTotalAmount = 0m;
if (tradeLineItem.LineTotalAmount.HasValue)
{
total = tradeLineItem.LineTotalAmount.Value;
lineTotalAmount = tradeLineItem.LineTotalAmount.Value;
}
else
{
total = tradeLineItem.NetUnitPrice * tradeLineItem.BilledQuantity;
lineTotalAmount = tradeLineItem.NetUnitPrice * tradeLineItem.BilledQuantity;
if (tradeLineItem.NetQuantity.HasValue && (tradeLineItem.NetQuantity.Value != 0))
{
total /= tradeLineItem.NetQuantity.Value;
lineTotalAmount /= tradeLineItem.NetQuantity.Value;
}
}

_Writer.WriteStartElement("ram", "LineTotalAmount", Profile.Basic | Profile.Comfort | Profile.Extended | Profile.XRechnung1 | Profile.XRechnung);
_Writer.WriteValue(_formatDecimal(total));
_Writer.WriteValue(_formatDecimal(lineTotalAmount));
_Writer.WriteEndElement(); // !ram:LineTotalAmount

// TODO: TotalAllowanceChargeAmount
Expand Down
Loading