From a623f0280efcaac32abf7bf856673f26b3f65e04 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Wed, 14 Oct 2009 11:48:51 +0200
Subject: [PATCH]  ItEr30S17ValidacionEProbasFuncionais: Using 8 hours per day
 if resource has not calendar assigned.

---
 .../java/org/navalplanner/web/planner/CompanyPlanningModel.java | 2 ++
 .../java/org/navalplanner/web/planner/OrderPlanningModel.java   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPlanningModel.java
index 0b1ac8326..003bfdb61 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPlanningModel.java
@@ -406,6 +406,8 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
                 ResourceCalendar calendar = resource.getCalendar();
                 if (calendar != null) {
                     hours += calendar.getWorkableHours(date);
+                } else {
+                    hours += 8;
                 }
             }
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java
index f048a0227..e2bb170eb 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java
@@ -496,6 +496,8 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
                         .getCalendar();
                 if (calendar != null) {
                     hours = calendar.getWorkableHours(dayAssignment.getDay());
+                } else {
+                    hours = 8;
                 }
             } else {
                 hours = dayAssignment.getHours();