Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions ZUGFeRD/AbstractTradeAllowanceCharge.cs
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,11 @@ public abstract class AbstractTradeAllowanceCharge : Charge
/// BT-101
/// </summary>
public decimal? ChargePercentage { get; internal set; }

/// <summary>
/// Surcharges/discounts at invoice level - percentage rate
/// BT-94, BT-101
/// </summary>
public decimal? MultiplierFactor { get; internal set; }
}
}
7 changes: 5 additions & 2 deletions ZUGFeRD/InvoiceDescriptor22UblReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -676,22 +676,25 @@ private static List<TradeLineItem> _parseTradeLineItem(XmlNode tradeLineItem, Xm
string actualAmountCurrency = XmlUtils.NodeAsString(appliedTradeAllowanceChargeNode, "./cbc:Amount/@currencyID", nsmgr);
string reason = XmlUtils.NodeAsString(appliedTradeAllowanceChargeNode, "./cbc:AllowanceChargeReason", nsmgr);
string reasonCode = XmlUtils.NodeAsString(appliedTradeAllowanceChargeNode, "./cbc:AllowanceChargeReasonCode", nsmgr);
decimal? multiplierFactor = XmlUtils.NodeAsDecimal(appliedTradeAllowanceChargeNode, "./cbc:MultiplierFactorNumeric", nsmgr);

if (chargeIndicator) // charge
{
item.AddTradeCharge(EnumExtensions.StringToEnum<CurrencyCodes>(basisAmountCurrency),
basisAmount,
actualAmount,
reason,
EnumExtensions.StringToEnum<ChargeReasonCodes>(reasonCode));
EnumExtensions.StringToEnum<ChargeReasonCodes>(reasonCode),
multiplierFactor);
}
else // allowance
{
item.AddTradeAllowance(EnumExtensions.StringToEnum<CurrencyCodes>(basisAmountCurrency),
basisAmount,
actualAmount,
reason,
EnumExtensions.StringToEnum<AllowanceReasonCodes>(reasonCode));
EnumExtensions.StringToEnum<AllowanceReasonCodes>(reasonCode),
multiplierFactor);
}
}

Expand Down
10 changes: 6 additions & 4 deletions ZUGFeRD/TradeLineItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -334,15 +334,16 @@ public TradeLineItem(string lineId)
/// <param name="reason">Reason for the allowance </param>
/// <param name="reasonCode">Reason code for the allowance</param>
public TradeLineItem AddTradeAllowance(CurrencyCodes currency, decimal? basisAmount, decimal actualAmount,
string reason, AllowanceReasonCodes? reasonCode = null)
string reason, AllowanceReasonCodes? reasonCode = null, decimal? multiplierFactor = null)
{
this.TradeAllowanceCharges.Add(new TradeAllowance()
{
Currency = currency,
ActualAmount = actualAmount,
BasisAmount = basisAmount,
Reason = reason,
ReasonCode = reasonCode
ReasonCode = reasonCode,
MultiplierFactor = multiplierFactor
});
return this;
} // !AddTradeAllowance()
Expand All @@ -359,15 +360,16 @@ public TradeLineItem AddTradeAllowance(CurrencyCodes currency, decimal? basisAmo
/// <param name="reason">Reason for the surcharge</param>
/// <param name="reasonCode">Optional reason code for the surcharge</param>
public TradeLineItem AddTradeCharge(CurrencyCodes currency, decimal? basisAmount, decimal actualAmount,
string reason, ChargeReasonCodes? reasonCode = null)
string reason, ChargeReasonCodes? reasonCode = null, decimal? multiplierFactor = null)
{
this.TradeAllowanceCharges.Add(new TradeCharge()
{
Currency = currency,
ActualAmount = actualAmount,
BasisAmount = basisAmount,
Reason = reason,
ReasonCode = reasonCode
ReasonCode = reasonCode,
MultiplierFactor = multiplierFactor
});
return this;
} // !AddTradeAllowanceCharge()
Expand Down