From 89ff464e96416fc5a7a2441d9872ba53a14318d8 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Thu, 13 Sep 2012 17:52:37 +0200
Subject: [PATCH] Bug #1533: Fix date formats in reports

Date formate was not been localized in the reports, so it has been changed in
order to provide localized dates in the reports too (like in the rest of
LibrePlan UI).

FEA: ItEr77S04BugFixing
---
 .../dtos/TimeLineRequiredMaterialDTO.java     | 15 +++---------
 .../main/jasper/completedEstimatedHours.jrxml |  8 +++----
 .../jasper/costExpenseSheetLinesReport.jrxml  |  4 ++--
 .../jasper/costWorkReportLinesReport.jrxml    |  4 ++--
 .../hoursWorkedPerWorkerInAMonthReport.jrxml  |  4 ++--
 .../jasper/hoursWorkedPerWorkerReport.jrxml   | 16 ++++++-------
 .../jasper/orderCostsPerResourceReport.jrxml  | 12 +++++-----
 .../src/main/jasper/projectStatusReport.jrxml |  4 ++--
 .../schedulingProgressPerOrderReport.jrxml    | 16 ++++++-------
 .../jasper/timeLineRequiredMaterial.jrxml     | 22 ++++++++---------
 .../workingArrangementsPerOrderReport.jrxml   | 24 +++++++++----------
 .../jasper/workingProgressPerTaskReport.jrxml |  8 +++----
 12 files changed, 64 insertions(+), 73 deletions(-)

diff --git a/libreplan-business/src/main/java/org/libreplan/business/reports/dtos/TimeLineRequiredMaterialDTO.java b/libreplan-business/src/main/java/org/libreplan/business/reports/dtos/TimeLineRequiredMaterialDTO.java
index 095899fe5..5d1524fcc 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/reports/dtos/TimeLineRequiredMaterialDTO.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/reports/dtos/TimeLineRequiredMaterialDTO.java
@@ -22,7 +22,6 @@
 package org.libreplan.business.reports.dtos;
 
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 
 import org.libreplan.business.materials.entities.MaterialAssignment;
@@ -34,7 +33,7 @@ import org.libreplan.business.planner.entities.TaskElement;
  */
 public class TimeLineRequiredMaterialDTO{
 
-    private String date;
+    private Date date;
 
     private Date initDate;
 
@@ -98,22 +97,14 @@ public class TimeLineRequiredMaterialDTO{
         this.initDate = initDate;
     }
 
-    public String getDate() {
+    public Date getDate() {
         return date;
     }
 
-    public void setDate(String date) {
+    public void setDate(Date date) {
         this.date = date;
     }
 
-    private void setDate(Date newDate) {
-        if (newDate != null) {
-            this.date = (new SimpleDateFormat("dd/MM/yyyy")).format(newDate);
-        } else {
-            this.date = null;
-        }
-    }
-
     public String getStatus() {
         return status;
     }
diff --git a/libreplan-webapp/src/main/jasper/completedEstimatedHours.jrxml b/libreplan-webapp/src/main/jasper/completedEstimatedHours.jrxml
index 2d7318795..f684c0066 100644
--- a/libreplan-webapp/src/main/jasper/completedEstimatedHours.jrxml
+++ b/libreplan-webapp/src/main/jasper/completedEstimatedHours.jrxml
@@ -49,12 +49,12 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$R{reference}]]></textFieldExpression>
 			</textField>
-			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+			<textField isBlankWhenNull="true">
 				<reportElement uuid="131a41b5-524b-4e2a-984c-1f6d06d48857" x="142" y="92" width="164" height="20"/>
 				<textElement verticalAlignment="Middle">
 					<font size="10"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{referenceDate}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($P{referenceDate})]]></textFieldExpression>
 			</textField>
 			<rectangle>
 				<reportElement uuid="aba03b38-b33b-4a72-9876-f48129a5a248" mode="Opaque" x="24" y="173" width="473" height="15" forecolor="#000000" backcolor="#E0E4FB"/>
@@ -249,10 +249,10 @@
 	</columnFooter>
 	<pageFooter>
 		<band height="20" splitType="Stretch">
-			<textField pattern="EEEEE, dd MMMMM yyyy">
+			<textField>
 				<reportElement uuid="518e4f6a-3412-4a30-bb41-d7179b7ce963" x="0" y="0" width="197" height="20"/>
 				<textElement/>
-				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.LONG, $P{REPORT_LOCALE}).format(new Date())]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="8c6518a5-0cc6-461b-9a19-0881c29e5f03" x="431" y="0" width="43" height="20"/>
diff --git a/libreplan-webapp/src/main/jasper/costExpenseSheetLinesReport.jrxml b/libreplan-webapp/src/main/jasper/costExpenseSheetLinesReport.jrxml
index f322fd203..82c92b777 100644
--- a/libreplan-webapp/src/main/jasper/costExpenseSheetLinesReport.jrxml
+++ b/libreplan-webapp/src/main/jasper/costExpenseSheetLinesReport.jrxml
@@ -119,10 +119,10 @@
 	</columnHeader>
 	<detail>
 		<band height="17" splitType="Stretch">
-			<textField pattern="dd-MMM-yy" isBlankWhenNull="true">
+			<textField isBlankWhenNull="true">
 				<reportElement uuid="64c73662-737e-4ad4-b00b-c8a3e5fbc66f" x="2" y="0" width="91" height="14"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[$F{date}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($F{date})]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
 				<reportElement uuid="9b2b887d-8e7c-47b4-8a4f-a0568e550c64" x="93" y="0" width="168" height="14"/>
diff --git a/libreplan-webapp/src/main/jasper/costWorkReportLinesReport.jrxml b/libreplan-webapp/src/main/jasper/costWorkReportLinesReport.jrxml
index 402b77d2f..64b36ab8f 100644
--- a/libreplan-webapp/src/main/jasper/costWorkReportLinesReport.jrxml
+++ b/libreplan-webapp/src/main/jasper/costWorkReportLinesReport.jrxml
@@ -216,10 +216,10 @@
 					<textElement textAlignment="Right"/>
 					<textFieldExpression><![CDATA[$F{hoursType}]]></textFieldExpression>
 				</textField>
-				<textField pattern="dd-MMM-yy" isBlankWhenNull="true">
+				<textField isBlankWhenNull="true">
 					<reportElement uuid="5d4a5d09-35c7-4edc-86c1-4a070b75d339" x="1" y="0" width="95" height="14"/>
 					<textElement textAlignment="Right"/>
-					<textFieldExpression><![CDATA[$F{date}]]></textFieldExpression>
+				    <textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($F{date})]]></textFieldExpression>
 				</textField>
 			</band>
 		</groupFooter>
diff --git a/libreplan-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonthReport.jrxml b/libreplan-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonthReport.jrxml
index 13cb3dcf2..5616b919d 100644
--- a/libreplan-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonthReport.jrxml
+++ b/libreplan-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonthReport.jrxml
@@ -160,10 +160,10 @@
 	</columnFooter>
 	<pageFooter>
 		<band height="27" splitType="Stretch">
-			<textField pattern="EEEEE, dd MMMMM yyyy">
+			<textField>
 				<reportElement uuid="df0637bd-63c0-4bc1-9cd9-f5b0b7bf023d" x="0" y="0" width="197" height="20"/>
 				<textElement/>
-				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.LONG, $P{REPORT_LOCALE}).format(new Date())]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="7afb759e-5125-472c-b8cf-9fb93e374bbd" x="435" y="2" width="43" height="20"/>
diff --git a/libreplan-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml b/libreplan-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml
index 5646cfb34..5f629e634 100644
--- a/libreplan-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml
+++ b/libreplan-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml
@@ -74,12 +74,12 @@
 		<groupExpression><![CDATA[$F{date}]]></groupExpression>
 		<groupHeader>
 			<band height="44">
-				<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<textField isBlankWhenNull="true">
 					<reportElement uuid="0fc3ba78-e171-43b4-85c0-9e7d284cfd3b" x="2" y="4" width="178" height="20"/>
 					<textElement verticalAlignment="Middle">
 						<font size="11" isBold="false"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{date}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($F{date})]]></textFieldExpression>
 				</textField>
 				<textField>
 					<reportElement uuid="ee28ef5b-d1f4-4701-a895-b83997409f77" mode="Opaque" x="186" y="24" width="66" height="20" backcolor="#E0E4FB"/>
@@ -228,19 +228,19 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$R{date.end}]]></textFieldExpression>
 			</textField>
-			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+			<textField isBlankWhenNull="true">
 				<reportElement uuid="e0bb13eb-ad54-4054-b361-d34671a7f5bc" x="114" y="80" width="100" height="15"/>
 				<textElement>
 					<font size="10"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{startingDate}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($P{startingDate})]]></textFieldExpression>
 			</textField>
-			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+			<textField isBlankWhenNull="true">
 				<reportElement uuid="8569ba5a-13ba-43e4-b91c-be211c925331" x="308" y="80" width="100" height="15"/>
 				<textElement>
 					<font size="10"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{endingDate}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($P{endingDate})]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="8cb9e1bc-1f50-436f-b8c4-fb75be07af9c" x="13" y="144" width="540" height="15">
@@ -387,10 +387,10 @@
 	</columnFooter>
 	<pageFooter>
 		<band height="27" splitType="Stretch">
-			<textField pattern="EEEEE, dd MMMMM yyyy">
+			<textField>
 				<reportElement uuid="c5a8d393-6082-4342-a162-64466dcb1ce8" x="0" y="0" width="197" height="20"/>
 				<textElement/>
-				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.LONG, $P{REPORT_LOCALE}).format(new Date())]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="fce20fac-b51d-46ab-9cb7-d57cbeafe0f0" x="435" y="2" width="43" height="20"/>
diff --git a/libreplan-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml b/libreplan-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml
index db9e895ef..a149252cc 100644
--- a/libreplan-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml
+++ b/libreplan-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml
@@ -203,12 +203,12 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$R{date.start}]]></textFieldExpression>
 			</textField>
-			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+			<textField isBlankWhenNull="true">
 				<reportElement uuid="2097feeb-2937-4158-98ba-c34ec6170543" x="121" y="75" width="100" height="15"/>
 				<textElement>
 					<font size="10"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{startingDate}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($P{startingDate})]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="abd634a8-8e47-4d6d-b538-63ab67dc726e" x="221" y="75" width="95" height="15">
@@ -219,12 +219,12 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$R{date.end}]]></textFieldExpression>
 			</textField>
-			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+			<textField isBlankWhenNull="true">
 				<reportElement uuid="7346cf8f-6c97-433a-a446-0ab5e4ec0fba" x="316" y="75" width="100" height="15"/>
 				<textElement>
 					<font size="10"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{endingDate}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($P{endingDate})]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
 				<reportElement uuid="26a35250-4c3b-4862-b685-b757a28bbb44" x="2" y="92" width="60" height="15">
@@ -281,10 +281,10 @@
 	</columnFooter>
 	<pageFooter>
 		<band height="20" splitType="Stretch">
-			<textField pattern="EEEEE, dd MMMMM yyyy">
+			<textField>
 				<reportElement uuid="ca4a31d6-e6c9-4faf-9076-d12eaae02d37" x="0" y="0" width="197" height="20"/>
 				<textElement/>
-				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.LONG, $P{REPORT_LOCALE}).format(new Date())]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="abae8193-1bea-4afb-acf8-347902db9233" x="436" y="0" width="43" height="20"/>
diff --git a/libreplan-webapp/src/main/jasper/projectStatusReport.jrxml b/libreplan-webapp/src/main/jasper/projectStatusReport.jrxml
index 9e1e9f536..a0a48bbfe 100644
--- a/libreplan-webapp/src/main/jasper/projectStatusReport.jrxml
+++ b/libreplan-webapp/src/main/jasper/projectStatusReport.jrxml
@@ -196,12 +196,12 @@
 	</columnFooter>
 	<pageFooter>
 		<band height="10" splitType="Stretch">
-			<textField pattern="EEEEE, d MMMMM yyyy">
+			<textField>
 				<reportElement uuid="eb78d7c1-e94d-4306-b1a9-0a36d21891e5" x="0" y="0" width="272" height="10"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
-				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.LONG, $P{REPORT_LOCALE}).format(new Date())]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="bcb2143f-0026-4793-82b1-21fb6a2fa5f3" x="747" y="0" width="25" height="10"/>
diff --git a/libreplan-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml b/libreplan-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml
index d320826b9..94536b372 100644
--- a/libreplan-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml
+++ b/libreplan-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml
@@ -72,12 +72,12 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$R{date.reference}]]></textFieldExpression>
 			</textField>
-			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+			<textField isBlankWhenNull="true">
 				<reportElement uuid="7408bc4d-61c3-449b-897c-8da935cc8c85" x="132" y="116" width="100" height="20"/>
 				<textElement verticalAlignment="Middle">
 					<font size="10"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{referenceDate}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($P{referenceDate})]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="d581efb5-ca98-45e7-94ca-a0245e780f5f" x="1" y="136" width="131" height="20">
@@ -88,14 +88,14 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$R{date.start}]]></textFieldExpression>
 			</textField>
-			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+			<textField isBlankWhenNull="true">
 				<reportElement uuid="c01f71e6-3aad-4d86-94d9-21942c4cd1d2" x="132" y="136" width="100" height="20">
 					<printWhenExpression><![CDATA[new java.lang.Boolean($P{startingDate} != null)]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font size="10"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{startingDate}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($P{startingDate})]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="ff73d3fe-03d6-4897-a34f-25f3477c966c" x="2" y="156" width="130" height="20">
@@ -106,14 +106,14 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$R{date.end}]]></textFieldExpression>
 			</textField>
-			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+			<textField isBlankWhenNull="true">
 				<reportElement uuid="64cbfdb2-1075-4340-aaa4-7a310df33dfa" x="132" y="156" width="100" height="20">
 					<printWhenExpression><![CDATA[new java.lang.Boolean($P{endingDate} != null)]]></printWhenExpression>
 				</reportElement>
 				<textElement verticalAlignment="Middle">
 					<font size="10"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{endingDate}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($P{endingDate})]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="44ede877-7515-4869-b341-a52a162d3421" x="1" y="76" width="131" height="20"/>
@@ -570,10 +570,10 @@
 	</columnFooter>
 	<pageFooter>
 		<band height="23" splitType="Stretch">
-			<textField pattern="EEEEE, dd MMMMM yyyy">
+			<textField>
 				<reportElement uuid="df18e9fc-2afe-48a9-b436-42ae2a38f384" x="2" y="0" width="197" height="20"/>
 				<textElement/>
-				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.LONG, $P{REPORT_LOCALE}).format(new Date())]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="8bf22294-daff-47fe-b7d4-12a53ba0d94d" x="439" y="3" width="43" height="20"/>
diff --git a/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml b/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml
index 29e166927..91a501cd0 100644
--- a/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml
+++ b/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml
@@ -19,7 +19,7 @@
 	<field name="estimatedAvailability" class="java.util.Date"/>
 	<field name="order" class="java.lang.String"/>
 	<field name="task" class="java.lang.String"/>
-	<field name="date" class="java.lang.String"/>
+	<field name="date" class="java.util.Date"/>
 	<variable name="sumTotalPricePerDay" class="java.math.BigDecimal" resetType="Group" resetGroup="Date group" calculation="Sum">
 		<variableExpression><![CDATA[$F{totalPrice}]]></variableExpression>
 		<initialValueExpression><![CDATA[new java.math.BigDecimal(0)]]></initialValueExpression>
@@ -123,11 +123,11 @@
 					</textElement>
 					<textFieldExpression><![CDATA[$R{headers.title}]]></textFieldExpression>
 				</textField>
-				<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<textField isBlankWhenNull="true">
 					<reportElement uuid="f230bda0-19cf-47a2-803e-6248cfb4e08f" x="57" y="0" width="149" height="20"/>
 					<box leftPadding="0" rightPadding="0"/>
 					<textElement verticalAlignment="Middle"/>
-					<textFieldExpression><![CDATA[$F{date}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($F{date})]]></textFieldExpression>
 				</textField>
 				<textField>
 					<reportElement uuid="b48fdf0a-a61d-4f2d-80cd-361ee5a135e5" key="" mode="Opaque" x="455" y="24" width="65" height="32" forecolor="#666666" backcolor="#E0E4FB"/>
@@ -193,19 +193,19 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$R{date.end}]]></textFieldExpression>
 			</textField>
-			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+			<textField isBlankWhenNull="true">
 				<reportElement uuid="4b84ab4e-ce92-45bb-881a-b7588b1620f1" x="100" y="80" width="134" height="15"/>
 				<textElement>
 					<font size="10"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{startingDate}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($P{startingDate})]]></textFieldExpression>
 			</textField>
-			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+			<textField isBlankWhenNull="true">
 				<reportElement uuid="d6be7d53-90b9-4c45-868f-342961e6a93b" x="332" y="80" width="148" height="15"/>
 				<textElement>
 					<font size="10"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{endingDate}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($P{endingDate})]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
 				<reportElement uuid="bc3d11a6-d7f2-4af7-a8ca-7b904c503fb1" x="100" y="99" width="134" height="15"/>
@@ -324,7 +324,7 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{status}]]></textFieldExpression>
 			</textField>
-			<textField pattern="dd/MM/yy" isBlankWhenNull="true">
+			<textField isBlankWhenNull="true">
 				<reportElement uuid="7a8c15a8-a27b-4955-8816-2037c846aa72" x="250" y="0" width="90" height="73"/>
 				<box>
 					<pen lineWidth="1.0"/>
@@ -334,7 +334,7 @@
 					<rightPen lineWidth="1.0"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{estimatedAvailability}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($F{estimatedAvailability})]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
 				<reportElement uuid="605bfbbe-c420-40f3-bd78-4b985eb1c835" x="119" y="0" width="131" height="40"/>
@@ -375,10 +375,10 @@
 				<textElement/>
 				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
-			<textField pattern="EEEEE, dd MMMMM yyyy">
+			<textField>
 				<reportElement uuid="884cb129-cbb3-482e-a653-e10cdd1de3a9" x="0" y="0" width="197" height="20"/>
 				<textElement/>
-				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.LONG, $P{REPORT_LOCALE}).format(new Date())]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="62d229b2-62ce-4335-9e45-df5cbef7f852" x="446" y="0" width="43" height="20"/>
diff --git a/libreplan-webapp/src/main/jasper/workingArrangementsPerOrderReport.jrxml b/libreplan-webapp/src/main/jasper/workingArrangementsPerOrderReport.jrxml
index 220adcbd4..1b89deaba 100644
--- a/libreplan-webapp/src/main/jasper/workingArrangementsPerOrderReport.jrxml
+++ b/libreplan-webapp/src/main/jasper/workingArrangementsPerOrderReport.jrxml
@@ -175,7 +175,7 @@
 					</textElement>
 					<textFieldExpression><![CDATA[$F{orderName}]]></textFieldExpression>
 				</textField>
-				<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<textField isBlankWhenNull="true">
 					<reportElement uuid="d94ebfa8-2b07-40bb-8c08-c73163247de3" x="1" y="56" width="70" height="15"/>
 					<box>
 						<pen lineWidth="1.0"/>
@@ -187,9 +187,9 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="9"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{estimatedStartingDate}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($F{estimatedStartingDate})]]></textFieldExpression>
 				</textField>
-				<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<textField isBlankWhenNull="true">
 					<reportElement uuid="656b0c4e-4b62-4b04-abfe-f9dbc3b215b1" x="71" y="56" width="80" height="15"/>
 					<box>
 						<pen lineWidth="1.0"/>
@@ -201,9 +201,9 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="9"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{firstWorkReportDate}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($F{firstWorkReportDate})]]></textFieldExpression>
 				</textField>
-				<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<textField isBlankWhenNull="true">
 					<reportElement uuid="dff4b9a4-5050-479e-90bd-1de194a37644" x="151" y="56" width="75" height="15"/>
 					<box>
 						<pen lineWidth="1.0"/>
@@ -215,9 +215,9 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="9"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{estimatedEndingDate}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($F{estimatedEndingDate})]]></textFieldExpression>
 				</textField>
-				<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<textField isBlankWhenNull="true">
 					<reportElement uuid="ab9c951d-2e05-4f1c-8111-aeed45c04c3c" x="226" y="56" width="75" height="15"/>
 					<box>
 						<pen lineWidth="1.0"/>
@@ -229,9 +229,9 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="9"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{lastWorkReportDate}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($F{lastWorkReportDate})]]></textFieldExpression>
 				</textField>
-				<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<textField isBlankWhenNull="true">
 					<reportElement uuid="346cce6c-34ad-4ff6-8ac2-659ec8a0412f" x="301" y="56" width="74" height="15"/>
 					<box>
 						<pen lineWidth="1.0"/>
@@ -243,7 +243,7 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="9"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{deadline}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($F{deadline})]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
 					<reportElement uuid="c33157ba-504b-4400-9f28-6d0c38a86960" x="375" y="56" width="60" height="15"/>
@@ -566,10 +566,10 @@
 	</columnFooter>
 	<pageFooter>
 		<band height="20" splitType="Stretch">
-			<textField pattern="EEEEE, dd MMMMM yyyy">
+			<textField>
 				<reportElement uuid="e50e451b-3508-4734-ae8f-0be33a7d6708" x="5" y="0" width="197" height="20"/>
 				<textElement/>
-				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.LONG, $P{REPORT_LOCALE}).format(new Date())]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="341621c2-d6ab-490f-8097-13124b60c6ce" x="435" y="0" width="43" height="20"/>
diff --git a/libreplan-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml b/libreplan-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml
index 93931aba4..788b4f225 100644
--- a/libreplan-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml
+++ b/libreplan-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml
@@ -40,12 +40,12 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$R{reference}]]></textFieldExpression>
 			</textField>
-			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+			<textField isBlankWhenNull="true">
 				<reportElement uuid="533d7d79-c7bf-4029-9f34-0a19c001c7d0" x="151" y="96" width="155" height="20"/>
 				<textElement verticalAlignment="Middle">
 					<font size="10"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{referenceDate}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.SHORT, $P{REPORT_LOCALE}).format($P{referenceDate})]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="5b0384ad-a232-4e09-be8c-110ac8cdaa72" mode="Transparent" x="1" y="76" width="150" height="20" backcolor="#FFFFFF"/>
@@ -476,10 +476,10 @@
 	</columnFooter>
 	<pageFooter>
 		<band height="20" splitType="Stretch">
-			<textField pattern="EEEEE, dd MMMMM yyyy">
+			<textField>
 				<reportElement uuid="0d1c8db1-a135-45d0-b495-480fe9b86dbb" x="0" y="0" width="197" height="20"/>
 				<textElement/>
-				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.LONG, $P{REPORT_LOCALE}).format(new Date())]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="e38f3c3d-cd65-4fbf-94dd-06a09ba8eb9a" x="477" y="0" width="15" height="20"/>