diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java index 8e4565bc6..d564377dd 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java @@ -1705,6 +1705,10 @@ public abstract class OrderElement extends IntegrationEntity implements return getBudget().add(getResourcesBudget()); } + public BigDecimal getSubstractedBudget() { + return getBudget().subtract(getResourcesBudget()); + } + public BigDecimal getResourcesBudget() { return Registry.getTransactionService().runOnReadOnlyTransaction( new IOnTransaction() { diff --git a/libreplan-business/src/main/java/org/libreplan/business/reports/dtos/ProjectStatusReportDTO.java b/libreplan-business/src/main/java/org/libreplan/business/reports/dtos/ProjectStatusReportDTO.java index e74674f3c..adef556ed 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/reports/dtos/ProjectStatusReportDTO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/reports/dtos/ProjectStatusReportDTO.java @@ -111,7 +111,7 @@ public class ProjectStatusReportDTO { imputedHours = sumChargedEffort.getTotalChargedEffort(); } - setBudget(orderElement.getTotalBudget()); + setBudget(orderElement.getSubstractedBudget()); setExpensesBudget(orderElement.getBudget()); setResourcesBudget(orderElement.getResourcesBudget()); diff --git a/libreplan-webapp/src/main/jasper/projectStatusReportWithHoursBudget.jrxml b/libreplan-webapp/src/main/jasper/projectStatusReportWithHoursBudget.jrxml index f1792f93e..882a6572f 100644 --- a/libreplan-webapp/src/main/jasper/projectStatusReportWithHoursBudget.jrxml +++ b/libreplan-webapp/src/main/jasper/projectStatusReportWithHoursBudget.jrxml @@ -1,7 +1,7 @@ - +