Fixing #15 for CreditNotes as well

phax · Sep 28, 2022 · 2a6276e · 2a6276e
1 parent 3e8648d
commit 2a6276e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 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
@@ -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
@@ -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
@@ -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 ())