diff --git a/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml b/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml
index b50aed032..ca3d39707 100644
--- a/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml
+++ b/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml
@@ -5,6 +5,7 @@
+
@@ -156,7 +157,7 @@
-
+
@@ -291,7 +292,7 @@
-
+
@@ -303,7 +304,7 @@
-
+
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java
index 348eba713..013e579bc 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java
@@ -648,4 +648,15 @@ public class Util {
});
}
+ /**
+ * Gets money format for a {@link Decimalbox} using 2 figures for the
+ * decimal part and concatenating the currency symbol
+ *
+ * @return Format for a {@link Decimalbox} ###.## plus currency
+ * symbol
+ */
+ public static String getMoneyFormat() {
+ return "###.## " + getCurrencySymbol();
+ }
+
}
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java
index cfdd24218..fc560ddec 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java
@@ -38,10 +38,8 @@ import org.libreplan.business.costcategories.entities.CostCategory;
import org.libreplan.business.costcategories.entities.HourCost;
import org.libreplan.business.costcategories.entities.TypeOfWorkHours;
import org.libreplan.web.common.BaseCRUDController;
-import org.libreplan.web.common.ConstraintChecker;
import org.libreplan.web.common.Level;
import org.libreplan.web.common.Util;
-import org.libreplan.web.util.ValidationExceptionPrinter;
import org.libreplan.web.workreports.WorkReportCRUDController;
import org.zkoss.ganttz.util.ComponentsFinder;
import org.zkoss.zk.ui.Component;
@@ -305,6 +303,7 @@ public class CostCategoryCRUDController extends BaseCRUDController
Decimalbox boxCost = new Decimalbox();
bindDecimalboxCost(boxCost, (HourCost) row.getValue());
boxCost.setConstraint("no empty:" + _("cannot be null or empty"));
+ boxCost.setFormat(Util.getMoneyFormat());
row.appendChild(boxCost);
}
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java
index 4eb5cf3d2..814fce5ad 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java
@@ -141,4 +141,13 @@ public class TypeOfWorkHoursCRUDController extends BaseCRUDController extends GenericForwardCo
Label lblName = new Label(materialCategory.getName());
Label lblUnits = new Label(getUnits(materialCategory).toString());
- Label lblPrice = new Label(getPrice(materialCategory).toString());
+ Label lblPrice = new Label(getPrice(materialCategory).toString()
+ + getCurrencySymbol());
Treerow tr = null;
ti.setValue(node);
@@ -573,4 +574,12 @@ public abstract class AssignedMaterialsController extends GenericForwardCo
.getId().equals(material.getUnitType().getId())));
}
+ public String getCurrencySymbol() {
+ return Util.getCurrencySymbol();
+ }
+
+ public String getMoneyFormat() {
+ return Util.getMoneyFormat();
+ }
+
}
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java
index 826457317..619d9ab37 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java
@@ -101,4 +101,8 @@ public class SubcontractController extends GenericForwardComposer {
subcontractModel.removeSubcontractedTaskData();
}
+ public String getMoneyFormat() {
+ return Util.getMoneyFormat();
+ }
+
}
\ No newline at end of file
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java
index 983604668..8110c5d02 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e
* Desenvolvemento Tecnolóxico de Galicia
- * Copyright (C) 2010-2011 Igalia, S.L.
+ * Copyright (C) 2010-2012 Igalia, S.L.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -639,4 +639,9 @@ public class TaskPropertiesController extends GenericForwardComposer {
.toDate();
Util.reloadBindings(startDateBox);
}
+
+ public String getMoneyFormat() {
+ return Util.getMoneyFormat();
+ }
+
}
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java
index ee5008b64..abc42e191 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java
@@ -185,6 +185,8 @@ public class TimeLineRequiredMaterialController extends
result.put("startingDate", getStartingDate());
result.put("endingDate", getEndingDate());
result.put("status", getSelectedStatusName());
+ result.put("currencySymbol", Util.getCurrencySymbol());
+
return result;
}
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java
index d01b87a32..55f294b6c 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java
@@ -109,8 +109,9 @@ public class SubcontractedTasksController extends GenericForwardComposer {
appendLabel(row, subcontractedTaskData.getSubcontractedCode());
appendLabel(row, getTaskName(subcontractedTaskData));
appendLabel(row, subcontractedTaskData.getWorkDescription());
- appendLabel(row, toString(subcontractedTaskData
- .getSubcontractPrice()));
+ appendLabel(row,
+ toString(subcontractedTaskData.getSubcontractPrice()) + " "
+ + Util.getCurrencySymbol());
appendLabel(row, _(toString(subcontractedTaskData.getState())));
appendOperations(row, subcontractedTaskData);
}
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java b/libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java
index 926ce5ce3..3924c9dcc 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java
@@ -408,4 +408,8 @@ public class OrderTemplatesController extends GenericForwardComposer implements
Util.reloadBindings(tabPanel);
}
+ public String getMoneyFormat() {
+ return Util.getMoneyFormat();
+ }
+
}
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java
index 77e96c8c6..28d230738 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java
@@ -796,6 +796,7 @@ public abstract class TreeController> extends
// If it's a container budget cell is not editable
Util.bind(result, getBudgetGetterFor(element));
}
+ result.setFormat(Util.getMoneyFormat());
return result;
}
diff --git a/libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul b/libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul
index 8b59f7ebb..458e3d531 100644
--- a/libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul
+++ b/libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul
@@ -59,7 +59,8 @@
+ value="@{controller.typeOfWorkHours.defaultPrice}" width="300px"
+ format="@{controller.moneyFormat}" />
diff --git a/libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul b/libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul
index 3e1d7f3e8..bd2051105 100644
--- a/libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul
+++ b/libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul
@@ -33,7 +33,10 @@
-
+
+
+
+
diff --git a/libreplan-webapp/src/main/webapp/materials/materials.zul b/libreplan-webapp/src/main/webapp/materials/materials.zul
index f41f3e34e..f170d4136 100644
--- a/libreplan-webapp/src/main/webapp/materials/materials.zul
+++ b/libreplan-webapp/src/main/webapp/materials/materials.zul
@@ -92,7 +92,8 @@
constraint="no empty:${i18n:_('cannot be null or empty')}" />
-
+
diff --git a/libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul b/libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul
index 8e16d734c..f40b8cf0c 100644
--- a/libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul
+++ b/libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul
@@ -41,9 +41,11 @@
-
-
+
+
diff --git a/libreplan-webapp/src/main/webapp/orders/_edition.zul b/libreplan-webapp/src/main/webapp/orders/_edition.zul
index 799046f6a..b02b824d7 100644
--- a/libreplan-webapp/src/main/webapp/orders/_edition.zul
+++ b/libreplan-webapp/src/main/webapp/orders/_edition.zul
@@ -142,20 +142,28 @@
+ onChange="controller.reloadTotalBudget(txtTotalBudget)"
+ format="@{controller.moneyFormat}" />
+ onChange="controller.reloadTotalBudget(txtTotalBudget)"
+ format="@{controller.moneyFormat}" />
-
+
-
+
diff --git a/libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul b/libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul
index 6baec2785..b974656fd 100644
--- a/libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul
+++ b/libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul
@@ -149,14 +149,20 @@
-
+
+
+
+
-
+
+
+
+
diff --git a/libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul b/libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul
index 80fd1c317..454c518c7 100644
--- a/libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul
+++ b/libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul
@@ -66,7 +66,8 @@
+ constraint="no negative:${i18n:_('Budget value cannot be negative')}"
+ format="@{detailsController.moneyFormat}" />
diff --git a/libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul b/libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul
index e70d22f0d..441b3f77a 100644
--- a/libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul
+++ b/libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul
@@ -116,7 +116,10 @@
-
+
+
+
+
diff --git a/libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul b/libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul
index 67bc7b647..41af54012 100644
--- a/libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul
+++ b/libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul
@@ -50,7 +50,8 @@
-
+
diff --git a/libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul b/libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul
index bff411be4..d46c6fc0c 100644
--- a/libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul
+++ b/libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul
@@ -60,7 +60,8 @@
-
+
diff --git a/libreplan-webapp/src/main/webapp/templates/_editTemplate.zul b/libreplan-webapp/src/main/webapp/templates/_editTemplate.zul
index 18bd32ed1..09e1617d9 100644
--- a/libreplan-webapp/src/main/webapp/templates/_editTemplate.zul
+++ b/libreplan-webapp/src/main/webapp/templates/_editTemplate.zul
@@ -90,7 +90,8 @@
+ constraint="no negative:${i18n:_('Budget value cannot be negative')}"
+ format="@{templatesForOrdersController.moneyFormat}" />
diff --git a/libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul b/libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul
index 987daebf0..4b024defb 100644
--- a/libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul
+++ b/libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul
@@ -44,9 +44,11 @@
onSelect = "assignedMaterialsController.selectUnitType(self)"
itemRenderer="@{assignedMaterialsController.renderer}"
disabled="true"/>
-
-
+
+