From 36cbb9f650bdc9ae83f85f9fe924534ec30d9af3 Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Tue, 5 Apr 2011 12:47:43 +0200
Subject: [PATCH] [Bug #964] Impossible to delete materials not assigned to an
 order element

FEA: ItEr74S04BugFixing
---
 .../business/materials/entities/MaterialCategory.java         | 1 +
 .../business/materials/entities/Materials.hbm.xml             | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialCategory.java b/navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialCategory.java
index 9e2bfcfed..3f301cfbf 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialCategory.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialCategory.java
@@ -146,6 +146,7 @@ public class MaterialCategory extends IntegrationEntity {
     }
 
     public void removeMaterial(Material material) {
+        material.setCategory(null);
         materials.remove(material);
     }
 
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/materials/entities/Materials.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/materials/entities/Materials.hbm.xml
index 8c5e58008..500cdcb8b 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/materials/entities/Materials.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/materials/entities/Materials.hbm.xml
@@ -80,7 +80,7 @@
         index="idx_material_category_on_parent"/>
 
     <!-- Indexed the other side -->
-    <set name="materials" inverse="true" cascade="all">
+    <set name="materials" inverse="true" cascade="all-delete-orphan">
         <key column="category_id"/>
         <one-to-many class="Material"/>
     </set>
@@ -140,4 +140,4 @@
 
 </class>
 
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>