From d1a1cba1abe84503f838d3bd24d12f477304a414 Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Tue, 7 Sep 2010 12:51:42 +0200
Subject: [PATCH] Fix bug orderElement.getSumChargedHours() returned null
 caused runtime error

FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
---
 .../navalplanner/business/orders/daos/OrderElementDAO.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/OrderElementDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/OrderElementDAO.java
index 0bef8fdf3..46794445d 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/OrderElementDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/OrderElementDAO.java
@@ -181,8 +181,9 @@ public class OrderElementDAO extends IntegrationEntityDAO<OrderElement>
     @Override
     @Transactional(readOnly = true)
     public BigDecimal getHoursAdvancePercentage(OrderElement orderElement) {
-        BigDecimal assignedHours = new BigDecimal(orderElement
-                .getSumChargedHours().getTotalChargedHours()).setScale(2);
+        final Integer totalChargedHours = orderElement.getSumChargedHours() != null ? orderElement
+                .getSumChargedHours().getTotalChargedHours() : new Integer(0);
+        BigDecimal assignedHours = new BigDecimal(totalChargedHours).setScale(2);
         BigDecimal estimatedHours = new BigDecimal(orderElement.getWorkHours())
                 .setScale(2);