diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java index 8c5503fd4..bd19eac50 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java @@ -212,7 +212,7 @@ public class SubcontractedTasksModel implements ISubcontractedTasksModel { private void makeSubcontractRequestRequest_UpdateDeliverDate(SubcontractedTaskData subcontractedTaskData) throws ConnectionProblemsException, UnrecoverableErrorServiceException { UpdateDeliveringDateDTO updateDeliveringDateDTO = SubcontractedTaskDataConverter - .toUpdateDeliveringDateDTO(subcontractedTaskData); + .toUpdateDeliveringDateDTO(getCompanyCode(), subcontractedTaskData); ExternalCompany externalCompany = subcontractedTaskData .getExternalCompany(); @@ -384,7 +384,7 @@ public class SubcontractedTasksModel implements ISubcontractedTasksModel { public String exportXML_UpdateSubcontractor(SubcontractedTaskData subcontractedTaskData){ subcontractedTaskDataDAO.reattachUnmodifiedEntity(subcontractedTaskData); UpdateDeliveringDateDTO updateDeliveringDateDTO = SubcontractedTaskDataConverter - .toUpdateDeliveringDateDTO(subcontractedTaskData); + .toUpdateDeliveringDateDTO(getCompanyCode(), subcontractedTaskData); StringWriter xml = new StringWriter(); try { diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractedTaskDataConverter.java b/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractedTaskDataConverter.java index 62a80f1aa..7ee6400e5 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractedTaskDataConverter.java +++ b/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractedTaskDataConverter.java @@ -51,15 +51,15 @@ public final class SubcontractedTaskDataConverter { toXmlDate(getDeliverDate(subcontractedTaskData))); } - public final static UpdateDeliveringDateDTO toUpdateDeliveringDateDTO(SubcontractedTaskData subTaskData){ + public final static UpdateDeliveringDateDTO toUpdateDeliveringDateDTO( + String companyCode, SubcontractedTaskData subTaskData) { String customerReference = subTaskData.getSubcontractedCode(); XMLGregorianCalendar deliverDate = toXmlDate(getDeliverDate(subTaskData)); if(!subTaskData.getRequiredDeliveringDates().isEmpty()){ deliverDate = toXmlDate(subTaskData.getRequiredDeliveringDates().first().getSubcontractorDeliverDate()); } - String companyNif = subTaskData.getExternalCompany().getNif(); String externalCode = subTaskData.getTask().getOrderElement().getCode(); - return new UpdateDeliveringDateDTO(customerReference, externalCode, companyNif,deliverDate); + return new UpdateDeliveringDateDTO(customerReference, externalCode, companyCode, deliverDate); } private final static XMLGregorianCalendar toXmlDate(Date date) {