From b7be239dff237479cb2331a11a8872932cd29689 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Mon, 16 Nov 2009 11:44:32 +0100
Subject: [PATCH] 
 ItEr34S13CUAsignacionRecursosEspecificosAPlanificacionItEr33S15: Saving
 assignment function.

---
 .../business/planner/entities/GenericResourceAllocation.java  | 1 +
 .../business/planner/entities/SpecificResourceAllocation.java | 1 +
 .../business/planner/entities/ResourceAllocations.hbm.xml     | 4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java
index 75727b6b2..d008ef650 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java
@@ -233,6 +233,7 @@ public class GenericResourceAllocation extends
         Validate.isTrue(modifications instanceof GenericResourceAllocation);
         mergeAssignments((GenericResourceAllocation) modifications);
         setResourcesPerDay(modifications.getResourcesPerDay());
+        setAssignmentFunction(modifications.getAssignmentFunction());
     }
 
     private void mergeAssignments(GenericResourceAllocation modifications) {
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java
index c5501be5a..21084552c 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java
@@ -169,6 +169,7 @@ public class SpecificResourceAllocation extends
         Validate.isTrue(modifications instanceof SpecificResourceAllocation);
         mergeAssignments((SpecificResourceAllocation) modifications);
         setResourcesPerDay(modifications.getResourcesPerDay());
+        setAssignmentFunction(modifications.getAssignmentFunction());
     }
 
     private void mergeAssignments(SpecificResourceAllocation modifications) {
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml
index f514ef141..97cad2028 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml
@@ -16,7 +16,9 @@
 
         <many-to-one class="Task" name="task" column="TASK" />
 
-        <many-to-one class="AssignmentFunction" name="assignmentFunction" column="ASSIGNMENT_FUNCTION" not-null="false"/>
+        <many-to-one class="AssignmentFunction" name="assignmentFunction"
+            column="ASSIGNMENT_FUNCTION" not-null="false"
+            cascade="all" />
 
         <joined-subclass name="SpecificResourceAllocation" table="specific_resource_allocation">
             <key column="RESOURCE_ALLOCATION_ID" />