Merge pull request #263 from etendosoftware/hotfix/#144-EPL-549

Issue #144: The method "getProductPrice" generates a NPE

src-test/src/org/openbravo/financial/FinancialUtilsTest.java

@@ -0,0 +1,34 @@
+package org.openbravo.financial;
+
+import java.util.Date;
+
+import org.openbravo.model.common.businesspartner.BusinessPartner;
+import org.junit.Test;
+import org.openbravo.base.exception.OBException;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.base.weld.test.WeldBaseTest;
+import org.openbravo.model.pricing.pricelist.PriceList;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+
+public class FinancialUtilsTest extends WeldBaseTest {
+  protected static final String BP_HEALTHY_FOOD = "B3ABB0B4AFEA4541AC1E29891D496079";
+
+
+  @Test
+  public void testGetProductPriceWithNullProduct() {
+    // Given
+    Date date = new Date();
+    BusinessPartner healthyFoodBP = OBDal.getInstance().get(BusinessPartner.class, BP_HEALTHY_FOOD);
+    PriceList priceList = healthyFoodBP.getPurchasePricelist();
+    // When
+    try {
+      FinancialUtils.getProductPrice(null, date, true, priceList);
+      fail("Expected an OBException to be thrown");
+    } catch (OBException e) {
+      assertEquals("@ParameterMissing@ @Product@", e.getMessage());
+    }
+  }
+}

src-test/src/org/openbravo/test/StandaloneTestSuite.java

@@ -150,6 +150,7 @@
 import org.openbravo.test.xml.EntityXMLIssues;
 import org.openbravo.test.xml.UniqueConstraintImportTest;
 import org.openbravo.userinterface.selectors.test.ExpressionsTest;
+import org.openbravo.financial.FinancialUtilsTest;
 
 /**
  * This test class is called from the ant task run.all.tests by the CI server. It contains all the
@@ -355,6 +356,7 @@
     // others
     DocumentNumberGeneration.class, //
     GridExport.class, //
+    FinancialUtilsTest.class, //
 
 
     // Cancel and Replace Tests

src/org/openbravo/financial/FinancialUtils.java

@@ -71,7 +71,7 @@ public static BigDecimal getProductStdPrice(final Product product, final Date da
    * ProductPrice to be used. In case a conversion is needed it uses the
    * {@link #getConvertedAmount(BigDecimal, Currency, Currency, Date, Organization, String)
    * getConvertedAmount()} method.
-   * 
+   *
    * @param product
    *          Product to get its ProductPrice.
    * @param date
@@ -131,7 +131,7 @@ public static ProductPrice getProductPrice(final Product product, final Date dat
    * Method to get a valid ProductPrice for the given Product. It only considers PriceList versions
    * valid on the given date. If a PriceList is given it searches on that one. If PriceList null is
    * passed it search on any Sales or Purchase PriceList based on the useSalesPriceList.
-   * 
+   *
    * @param product
    *          Product to get its ProductPrice.
    * @param date
@@ -151,6 +151,10 @@ public static ProductPrice getProductPrice(final Product product, final Date dat
   public static ProductPrice getProductPrice(final Product product, final Date date,
       final boolean useSalesPriceList, final PriceList priceList, final boolean throwException,
       final boolean usePriceIncludeTax) throws OBException {
+
+    if (product == null) {
+      throw new OBException("@ParameterMissing@ @Product@");
+    }
     //@formatter:off
     String hql =
             "as pp" +
@@ -209,7 +213,7 @@ public static ProductPrice getProductPrice(final Product product, final Date dat
    * Method to get the conversion rate defined at system level. If there is not a conversion rate
    * defined on the given Organization it is searched recursively on its parent organization until
    * one is found. If no conversion rate is found null is returned.
-   * 
+   *
    * @param date
    *          Date conversion is being performed.
    * @param fromCurrency
@@ -274,7 +278,7 @@ public static BigDecimal getConvertedAmount(final BigDecimal amount, final Curre
 
   /**
    * Converts an amount.
-   * 
+   *
    * @param amount
    *          BigDecimal amount to convert.
    * @param curFrom
@@ -343,7 +347,7 @@ public static Currency getLegalEntityCurrency(final Organization organization) {
 
   /**
    * Calculates the net unit price using the C_GET_NET_PRICE_FROM_GROSS stored procedure.
-   * 
+   *
    * @param strTaxId
    *          Tax that applies to the price.
    * @param grossAmount
@@ -355,7 +359,7 @@ public static Currency getLegalEntityCurrency(final Organization organization) {
    * @param quantity
    *          number of units to divide the amount to get the price.
    * @return the net unit price
-   * 
+   *
    * @deprecated Use {@link #calculateNetAmtFromGross} instead
    */
   @Deprecated
@@ -380,7 +384,7 @@ public static BigDecimal calculateNetFromGross(final String strTaxId,
 
   /**
    * Calculates the net unit price using the C_GET_NET_AMOUNT_FROM_GROSS stored procedure.
-   * 
+   *
    * @param strTaxId
    *          Tax that applies to the price.
    * @param grossAmount