diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
index 3f8a380f5..f0f19f663 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
@@ -683,10 +683,12 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
orderDAO.reattachUnmodifiedEntity(order);
StringBuilder result = new StringBuilder();
result.append(_("Progress") + ": ").append(getEstimatedAdvance(order)).append("% , ");
- result.append(_("Hours invested") + ": ").append(
- getHoursAdvancePercentage(order)).append("% , ");
- result.append(_("Cost") + ": ")
- .append(getMoneyCostBarPercentage(order)).append("% \n");
+ result.append(_("Hours invested") + ": ")
+ .append(getHoursAdvancePercentage(order)).append("%\n");
+ result.append(
+ _("Budget: {0}€, Consumed: {1}€ ({2}%)", getBudget(order),
+ getMoneyCost(order), getMoneyCostBarPercentage(order)
+ .multiply(new BigDecimal(100)))).append("\n");
if (!getDescription(order).equals("")) {
result.append(" , " + _("Description") + ": "
@@ -723,9 +725,16 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
}
private BigDecimal getMoneyCostBarPercentage(Order order) {
- return MoneyCostCalculator.getMoneyCostProportion(
- moneyCostCalculator.getMoneyCost(order), order.getBudget());
+ return MoneyCostCalculator.getMoneyCostProportion(getMoneyCost(order),
+ getBudget(order));
+ }
+ private BigDecimal getBudget(Order order) {
+ return order.getBudget();
+ }
+
+ private BigDecimal getMoneyCost(Order order) {
+ return moneyCostCalculator.getMoneyCost(order);
}
private String buildLabelsText(Order order) {
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java
index e93e3420a..e1b4ce206 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java
@@ -606,8 +606,11 @@ public class TaskElementAdapter {
@Override
public BigDecimal getMoneyCostBarPercentage() {
return MoneyCostCalculator.getMoneyCostProportion(
- getMoneyCost(), taskElement.getOrderElement()
- .getBudget());
+ getMoneyCost(), getBudget());
+ }
+
+ private BigDecimal getBudget() {
+ return taskElement.getOrderElement().getBudget();
}
private BigDecimal getMoneyCost() {
@@ -983,9 +986,12 @@ public class TaskElementAdapter {
.append(getHoursAdvancePercentage().multiply(
new BigDecimal(100))).append("%
");
- result.append(_("Cost") + ": ")
- .append(getMoneyCostBarPercentage().multiply(
- new BigDecimal(100))).append("%
");
+ result.append(
+ _("Budget: {0}€, Consumed: {1}€ ({2}%)",
+ getBudget(),
+ getMoneyCost(),
+ getMoneyCostBarPercentage().multiply(
+ new BigDecimal(100)))).append("
");
if (taskElement.getOrderElement() instanceof Order) {
result.append(_("State") + ": ").append(getOrderState());