From 2a6276e221742197cb6bad0557926a1bdd8e465c Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Wed, 28 Sep 2022 15:16:28 +0200 Subject: [PATCH] Fixing #15 for CreditNotes as well --- .../com/helger/en16931/cii2ubl/CIIToUBL21Converter.java | 6 +++--- .../com/helger/en16931/cii2ubl/CIIToUBL22Converter.java | 6 +++--- .../com/helger/en16931/cii2ubl/CIIToUBL23Converter.java | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/en16931-cii2ubl/src/main/java/com/helger/en16931/cii2ubl/CIIToUBL21Converter.java b/en16931-cii2ubl/src/main/java/com/helger/en16931/cii2ubl/CIIToUBL21Converter.java index 5ef58bc..e6c5c32 100644 --- a/en16931-cii2ubl/src/main/java/com/helger/en16931/cii2ubl/CIIToUBL21Converter.java +++ b/en16931-cii2ubl/src/main/java/com/helger/en16931/cii2ubl/CIIToUBL21Converter.java @@ -1346,7 +1346,7 @@ public InvoiceType convertToInvoice (@Nonnull final CrossIndustryInvoiceType aCI "SupplyChainTradeTransaction", "IncludedSupplyChainTradeLineItem", "SpecifiedLineTradeAgreement", - "NetPriceProductTradePrice", + "GrossPriceProductTradePrice", "AppliedTradeAllowanceCharge" }, "Failed to determine if AppliedTradeAllowanceCharge is an Allowance or a Charge")); if (eIsCharge.isDefined ()) @@ -2144,7 +2144,7 @@ public CreditNoteType convertToCreditNote (@Nonnull final CrossIndustryInvoiceTy bUsePrice ? aUBLPrice::setPriceAmount : null); // Allowance charge - final TradePriceType aTradePrice = aLineAgreement.getNetPriceProductTradePrice (); + final TradePriceType aTradePrice = aLineAgreement.getGrossPriceProductTradePrice (); if (aTradePrice != null) for (final TradeAllowanceChargeType aPriceAllowanceCharge : aTradePrice.getAppliedTradeAllowanceCharge ()) { @@ -2156,7 +2156,7 @@ public CreditNoteType convertToCreditNote (@Nonnull final CrossIndustryInvoiceTy "SupplyChainTradeTransaction", "IncludedSupplyChainTradeLineItem", "SpecifiedLineTradeAgreement", - "NetPriceProductTradePrice", + "GrossPriceProductTradePrice", "AppliedTradeAllowanceCharge" }, "Failed to determine if AppliedTradeAllowanceCharge is an Allowance or a Charge")); if (eIsCharge.isDefined ()) diff --git a/en16931-cii2ubl/src/main/java/com/helger/en16931/cii2ubl/CIIToUBL22Converter.java b/en16931-cii2ubl/src/main/java/com/helger/en16931/cii2ubl/CIIToUBL22Converter.java index 443a0c4..bcb1a29 100644 --- a/en16931-cii2ubl/src/main/java/com/helger/en16931/cii2ubl/CIIToUBL22Converter.java +++ b/en16931-cii2ubl/src/main/java/com/helger/en16931/cii2ubl/CIIToUBL22Converter.java @@ -1346,7 +1346,7 @@ public InvoiceType convertToInvoice (@Nonnull final CrossIndustryInvoiceType aCI "SupplyChainTradeTransaction", "IncludedSupplyChainTradeLineItem", "SpecifiedLineTradeAgreement", - "NetPriceProductTradePrice", + "GrossPriceProductTradePrice", "AppliedTradeAllowanceCharge" }, "Failed to determine if AppliedTradeAllowanceCharge is an Allowance or a Charge")); if (eIsCharge.isDefined ()) @@ -2141,7 +2141,7 @@ public CreditNoteType convertToCreditNote (@Nonnull final CrossIndustryInvoiceTy bUsePrice ? aUBLPrice::setPriceAmount : null); // Allowance charge - final TradePriceType aTradePrice = aLineAgreement.getNetPriceProductTradePrice (); + final TradePriceType aTradePrice = aLineAgreement.getGrossPriceProductTradePrice (); if (aTradePrice != null) for (final TradeAllowanceChargeType aPriceAllowanceCharge : aTradePrice.getAppliedTradeAllowanceCharge ()) { @@ -2153,7 +2153,7 @@ public CreditNoteType convertToCreditNote (@Nonnull final CrossIndustryInvoiceTy "SupplyChainTradeTransaction", "IncludedSupplyChainTradeLineItem", "SpecifiedLineTradeAgreement", - "NetPriceProductTradePrice", + "GrossPriceProductTradePrice", "AppliedTradeAllowanceCharge" }, "Failed to determine if AppliedTradeAllowanceCharge is an Allowance or a Charge")); if (eIsCharge.isDefined ()) diff --git a/en16931-cii2ubl/src/main/java/com/helger/en16931/cii2ubl/CIIToUBL23Converter.java b/en16931-cii2ubl/src/main/java/com/helger/en16931/cii2ubl/CIIToUBL23Converter.java index ff37476..1ae15ae 100644 --- a/en16931-cii2ubl/src/main/java/com/helger/en16931/cii2ubl/CIIToUBL23Converter.java +++ b/en16931-cii2ubl/src/main/java/com/helger/en16931/cii2ubl/CIIToUBL23Converter.java @@ -1347,7 +1347,7 @@ public InvoiceType convertToInvoice (@Nonnull final CrossIndustryInvoiceType aCI "SupplyChainTradeTransaction", "IncludedSupplyChainTradeLineItem", "SpecifiedLineTradeAgreement", - "NetPriceProductTradePrice", + "GrosstPriceProductTradePrice", "AppliedTradeAllowanceCharge" }, "Failed to determine if AppliedTradeAllowanceCharge is an Allowance or a Charge")); if (eIsCharge.isDefined ()) @@ -2142,7 +2142,7 @@ public CreditNoteType convertToCreditNote (@Nonnull final CrossIndustryInvoiceTy bUsePrice ? aUBLPrice::setPriceAmount : null); // Allowance charge - final TradePriceType aTradePrice = aLineAgreement.getNetPriceProductTradePrice (); + final TradePriceType aTradePrice = aLineAgreement.getGrossPriceProductTradePrice (); if (aTradePrice != null) for (final TradeAllowanceChargeType aPriceAllowanceCharge : aTradePrice.getAppliedTradeAllowanceCharge ()) { @@ -2154,7 +2154,7 @@ public CreditNoteType convertToCreditNote (@Nonnull final CrossIndustryInvoiceTy "SupplyChainTradeTransaction", "IncludedSupplyChainTradeLineItem", "SpecifiedLineTradeAgreement", - "NetPriceProductTradePrice", + "GrossPriceProductTradePrice", "AppliedTradeAllowanceCharge" }, "Failed to determine if AppliedTradeAllowanceCharge is an Allowance or a Charge")); if (eIsCharge.isDefined ())