From 42bc8f934647fb4df7f166d57f03b86242b0f959 Mon Sep 17 00:00:00 2001 From: Susana Montes Pedreira Date: Wed, 21 Mar 2012 10:21:07 +0000 Subject: [PATCH] Change name of the communication type from "Report advance" to "Progress Update". FEA: ItEr75S30SubcontractorIncommingCommunicationsLists --- .../business/externalcompanies/entities/CommunicationType.java | 2 +- .../ws/subcontract/impl/ReportAdvancesServiceREST.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java b/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java index b31a91984..b4d3086b4 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java +++ b/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java @@ -28,7 +28,7 @@ import static org.libreplan.business.i18n.I18nHelper._; */ public enum CommunicationType { - NEW_PROJECT(_("New project")), REPORT_PROGRESS(_("Report advance")), UPDATE_DELIVERING_DATE( + NEW_PROJECT(_("New project")), PROGRESS_UPDATE(_("Progress Update")), UPDATE_DELIVERING_DATE( _("Update Delivering Date")); private String description; diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/ReportAdvancesServiceREST.java b/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/ReportAdvancesServiceREST.java index d07217cb3..72b5b97ce 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/ReportAdvancesServiceREST.java +++ b/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/ReportAdvancesServiceREST.java @@ -253,7 +253,7 @@ public class ReportAdvancesServiceREST implements IReportAdvancesService { if (subcontractedTaskData != null) { SubcontractorCommunication subcontractorCommunication = SubcontractorCommunication .create(subcontractedTaskData, - CommunicationType.REPORT_PROGRESS, new Date(), + CommunicationType.PROGRESS_UPDATE, new Date(), false); for (AdvanceMeasurementDTO advanceMeasurementDTO : advanceMeasurementDTOs) {