From a7e285004535c428695ccfe127789c1bc23db66f Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smontes@wirelessgalicia.com>
Date: Tue, 8 May 2012 20:18:27 +0100
Subject: [PATCH] adds the currency symbol and set the right parameter to
 method reloadTotalBudget in the order edition view.

FEA: ItEr76S04BugFixing
---
 .../libreplan/web/orders/OrderCRUDController.java  |  8 +++++---
 .../src/main/webapp/orders/_edition.zul            | 14 ++++++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
index bac6c54ad..17cdc00ee 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
@@ -94,7 +94,6 @@ import org.zkoss.zul.Comboitem;
 import org.zkoss.zul.ComboitemRenderer;
 import org.zkoss.zul.Constraint;
 import org.zkoss.zul.Datebox;
-import org.zkoss.zul.Decimalbox;
 import org.zkoss.zul.Grid;
 import org.zkoss.zul.Hbox;
 import org.zkoss.zul.Label;
@@ -1343,8 +1342,8 @@ public class OrderCRUDController extends GenericForwardComposer {
         return orderModel.gettooltipText(order);
     }
 
-    public void reloadTotalBudget(Decimalbox decimalboxTotalBudget) {
-        Util.reloadBindings(decimalboxTotalBudget);
+    public void reloadTotalBudget(Label labelTotalBudget) {
+        Util.reloadBindings(labelTotalBudget);
     }
 
     /**
@@ -1726,4 +1725,7 @@ public class OrderCRUDController extends GenericForwardComposer {
         return Util.getMoneyFormat();
     }
 
+    public String getCurrencySymbol() {
+        return Util.getCurrencySymbol();
+    }
 }
diff --git a/libreplan-webapp/src/main/webapp/orders/_edition.zul b/libreplan-webapp/src/main/webapp/orders/_edition.zul
index f8b7be456..1117d260d 100644
--- a/libreplan-webapp/src/main/webapp/orders/_edition.zul
+++ b/libreplan-webapp/src/main/webapp/orders/_edition.zul
@@ -169,20 +169,26 @@
                                     <label value="${i18n:_('Work')}" />
                                     <decimalbox id="boxWorkBudget" width="80px" scale = "2"
                                         value="@{controller.order.workBudget}"
-                                        onChange="controller.reloadTotalBudget(txtTotalBudget)" />
+                                        onChange="controller.reloadTotalBudget(txtTotalBudget)"
+                                        format="@{controller.moneyFormat}"/>
                                     <separator bar="false" spacing="15px" orient="vertical"/>
                                     <label value="${i18n:_('Materials')}" />
                                     <decimalbox id="boxMaterialsBudget" width="80px" scale="2"
                                         value="@{controller.order.materialsBudget}"
-                                        onChange="controller.reloadTotalBudget(txtTotalBudget)" />
+                                        onChange="controller.reloadTotalBudget(txtTotalBudget)"
+                                        format="@{controller.moneyFormat}"/>
                                     <separator bar="false" spacing="15px" orient="vertical"/>
                                     <label value=" ${i18n:_('Total')} :" />
-                                        <label id="txtTotalBudget" value="@{controller.order.totalBudget}"/>
+                                    <label id="txtTotalBudget" value="@{controller.order.totalBudget}"/>
+                                    <label value="@{controller.currencySymbol}"/>
                                 </hbox>
                             </row>
                             <row>
                                 <label value="${i18n:_('Calculated budget')}" />
-                                <label id="budget" value="@{controller.order.budget}" />
+                                <hbox>
+                                    <label id="budget" value="@{controller.order.budget}" />
+                                    <label value="@{controller.currencySymbol}"/>
+                                </hbox>
                             </row>
                             <row>
                                 <label value="${i18n:_('Total hours')}" />