From 177a9b40b81199822175ad32ee3d6f00aa3204ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= <ltilve@igalia.com>
Date: Thu, 14 Feb 2013 13:06:54 +0100
Subject: [PATCH] Fix hibernate exception when entering into order
 resourcesload due to company filter parameters

FEA: ItEr77S15FilteringEnhancements
---
 .../org/libreplan/web/resourceload/ResourceLoadController.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java
index a907047e7..1ae7e549e 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java
@@ -312,6 +312,8 @@ public class ResourceLoadController implements Composer {
                 filterBy);
         result.add(filterTypeChanger);
 
+        // Only by dates and bandbox filter on global resources load
+        if (filterBy == null) {
         LocalDate startDate = FilterUtils.readResourceLoadsStartDate();
         LocalDate endDate = FilterUtils.readResourceLoadsEndDate();
 
@@ -355,6 +357,7 @@ public class ResourceLoadController implements Composer {
         result.add(bandbox);
         result.add(new ByNamePaginator(onChange, filterBy, filterTypeChanger,
                 bandbox));
+        }
         result.add(new LoadChart(onChange, filterBy));
         return result;
     }