From cbe84be86e410994cd4008a45d2e523d3de50f4f Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Tue, 29 Sep 2009 19:57:22 +0200
Subject: [PATCH] 
 ItEr28S05RFControlAvancesIncompatiblesEnUnidadesTraballoItEr27S05: Not
 allowing change AdvanceType when an AdvanceMeasurement is added.

---
 .../web/orders/ManageOrderElementAdvancesController.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java
index 5f4aa879c..90065c90e 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java
@@ -194,8 +194,10 @@ public class ManageOrderElementAdvancesController extends
             listItem.setDraggable("true");
             listItem.setDroppable("true");
 
-            if (advance instanceof DirectAdvanceAssignment) {
-                 appendComboboxAdvancType(listItem);
+            if ((advance instanceof DirectAdvanceAssignment)
+                    && ((DirectAdvanceAssignment) advance)
+                            .getAdvanceMeasurements().isEmpty()) {
+                appendComboboxAdvancType(listItem);
             } else {
                 appendLabelAdvanceType(listItem);
             }