diff --git a/navalplanner-webapp/pom.xml b/navalplanner-webapp/pom.xml
index 4ce081902..09ee66301 100644
--- a/navalplanner-webapp/pom.xml
+++ b/navalplanner-webapp/pom.xml
@@ -163,8 +163,8 @@
                 </executions>
             </plugin>
         </plugins>
-
     </build>
+
     <dependencies>
         <!-- Jasper Reports -->
         <dependency>
diff --git a/navalplanner-webapp/src/main/jasper/completedEstimatedHours.jrxml b/navalplanner-webapp/src/main/jasper/completedEstimatedHours.jrxml
index e588d564e..89ca99d9f 100644
--- a/navalplanner-webapp/src/main/jasper/completedEstimatedHours.jrxml
+++ b/navalplanner-webapp/src/main/jasper/completedEstimatedHours.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="report1" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="report1" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="completedEstimatedHours">
 	<style name="Title" isDefault="false" fontName="Arial" fontSize="26" isBold="true" pdfFontName="Helvetica-Bold"/>
 	<style name="SubTitle" isDefault="false" forecolor="#666666" fontName="Arial" fontSize="18"/>
 	<style name="Column header" isDefault="false" forecolor="#666666" fontName="Arial" fontSize="12" isBold="true"/>
@@ -19,39 +19,39 @@
 	</background>
 	<title>
 		<band height="167" splitType="Stretch">
-			<staticText>
+			<textField>
 				<reportElement style="Title" x="0" y="13" width="263" height="33"/>
-				<textElement verticalAlignment="Middle"/>
-				<text><![CDATA[Hours report]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="SubTitle" x="34" y="46" width="240" height="22">
+				<textElement verticalAlignment="Middle" markup="none"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{title}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="SubTitle" x="34" y="46" width="282" height="22">
 					<printWhenExpression><![CDATA[new java.lang.Boolean($P{referenceDate} != null)]]></printWhenExpression>
 				</reportElement>
-				<textElement/>
-				<text><![CDATA[Completed estimated hours]]></text>
-			</staticText>
+				<textElement markup="none"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{subtitle}]]></textFieldExpression>
+			</textField>
 			<image scaleImage="RealHeight">
 				<reportElement x="316" y="3" width="180" height="53"/>
 				<imageExpression class="java.lang.String"><![CDATA["logos/logo.png"]]></imageExpression>
 			</image>
-			<staticText>
-				<reportElement x="0" y="92" width="86" height="20"/>
-				<textElement verticalAlignment="Middle">
+			<textField>
+				<reportElement x="0" y="92" width="142" height="20"/>
+				<textElement verticalAlignment="Middle" markup="none">
 					<font isBold="true"/>
 				</textElement>
-				<text><![CDATA[Reference date:]]></text>
-			</staticText>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{reference}]]></textFieldExpression>
+			</textField>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement x="86" y="92" width="164" height="20"/>
+				<reportElement x="142" y="92" width="164" height="20"/>
 				<textElement verticalAlignment="Middle"/>
 				<textFieldExpression class="java.util.Date"><![CDATA[$P{referenceDate}]]></textFieldExpression>
 			</textField>
 			<rectangle>
-				<reportElement mode="Opaque" x="64" y="137" width="423" height="15" forecolor="#000000" backcolor="#E0E4FB"/>
+				<reportElement mode="Opaque" x="24" y="137" width="473" height="15" forecolor="#000000" backcolor="#E0E4FB"/>
 			</rectangle>
-			<staticText>
-				<reportElement style="Column header" x="287" y="137" width="100" height="15"/>
+			<textField>
+				<reportElement style="Column header" x="252" y="137" width="122" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -59,13 +59,13 @@
 					<bottomPen lineWidth="1.0"/>
 					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Top">
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
 					<font size="10" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Total hours]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" x="387" y="137" width="100" height="15"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column2}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="374" y="137" width="122" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -73,57 +73,13 @@
 					<bottomPen lineWidth="1.0"/>
 					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Top">
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
 					<font size="10" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Hours up to date]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" mode="Opaque" x="287" y="152" width="50" height="15"/>
-				<box>
-					<pen lineWidth="1.0"/>
-					<leftPen lineWidth="1.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="9" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Estimated]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" x="337" y="152" width="50" height="15"/>
-				<box>
-					<pen lineWidth="1.0"/>
-					<leftPen lineWidth="1.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="9" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Planned]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" x="387" y="152" width="50" height="15"/>
-				<box>
-					<pen lineWidth="1.0"/>
-					<leftPen lineWidth="1.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="9" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Planned]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" x="437" y="152" width="50" height="15"/>
-				<box>
-					<pen lineWidth="1.0"/>
-					<leftPen lineWidth="1.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="9" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Real]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" x="64" y="152" width="223" height="15"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column3}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" mode="Opaque" x="252" y="152" width="57" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -131,20 +87,76 @@
 					<bottomPen lineWidth="1.0"/>
 					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Top">
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
+					<font size="9" isBold="true"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column2.column1}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="309" y="152" width="65" height="15"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
+					<font size="9" isBold="true"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column2.column2}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="374" y="152" width="57" height="15"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
+					<font size="9" isBold="true"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column2.column1}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="431" y="152" width="65" height="15"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
+					<font size="9" isBold="true"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column2.column2}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="24" y="152" width="228" height="15"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
 					<font size="10" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Name]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="0" y="72" width="86" height="20"/>
-				<textElement verticalAlignment="Middle">
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column1}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="0" y="72" width="142" height="20"/>
+				<textElement verticalAlignment="Middle" markup="none">
 					<font isBold="true"/>
 				</textElement>
-				<text><![CDATA[Order:]]></text>
-			</staticText>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{order}]]></textFieldExpression>
+			</textField>
 			<textField>
-				<reportElement x="86" y="72" width="164" height="20"/>
+				<reportElement x="142" y="72" width="280" height="20"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.lang.String"><![CDATA[$P{orderName}]]></textFieldExpression>
 			</textField>
@@ -157,29 +169,29 @@
 		<band splitType="Stretch"/>
 	</columnHeader>
 	<detail>
-		<band height="36" splitType="Stretch">
+		<band height="38" splitType="Stretch">
 			<textField isBlankWhenNull="true">
-				<reportElement x="64" y="0" width="223" height="36"/>
+				<reportElement x="24" y="0" width="228" height="36"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{taskName}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="337" y="0" width="50" height="36"/>
+				<reportElement x="333" y="0" width="54" height="36"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.lang.Integer"><![CDATA[$F{totalPlannedHours}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="287" y="0" width="50" height="36"/>
+				<reportElement x="252" y="0" width="53" height="36"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.lang.Integer"><![CDATA[$F{estimatedHours}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="387" y="0" width="50" height="36"/>
+				<reportElement x="388" y="0" width="53" height="36"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.lang.Integer"><![CDATA[$F{partialPlannedHours}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="437" y="0" width="50" height="36"/>
+				<reportElement x="441" y="0" width="55" height="36"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.lang.Integer"><![CDATA[$F{realHours}]]></textFieldExpression>
 			</textField>
@@ -190,20 +202,6 @@
 	</columnFooter>
 	<pageFooter>
 		<band height="20" splitType="Stretch">
-			<textField>
-				<reportElement style="Column header" x="433" y="0" width="80" height="20"/>
-				<textElement textAlignment="Right">
-					<font size="10" isBold="false"/>
-				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["Page "+$V{PAGE_NUMBER}+" of"]]></textFieldExpression>
-			</textField>
-			<textField evaluationTime="Report">
-				<reportElement style="Column header" x="513" y="0" width="40" height="20"/>
-				<textElement>
-					<font size="10" isBold="false"/>
-				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
 			<textField pattern="EEEEE dd MMMMM yyyy">
 				<reportElement style="Column header" x="0" y="0" width="197" height="20"/>
 				<textElement>
@@ -211,6 +209,30 @@
 				</textElement>
 				<textFieldExpression class="java.util.Date"><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="431" y="0" width="43" height="20"/>
+				<textElement/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{page}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="494" y="0" width="15" height="20"/>
+				<textElement/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{of}]]></textFieldExpression>
+			</textField>
+			<textField evaluationTime="Report">
+				<reportElement style="Column header" x="511" y="0" width="38" height="20"/>
+				<textElement>
+					<font size="10" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.lang.Integer"><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="474" y="0" width="15" height="20"/>
+				<textElement textAlignment="Right">
+					<font size="10" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.lang.Integer"><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
 		</band>
 	</pageFooter>
 	<summary>
diff --git a/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours.properties b/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours.properties
new file mode 100644
index 000000000..79e5d8f69
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours.properties
@@ -0,0 +1,14 @@
+# Locale for completedEstimatedHours.jrxml
+title = Hours Report
+subtitle = Completed estimated hours
+order = Order :
+reference = Reference date :
+headers.column1 = Name
+headers.column2 = Total hours
+headers.column2.column1 = Estimated
+headers.column2.column2 = Planned
+headers.column3 = Hours up to date
+headers.column3.column1 = Planned
+headers.column3.column2 = Real
+page = page
+of = of
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_en_US.properties b/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_en_US.properties
new file mode 100644
index 000000000..79e5d8f69
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_en_US.properties
@@ -0,0 +1,14 @@
+# Locale for completedEstimatedHours.jrxml
+title = Hours Report
+subtitle = Completed estimated hours
+order = Order :
+reference = Reference date :
+headers.column1 = Name
+headers.column2 = Total hours
+headers.column2.column1 = Estimated
+headers.column2.column2 = Planned
+headers.column3 = Hours up to date
+headers.column3.column1 = Planned
+headers.column3.column2 = Real
+page = page
+of = of
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_es_ES.properties b/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_es_ES.properties
new file mode 100644
index 000000000..735a5d7d9
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_es_ES.properties
@@ -0,0 +1,14 @@
+# Locale for completedEstimatedHours.jrxml
+title = Informe de Horas
+subtitle = Horas estimadas completas
+order = Pedido :
+reference = Fecha de referencia :
+headers.column1 = Nombre
+headers.column2 = Horas Totales
+headers.column2.column1 = Estimadas
+headers.column2.column2 = Planificadas
+headers.column3 = Horas al dia
+headers.column3.column1 = Planificadas
+headers.column3.column2 = Reales
+page = página
+of = de
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_gl_ES.properties b/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_gl_ES.properties
new file mode 100644
index 000000000..d4b5255e6
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_gl_ES.properties
@@ -0,0 +1,14 @@
+# Locale for completedEstimatedHours.jrxml
+title = Informe de Horas
+subtitle = Horas estimadas completas
+order = Orde :
+reference = Data de referencia :
+headers.column1 = Nome
+headers.column2 = Horas Totais
+headers.column2.column1 = Estimadas
+headers.column2.column2 = Planificadas
+headers.column3 = Horas ó dia
+headers.column3.column1 = Planificadas
+headers.column3.column2 = Reais
+page = páxina
+of = de
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml
index 4cf7891b0..2337dec38 100644
--- a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml
+++ b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="hoursWorkedPerWorker" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="hoursWorkedPerWorker" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="hoursWorkedPerWorker">
 	<style name="Title" isDefault="false" fontName="Arial" fontSize="26" isBold="true" pdfFontName="Helvetica-Bold"/>
 	<style name="SubTitle" isDefault="false" forecolor="#666666" fontName="Arial" fontSize="18"/>
 	<style name="Column header" isDefault="false" forecolor="#666666" fontName="Arial" fontSize="12" isBold="true"/>
@@ -26,7 +26,7 @@
 		<groupExpression><![CDATA[$F{workerName}]]></groupExpression>
 		<groupHeader>
 			<band height="22">
-				<textField>
+				<textField isBlankWhenNull="true">
 					<reportElement x="0" y="0" width="551" height="20"/>
 					<textElement verticalAlignment="Middle">
 						<font size="12" isBold="true"/>
@@ -42,16 +42,16 @@
 			</band>
 		</groupHeader>
 		<groupFooter>
-			<band height="24">
-				<staticText>
-					<reportElement x="13" y="1" width="136" height="15"/>
-					<textElement verticalAlignment="Middle">
+			<band height="28">
+				<textField>
+					<reportElement x="83" y="1" width="174" height="15"/>
+					<textElement verticalAlignment="Middle" markup="none">
 						<font size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Total hours per worker:]]></text>
-				</staticText>
-				<textField>
-					<reportElement x="149" y="1" width="38" height="15"/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{total.worker}]]></textFieldExpression>
+				</textField>
+				<textField isBlankWhenNull="true">
+					<reportElement x="257" y="1" width="38" height="15"/>
 					<textElement textAlignment="Center" verticalAlignment="Top"/>
 					<textFieldExpression class="java.lang.Integer"><![CDATA[$V{sumHoursPerWorker}]]></textFieldExpression>
 				</textField>
@@ -68,15 +68,15 @@
 		<groupExpression><![CDATA[$F{date}]]></groupExpression>
 		<groupHeader>
 			<band height="45">
-				<textField pattern="dd/MM/yyyy" isBlankWhenNull="false">
+				<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
 					<reportElement x="13" y="4" width="178" height="20"/>
 					<textElement verticalAlignment="Middle">
 						<font size="11" isBold="false"/>
 					</textElement>
 					<textFieldExpression class="java.util.Date"><![CDATA[$F{date}]]></textFieldExpression>
 				</textField>
-				<staticText>
-					<reportElement style="Column header" mode="Opaque" x="83" y="24" width="66" height="20" backcolor="#E0E4FB"/>
+				<textField>
+					<reportElement style="Column header" mode="Opaque" x="186" y="24" width="66" height="20" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -84,13 +84,13 @@
 						<bottomPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
+					<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 						<font size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Hour end]]></text>
-				</staticText>
-				<staticText>
-					<reportElement style="Column header" mode="Opaque" x="411" y="24" width="144" height="20" backcolor="#E0E4FB"/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column2}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement style="Column header" mode="Opaque" x="424" y="24" width="135" height="20" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -98,13 +98,13 @@
 						<bottomPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
+					<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 						<font size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Labels]]></text>
-				</staticText>
-				<staticText>
-					<reportElement style="Column header" mode="Opaque" x="191" y="24" width="85" height="20" backcolor="#E0E4FB"/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column6}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement style="Column header" mode="Opaque" x="13" y="24" width="103" height="20" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -112,13 +112,13 @@
 						<bottomPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
+					<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 						<font size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Order code]]></text>
-				</staticText>
-				<staticText>
-					<reportElement style="Column header" mode="Opaque" x="13" y="24" width="70" height="20" backcolor="#E0E4FB"/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column4}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement style="Column header" mode="Opaque" x="116" y="24" width="70" height="20" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -126,13 +126,13 @@
 						<bottomPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
+					<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 						<font size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Hour start]]></text>
-				</staticText>
-				<staticText>
-					<reportElement style="Column header" mode="Opaque" x="276" y="24" width="135" height="20" backcolor="#E0E4FB"/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column1}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement style="Column header" mode="Opaque" x="294" y="24" width="130" height="20" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -140,13 +140,13 @@
 						<bottomPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
+					<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 						<font size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Text fields]]></text>
-				</staticText>
-				<staticText>
-					<reportElement style="Column header" mode="Opaque" x="149" y="24" width="42" height="20" backcolor="#E0E4FB"/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column5}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement style="Column header" mode="Opaque" x="252" y="24" width="42" height="20" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -154,29 +154,29 @@
 						<bottomPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
+					<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 						<font size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Hours]]></text>
-				</staticText>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column3}]]></textFieldExpression>
+				</textField>
 			</band>
 		</groupHeader>
 		<groupFooter>
 			<band height="28">
-				<staticText>
-					<reportElement x="31" y="10" width="118" height="15"/>
-					<textElement verticalAlignment="Middle">
+				<textField>
+					<reportElement x="84" y="10" width="149" height="15"/>
+					<textElement verticalAlignment="Middle" markup="none">
 						<font isBold="true"/>
 					</textElement>
-					<text><![CDATA[Total hours per day:]]></text>
-				</staticText>
-				<textField>
-					<reportElement x="149" y="10" width="38" height="15"/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{total.day}]]></textFieldExpression>
+				</textField>
+				<textField isBlankWhenNull="true">
+					<reportElement x="257" y="10" width="38" height="15"/>
 					<textElement textAlignment="Center" verticalAlignment="Top"/>
 					<textFieldExpression class="java.lang.Integer"><![CDATA[$V{sumHoursPerDay}]]></textFieldExpression>
 				</textField>
 				<line>
-					<reportElement x="149" y="6" width="35" height="1"/>
+					<reportElement x="257" y="6" width="35" height="1"/>
 				</line>
 			</band>
 		</groupFooter>
@@ -186,45 +186,45 @@
 	</background>
 	<title>
 		<band height="118" splitType="Stretch">
-			<staticText>
+			<textField>
 				<reportElement style="Title" x="0" y="13" width="263" height="33"/>
-				<textElement verticalAlignment="Middle"/>
-				<text><![CDATA[Work report]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="SubTitle" x="69" y="46" width="205" height="22"/>
-				<textElement/>
-				<text><![CDATA[Worked hours per worker]]></text>
-			</staticText>
+				<textElement verticalAlignment="Middle" markup="none"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{title}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="SubTitle" x="23" y="46" width="295" height="22"/>
+				<textElement markup="none"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{subtitle}]]></textFieldExpression>
+			</textField>
 			<image scaleImage="RetainShape">
 				<reportElement x="318" y="0" width="180" height="53"/>
 				<imageExpression class="java.lang.String"><![CDATA["logos/logo.png"]]></imageExpression>
 			</image>
-			<staticText>
-				<reportElement x="0" y="80" width="83" height="15">
+			<textField>
+				<reportElement x="0" y="80" width="114" height="15">
 					<printWhenExpression><![CDATA[new java.lang.Boolean($P{startingDate} != null)]]></printWhenExpression>
 				</reportElement>
-				<textElement>
+				<textElement markup="none">
 					<font isBold="true"/>
 				</textElement>
-				<text><![CDATA[Starting date:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="183" y="80" width="80" height="15">
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{date.start}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="214" y="80" width="94" height="15">
 					<printWhenExpression><![CDATA[new java.lang.Boolean($P{endingDate} != null)]]></printWhenExpression>
 				</reportElement>
-				<textElement>
+				<textElement markup="none">
 					<font isBold="true"/>
 				</textElement>
-				<text><![CDATA[Ending date:]]></text>
-			</staticText>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{date.end}]]></textFieldExpression>
+			</textField>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement x="83" y="80" width="100" height="15"/>
+				<reportElement x="114" y="80" width="100" height="15"/>
 				<textElement/>
 				<textFieldExpression class="java.util.Date"><![CDATA[$P{startingDate}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement x="263" y="80" width="100" height="15"/>
+				<reportElement x="308" y="80" width="100" height="15"/>
 				<textElement/>
 				<textFieldExpression class="java.util.Date"><![CDATA[$P{endingDate}]]></textFieldExpression>
 			</textField>
@@ -237,37 +237,37 @@
 		<band splitType="Stretch"/>
 	</columnHeader>
 	<detail>
-		<band height="16" splitType="Stretch">
+		<band height="15" splitType="Stretch">
 			<textField isBlankWhenNull="true">
-				<reportElement x="407" y="0" width="144" height="15"/>
+				<reportElement x="424" y="0" width="135" height="15"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{labels}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="272" y="0" width="135" height="15"/>
+				<reportElement x="294" y="0" width="130" height="15"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{descriptionValues}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="187" y="0" width="85" height="15"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{orderElementCode}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement x="149" y="0" width="38" height="15"/>
+				<reportElement x="252" y="0" width="42" height="15"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.lang.Integer"><![CDATA[$F{numHours}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="83" y="0" width="66" height="15"/>
+				<reportElement x="186" y="0" width="66" height="15"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.util.Date"><![CDATA[$F{clockFinish}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="13" y="0" width="70" height="15"/>
+				<reportElement x="116" y="0" width="70" height="15"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.util.Date"><![CDATA[$F{clockStart}]]></textFieldExpression>
 			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="13" y="0" width="103" height="15"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{orderElementCode}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<columnFooter>
@@ -275,20 +275,6 @@
 	</columnFooter>
 	<pageFooter>
 		<band height="27" splitType="Stretch">
-			<textField>
-				<reportElement style="Column header" x="433" y="0" width="80" height="20"/>
-				<textElement textAlignment="Right">
-					<font size="10" isBold="false"/>
-				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["Page "+$V{PAGE_NUMBER}+" of"]]></textFieldExpression>
-			</textField>
-			<textField evaluationTime="Report">
-				<reportElement style="Column header" x="513" y="0" width="40" height="20"/>
-				<textElement>
-					<font size="10" isBold="false"/>
-				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
 			<textField pattern="EEEEE dd MMMMM yyyy">
 				<reportElement style="Column header" x="0" y="0" width="197" height="20"/>
 				<textElement>
@@ -296,6 +282,30 @@
 				</textElement>
 				<textFieldExpression class="java.util.Date"><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="435" y="2" width="43" height="20"/>
+				<textElement/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{page}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="498" y="2" width="15" height="20"/>
+				<textElement/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{of}]]></textFieldExpression>
+			</textField>
+			<textField evaluationTime="Report">
+				<reportElement style="Column header" x="515" y="2" width="38" height="20"/>
+				<textElement>
+					<font size="10" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.lang.Integer"><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="478" y="2" width="15" height="20"/>
+				<textElement textAlignment="Right">
+					<font size="10" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.lang.Integer"><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
 		</band>
 	</pageFooter>
 	<summary>
diff --git a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker.properties b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker.properties
new file mode 100644
index 000000000..41fc0f445
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker.properties
@@ -0,0 +1,15 @@
+# Locale for hoursWorkedPerWorkerReport.jrxml
+title = Work report
+subtitle = Worked hours per worker
+date.start = Starting date :
+date.end = Ending date :
+headers.column1 = Hours start
+headers.column2 = Hours end
+headers.column3 = Hours
+headers.column4 = Order code
+headers.column5 = Text fields
+headers.column6 = Labels
+total.day = Total hours per day:
+total.worker = Total hours per worker:
+page = page
+of = of
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_en_US.properties b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_en_US.properties
new file mode 100644
index 000000000..793bfffa6
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_en_US.properties
@@ -0,0 +1,15 @@
+# Locale for hoursWorkedPerWorkerReport.jrxml
+title = Work report
+subtitle = Worked hours per worker
+date.start = Starting date:
+date.end = Ending date:
+headers.column1 = Hours start
+headers.column2 = Hours end
+headers.column3 = Hours
+headers.column4 = Order code
+headers.column5 = Text fields
+headers.column6 = Labels
+total.day = Total hours per day:
+total.worker = Total hours per worker:
+page = page
+of = of
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_es_ES.properties b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_es_ES.properties
new file mode 100644
index 000000000..1dc9b89dd
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_es_ES.properties
@@ -0,0 +1,15 @@
+# Locale for hoursWorkedPerWorkerReport.jrxml
+title = Informe de Trabajo
+subtitle = Horas trabajadas por empleado
+date.start = Fecha de inicio:
+date.end = Fecha de fin:
+headers.column1 = Horas inicio
+headers.column2 = Horas fin
+headers.column3 = Horas
+headers.column4 = Código Pedido
+headers.column5 = Campos de texto
+headers.column6 = Etiquetas
+total.day = Horas totales por dia:
+total.worker = Horas totales por empleado:
+page = página
+of = de
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_gl_ES.properties b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_gl_ES.properties
new file mode 100644
index 000000000..8c75d1081
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_gl_ES.properties
@@ -0,0 +1,15 @@
+# Locale for hoursWorkedPerWorkerReport.jrxml
+title = Informe de Traballo
+subtitle = Horas traballadas por empregado
+date.start = Data de inicio:
+date.end = Data de fin:
+headers.column1 = Horas inicio
+headers.column2 = Horas fin
+headers.column3 = Horas
+headers.column4 = Código orde
+headers.column5 = Campos de texto
+headers.column6 = Etiquetas
+total.day = Horas totais por dia:
+total.worker = Horas totais por empleado:
+page = páxina
+of = de
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml b/navalplanner-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml
index 6f86d8b4f..159dab1a1 100644
--- a/navalplanner-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml
+++ b/navalplanner-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="report1" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="report1" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="orderCostsPerResource">
 	<style name="Title" isDefault="false" fontName="Arial" fontSize="26" isBold="true" pdfFontName="Helvetica-Bold"/>
 	<style name="SubTitle" isDefault="false" forecolor="#666666" fontName="Arial" fontSize="18"/>
 	<style name="Column header" isDefault="false" forecolor="#666666" fontName="Arial" fontSize="12" isBold="true"/>
@@ -67,22 +67,22 @@
 		</groupHeader>
 		<groupFooter>
 			<band height="38">
-				<staticText>
-					<reportElement x="70" y="5" width="258" height="22"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
+				<textField>
+					<reportElement x="71" y="2" width="258" height="20"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
 						<font fontName="SansSerif" size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[ORDER TOTALS:]]></text>
-				</staticText>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{total}]]></textFieldExpression>
+				</textField>
 				<textField pattern="###0 h">
-					<reportElement x="328" y="5" width="93" height="22"/>
+					<reportElement x="329" y="2" width="93" height="20"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font fontName="SansSerif" isBold="true"/>
 					</textElement>
 					<textFieldExpression class="java.lang.Integer"><![CDATA[$V{sumTotalHours}]]></textFieldExpression>
 				</textField>
 				<textField pattern="###0.00 €;-###0.00 €">
-					<reportElement x="421" y="5" width="117" height="22"/>
+					<reportElement x="422" y="2" width="119" height="20"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font fontName="SansSerif" isBold="true"/>
 					</textElement>
@@ -108,23 +108,23 @@
 			</band>
 		</groupHeader>
 		<groupFooter>
-			<band height="31">
-				<staticText>
-					<reportElement x="70" y="9" width="258" height="20"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
+			<band height="23">
+				<textField>
+					<reportElement x="71" y="2" width="258" height="20"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
 						<font fontName="SansSerif" size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Totals per task:]]></text>
-				</staticText>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{total.task}]]></textFieldExpression>
+				</textField>
 				<textField pattern="###0 h">
-					<reportElement x="328" y="9" width="93" height="20"/>
+					<reportElement x="329" y="2" width="93" height="20"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font fontName="SansSerif"/>
 					</textElement>
 					<textFieldExpression class="java.lang.Integer"><![CDATA[$V{sumHoursPerTask}]]></textFieldExpression>
 				</textField>
 				<textField pattern="###0.00 €;-###0.00 €" isBlankWhenNull="true">
-					<reportElement x="421" y="9" width="118" height="20"/>
+					<reportElement x="422" y="2" width="119" height="20"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font fontName="SansSerif"/>
 					</textElement>
@@ -144,59 +144,87 @@
 					</textElement>
 					<textFieldExpression class="java.lang.String"><![CDATA[$F{workerName}]]></textFieldExpression>
 				</textField>
-				<staticText>
+				<textField>
 					<reportElement style="Column header" mode="Opaque" x="422" y="17" width="119" height="21" backcolor="#E0E4FB"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
+					<box>
+						<pen lineWidth="1.0"/>
+						<topPen lineWidth="1.0"/>
+						<leftPen lineWidth="1.0"/>
+						<bottomPen lineWidth="1.0"/>
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
 						<font fontName="SansSerif" size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Cost   ]]></text>
-				</staticText>
-				<staticText>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column4}]]></textFieldExpression>
+				</textField>
+				<textField>
 					<reportElement style="Column header" mode="Opaque" x="329" y="17" width="93" height="21" backcolor="#E0E4FB"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
+					<box>
+						<pen lineWidth="1.0"/>
+						<topPen lineWidth="1.0"/>
+						<leftPen lineWidth="1.0"/>
+						<bottomPen lineWidth="1.0"/>
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
 						<font fontName="SansSerif" size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Hours   ]]></text>
-				</staticText>
-				<staticText>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column3}]]></textFieldExpression>
+				</textField>
+				<textField>
 					<reportElement style="Column header" mode="Opaque" x="251" y="17" width="78" height="21" backcolor="#E0E4FB"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
+					<box>
+						<pen lineWidth="1.0"/>
+						<topPen lineWidth="1.0"/>
+						<leftPen lineWidth="1.0"/>
+						<bottomPen lineWidth="1.0"/>
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
 						<font fontName="SansSerif" size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Salary ]]></text>
-				</staticText>
-				<staticText>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column2}]]></textFieldExpression>
+				</textField>
+				<textField>
 					<reportElement style="Column header" mode="Opaque" x="71" y="17" width="180" height="21" backcolor="#E0E4FB"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
+					<box>
+						<pen lineWidth="1.0"/>
+						<topPen lineWidth="1.0"/>
+						<leftPen lineWidth="1.0"/>
+						<bottomPen lineWidth="1.0"/>
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
 						<font fontName="SansSerif" size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Type of hours ]]></text>
-				</staticText>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column1}]]></textFieldExpression>
+				</textField>
 			</band>
 		</groupHeader>
 		<groupFooter>
 			<band height="22">
 				<textField pattern="###0.00 €;-###0.00 €" isBlankWhenNull="true">
-					<reportElement x="422" y="2" width="118" height="20"/>
+					<reportElement x="422" y="2" width="119" height="20"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font fontName="SansSerif"/>
 					</textElement>
 					<textFieldExpression class="java.math.BigDecimal"><![CDATA[$V{sumCosts}]]></textFieldExpression>
 				</textField>
 				<textField pattern="###0 h">
-					<reportElement x="328" y="2" width="93" height="20"/>
+					<reportElement x="329" y="2" width="93" height="20"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font fontName="SansSerif"/>
 					</textElement>
 					<textFieldExpression class="java.lang.Integer"><![CDATA[$V{sumHoursPerWorker}]]></textFieldExpression>
 				</textField>
-				<staticText>
-					<reportElement x="70" y="2" width="258" height="20"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
+				<textField>
+					<reportElement x="71" y="2" width="258" height="20"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
 						<font fontName="SansSerif" isBold="false"/>
 					</textElement>
-					<text><![CDATA[Totals per worker:]]></text>
-				</staticText>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{total.worker}]]></textFieldExpression>
+				</textField>
 			</band>
 		</groupFooter>
 	</group>
@@ -206,30 +234,30 @@
 			<band/>
 		</groupHeader>
 		<groupFooter>
-			<band height="15">
+			<band height="19">
 				<textField pattern="###0 h">
-					<reportElement x="328" y="1" width="93" height="14"/>
+					<reportElement x="329" y="0" width="93" height="14"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font fontName="SansSerif"/>
 					</textElement>
 					<textFieldExpression class="java.lang.Integer"><![CDATA[$V{sumHoursPerWorkerandCost}]]></textFieldExpression>
 				</textField>
 				<textField pattern="###0.00 €;-###0.00 €" isBlankWhenNull="true">
-					<reportElement x="422" y="1" width="117" height="14"/>
+					<reportElement x="422" y="0" width="119" height="14"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font fontName="SansSerif"/>
 					</textElement>
 					<textFieldExpression class="java.math.BigDecimal"><![CDATA[$V{sumCostsPerWorkerandCost}]]></textFieldExpression>
 				</textField>
 				<textField pattern="###0.00 €/h;-###0.00 €/h" isBlankWhenNull="true">
-					<reportElement x="250" y="1" width="78" height="14"/>
+					<reportElement x="251" y="0" width="78" height="14"/>
 					<textElement textAlignment="Right">
 						<font fontName="SansSerif"/>
 					</textElement>
 					<textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{costPerHour}]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement x="70" y="1" width="180" height="14"/>
+					<reportElement x="71" y="0" width="180" height="14"/>
 					<textElement textAlignment="Right">
 						<font fontName="SansSerif"/>
 					</textElement>
@@ -243,47 +271,47 @@
 	</background>
 	<title>
 		<band height="96" splitType="Stretch">
-			<staticText>
-				<reportElement style="Title" x="0" y="13" width="263" height="33"/>
-				<textElement verticalAlignment="Middle">
+			<textField>
+				<reportElement style="Title" x="0" y="13" width="316" height="33"/>
+				<textElement verticalAlignment="Middle" markup="none">
 					<font fontName="SansSerif"/>
 				</textElement>
-				<text><![CDATA[Order report]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="SubTitle" x="23" y="46" width="240" height="29"/>
-				<textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{title}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="SubTitle" x="23" y="46" width="293" height="29"/>
+				<textElement markup="none">
 					<font fontName="SansSerif"/>
 				</textElement>
-				<text><![CDATA[Costs per Resource]]></text>
-			</staticText>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{subtitle}]]></textFieldExpression>
+			</textField>
 			<image scaleImage="RetainShape">
 				<reportElement x="316" y="0" width="180" height="53"/>
 				<imageExpression class="java.lang.String"><![CDATA["logos/logo.png"]]></imageExpression>
 			</image>
-			<staticText>
+			<textField>
 				<reportElement x="2" y="75" width="119" height="15">
 					<printWhenExpression><![CDATA[new java.lang.Boolean($P{startingDate} != null)]]></printWhenExpression>
 				</reportElement>
-				<textElement>
+				<textElement markup="none">
 					<font isBold="true"/>
 				</textElement>
-				<text><![CDATA[Starting date:]]></text>
-			</staticText>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{date.start}]]></textFieldExpression>
+			</textField>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
 				<reportElement x="121" y="75" width="100" height="15"/>
 				<textElement/>
 				<textFieldExpression class="java.util.Date"><![CDATA[$P{startingDate}]]></textFieldExpression>
 			</textField>
-			<staticText>
+			<textField>
 				<reportElement x="221" y="75" width="95" height="15">
 					<printWhenExpression><![CDATA[new java.lang.Boolean($P{endingDate} != null)]]></printWhenExpression>
 				</reportElement>
-				<textElement>
+				<textElement markup="none">
 					<font isBold="true"/>
 				</textElement>
-				<text><![CDATA[Ending date:]]></text>
-			</staticText>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{date.end}]]></textFieldExpression>
+			</textField>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
 				<reportElement x="316" y="75" width="100" height="15"/>
 				<textElement/>
@@ -312,20 +340,6 @@
 	</columnFooter>
 	<pageFooter>
 		<band height="20" splitType="Stretch">
-			<textField>
-				<reportElement style="Column header" x="433" y="0" width="80" height="20"/>
-				<textElement textAlignment="Right">
-					<font fontName="SansSerif" size="10" isBold="false"/>
-				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["Page "+$V{PAGE_NUMBER}+" of"]]></textFieldExpression>
-			</textField>
-			<textField evaluationTime="Report">
-				<reportElement style="Column header" x="513" y="0" width="40" height="20"/>
-				<textElement>
-					<font fontName="SansSerif" size="10" isBold="false"/>
-				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
 			<textField pattern="EEEEE dd MMMMM yyyy">
 				<reportElement style="Column header" x="0" y="0" width="197" height="20"/>
 				<textElement>
@@ -333,6 +347,30 @@
 				</textElement>
 				<textFieldExpression class="java.util.Date"><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="436" y="0" width="43" height="20"/>
+				<textElement/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{page}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="499" y="0" width="15" height="20"/>
+				<textElement/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{of}]]></textFieldExpression>
+			</textField>
+			<textField evaluationTime="Report">
+				<reportElement style="Column header" x="516" y="0" width="38" height="20"/>
+				<textElement>
+					<font size="10" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.lang.Integer"><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="479" y="0" width="15" height="20"/>
+				<textElement textAlignment="Right">
+					<font size="10" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.lang.Integer"><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
 		</band>
 	</pageFooter>
 	<summary>
diff --git a/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource.properties b/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource.properties
new file mode 100644
index 000000000..aacf254ec
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource.properties
@@ -0,0 +1,14 @@
+# Locale for ordersCostPerResourcesReport.jrxml
+title = Order report
+subtitle = Costs per Resource
+date.start = Starting date:
+date.end = Ending date:
+headers.column1 = Type of hours
+headers.column2 = Salary
+headers.column3 = Hours
+headers.column4 = Costs
+total.task = Total per day:
+total.worker = Total per worker:
+total = Order Total:
+page = page
+of = of
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_en_US.properties b/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_en_US.properties
new file mode 100644
index 000000000..aacf254ec
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_en_US.properties
@@ -0,0 +1,14 @@
+# Locale for ordersCostPerResourcesReport.jrxml
+title = Order report
+subtitle = Costs per Resource
+date.start = Starting date:
+date.end = Ending date:
+headers.column1 = Type of hours
+headers.column2 = Salary
+headers.column3 = Hours
+headers.column4 = Costs
+total.task = Total per day:
+total.worker = Total per worker:
+total = Order Total:
+page = page
+of = of
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_es_ES.properties b/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_es_ES.properties
new file mode 100644
index 000000000..1641ad886
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_es_ES.properties
@@ -0,0 +1,14 @@
+# Locale for ordersCostPerResourcesReport.jrxml
+title = Informe de pedido
+subtitle = Costes por Empleado
+date.start = Fecha de inicio:
+date.end = Fecha de fin:
+headers.column1 = Tipo de horas
+headers.column2 = Salario
+headers.column3 = Horas
+headers.column4 = Costes
+total.task = Total por dia:
+total.worker = Total por trabajador:
+total = Total por Pedido:
+page = página
+of = de
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_gl_ES.properties b/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_gl_ES.properties
new file mode 100644
index 000000000..6728d0153
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_gl_ES.properties
@@ -0,0 +1,14 @@
+# Locale for ordersCostPerResourcesReport.jrxml
+title = Informe da orde
+subtitle = Custos por Empregado
+date.start = Data de inicio:
+date.end = Data de fin:
+headers.column1 = Tipo de horas
+headers.column2 = Salario
+headers.column3 = Horas
+headers.column4 = Custos
+total.task = Total por dia:
+total.worker = Total por traballador:
+total = Total por orde:
+page = páxina
+of = de
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml b/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml
index 1b7bf8eba..9fd26dd2d 100644
--- a/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml
+++ b/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="report1" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="report1" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="schedulingProgressPerOrder">
 	<style name="Title" isDefault="false" fontName="Arial" fontSize="26" isBold="true" pdfFontName="Helvetica-Bold"/>
 	<style name="SubTitle" isDefault="false" forecolor="#666666" fontName="Arial" fontSize="18"/>
 	<style name="Column header" isDefault="false" forecolor="#666666" fontName="Arial" fontSize="12" isBold="true"/>
@@ -48,83 +48,83 @@
 				<reportElement x="316" y="3" width="180" height="53"/>
 				<imageExpression class="java.lang.String"><![CDATA["logos/logo.png"]]></imageExpression>
 			</image>
-			<staticText>
+			<textField>
 				<reportElement style="Title" x="0" y="13" width="263" height="33"/>
-				<textElement verticalAlignment="Middle"/>
-				<text><![CDATA[Progress report]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="SubTitle" x="34" y="46" width="252" height="22">
+				<textElement verticalAlignment="Middle" markup="none"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{title}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="SubTitle" x="10" y="46" width="306" height="22">
 					<printWhenExpression><![CDATA[new java.lang.Boolean($P{referenceDate} != null)]]></printWhenExpression>
 				</reportElement>
-				<textElement/>
-				<text><![CDATA[Scheduling progress per order]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="1" y="116" width="100" height="20"/>
-				<textElement verticalAlignment="Middle">
+				<textElement markup="none"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{subtitle}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="1" y="116" width="131" height="20"/>
+				<textElement verticalAlignment="Middle" markup="none">
 					<font isBold="true"/>
 				</textElement>
-				<text><![CDATA[Reference date:]]></text>
-			</staticText>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{date.reference}]]></textFieldExpression>
+			</textField>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement x="101" y="116" width="100" height="20"/>
+				<reportElement x="132" y="116" width="100" height="20"/>
 				<textElement verticalAlignment="Middle"/>
 				<textFieldExpression class="java.util.Date"><![CDATA[$P{referenceDate}]]></textFieldExpression>
 			</textField>
-			<staticText>
-				<reportElement x="1" y="136" width="100" height="20">
+			<textField>
+				<reportElement x="1" y="136" width="131" height="20">
 					<printWhenExpression><![CDATA[new java.lang.Boolean($P{startingDate} != null)]]></printWhenExpression>
 				</reportElement>
-				<textElement verticalAlignment="Middle">
+				<textElement verticalAlignment="Middle" markup="none">
 					<font isBold="true"/>
 				</textElement>
-				<text><![CDATA[Starting date:]]></text>
-			</staticText>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{date.start}]]></textFieldExpression>
+			</textField>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement x="101" y="136" width="100" height="20">
+				<reportElement x="132" y="136" width="100" height="20">
 					<printWhenExpression><![CDATA[new java.lang.Boolean($P{startingDate} != null)]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.util.Date"><![CDATA[$P{startingDate}]]></textFieldExpression>
 			</textField>
-			<staticText>
-				<reportElement x="201" y="136" width="85" height="20">
+			<textField>
+				<reportElement x="232" y="136" width="85" height="20">
 					<printWhenExpression><![CDATA[new java.lang.Boolean($P{endingDate} != null)]]></printWhenExpression>
 				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
+				<textElement textAlignment="Left" verticalAlignment="Middle" markup="none">
 					<font isBold="true"/>
 				</textElement>
-				<text><![CDATA[Ending date:]]></text>
-			</staticText>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{date.end}]]></textFieldExpression>
+			</textField>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement x="286" y="136" width="100" height="20">
+				<reportElement x="317" y="136" width="100" height="20">
 					<printWhenExpression><![CDATA[new java.lang.Boolean($P{endingDate} != null)]]></printWhenExpression>
 				</reportElement>
 				<textElement verticalAlignment="Middle"/>
 				<textFieldExpression class="java.util.Date"><![CDATA[$P{endingDate}]]></textFieldExpression>
 			</textField>
-			<staticText>
-				<reportElement x="1" y="76" width="100" height="20"/>
-				<textElement verticalAlignment="Middle">
+			<textField>
+				<reportElement x="1" y="76" width="131" height="20"/>
+				<textElement verticalAlignment="Middle" markup="none">
 					<font isBold="true"/>
 				</textElement>
-				<text><![CDATA[Advance type:]]></text>
-			</staticText>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{tipo}]]></textFieldExpression>
+			</textField>
 			<textField>
-				<reportElement x="101" y="76" width="281" height="20"/>
+				<reportElement x="132" y="76" width="281" height="20"/>
 				<textElement verticalAlignment="Middle"/>
 				<textFieldExpression class="java.lang.String"><![CDATA[$P{advanceType}]]></textFieldExpression>
 			</textField>
-			<staticText>
-				<reportElement x="1" y="96" width="100" height="20"/>
-				<textElement verticalAlignment="Middle">
+			<textField>
+				<reportElement x="1" y="96" width="131" height="20"/>
+				<textElement verticalAlignment="Middle" markup="none">
 					<font isBold="true"/>
 				</textElement>
-				<text><![CDATA[Orders:]]></text>
-			</staticText>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{order}]]></textFieldExpression>
+			</textField>
 			<textField>
-				<reportElement x="101" y="96" width="399" height="20"/>
+				<reportElement x="132" y="96" width="399" height="20"/>
 				<textElement verticalAlignment="Middle"/>
 				<textFieldExpression class="java.lang.String"><![CDATA[$P{orderName}]]></textFieldExpression>
 			</textField>
@@ -137,9 +137,9 @@
 		<band splitType="Stretch"/>
 	</columnHeader>
 	<detail>
-		<band height="169" splitType="Stretch">
+		<band height="194" splitType="Stretch">
 			<textField isBlankWhenNull="true">
-				<reportElement x="165" y="21" width="106" height="15"/>
+				<reportElement x="160" y="21" width="94" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -151,7 +151,7 @@
 				<textFieldExpression class="java.lang.Integer"><![CDATA[$F{estimatedHours}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="446" y="21" width="106" height="15"/>
+				<reportElement x="451" y="21" width="100" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -163,7 +163,7 @@
 				<textFieldExpression class="java.lang.Integer"><![CDATA[$F{partialPlannedHours}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="165" y="36" width="106" height="15"/>
+				<reportElement x="160" y="36" width="94" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -175,7 +175,7 @@
 				<textFieldExpression class="java.lang.Integer"><![CDATA[$F{totalPlannedHours}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="446" y="36" width="106" height="15"/>
+				<reportElement x="451" y="36" width="100" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -187,14 +187,14 @@
 				<textFieldExpression class="java.lang.Integer"><![CDATA[$F{realHours}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="0" y="1" width="450" height="16"/>
+				<reportElement x="-11" y="1" width="450" height="16"/>
 				<textElement textAlignment="Left" verticalAlignment="Bottom">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{orderName}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement x="165" y="91" width="106" height="20"/>
+				<reportElement x="160" y="91" width="94" height="20"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -206,7 +206,7 @@
 				<textFieldExpression class="java.lang.Double"><![CDATA[$F{plannedProgress}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="446" y="81" width="106" height="15"/>
+				<reportElement x="451" y="81" width="100" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -218,7 +218,7 @@
 				<textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{ratioCostDifference}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="446" y="96" width="106" height="15"/>
+				<reportElement x="451" y="96" width="100" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -230,7 +230,7 @@
 				<textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{ratioPlanningDifference}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement x="165" y="71" width="106" height="20"/>
+				<reportElement x="160" y="71" width="94" height="20"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -242,7 +242,7 @@
 				<textFieldExpression class="java.lang.Double"><![CDATA[$F{imputedProgress}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="446" y="66" width="106" height="15"/>
+				<reportElement x="451" y="66" width="100" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -254,7 +254,7 @@
 				<textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{planningDifference}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="446" y="51" width="106" height="15"/>
+				<reportElement x="451" y="51" width="100" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -265,8 +265,8 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{costDifference}]]></textFieldExpression>
 			</textField>
-			<staticText>
-				<reportElement style="Column header" mode="Opaque" x="0" y="21" width="85" height="30" backcolor="#E0E4FB"/>
+			<textField>
+				<reportElement style="Column header" mode="Opaque" x="0" y="21" width="80" height="30" backcolor="#E0E4FB"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -274,68 +274,13 @@
 					<bottomPen lineWidth="1.0"/>
 					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 					<font size="10" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Total hours]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" mode="Opaque" x="85" y="21" width="80" height="15"/>
-				<box>
-					<pen lineWidth="1.0"/>
-					<leftPen lineWidth="1.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="9" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Estimated]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" x="85" y="36" width="80" height="15"/>
-				<box>
-					<pen lineWidth="1.0"/>
-					<leftPen lineWidth="1.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="9" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Planned]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" x="85" y="51" width="80" height="20"/>
-				<box>
-					<pen lineWidth="1.0"/>
-					<leftPen lineWidth="1.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="9" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Measured]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" x="85" y="71" width="80" height="20"/>
-				<box>
-					<pen lineWidth="1.0"/>
-					<leftPen lineWidth="1.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="9" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Imputed]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" x="85" y="91" width="80" height="20"/>
-				<box>
-					<pen lineWidth="1.0"/>
-					<leftPen lineWidth="1.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="9" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Planned]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" mode="Opaque" x="276" y="21" width="85" height="30" backcolor="#E0E4FB"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column1}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" mode="Opaque" x="80" y="21" width="80" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -343,84 +288,172 @@
 					<bottomPen lineWidth="1.0"/>
 					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
+					<font size="9" isBold="true"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column1.column1}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="80" y="36" width="80" height="15"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
+					<font size="9" isBold="true"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column1.column2}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="80" y="51" width="80" height="20"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
+					<font size="9" isBold="true"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column2.column1}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="80" y="71" width="80" height="20"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
+					<font size="9" isBold="true"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column2.column2}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="80" y="91" width="80" height="20"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
+					<font size="9" isBold="true"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column2.column3}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" mode="Opaque" x="260" y="21" width="85" height="30" backcolor="#E0E4FB"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 					<font size="10" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Hours up to date]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" x="361" y="21" width="85" height="15"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column3}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="345" y="21" width="106" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 					<font size="9" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Planned]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" x="361" y="36" width="85" height="15"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column3.column1}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="345" y="36" width="106" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 					<font size="9" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Real]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" x="361" y="51" width="85" height="15"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column3.column2}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="345" y="51" width="106" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 					<font size="9" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Cost]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" x="361" y="66" width="85" height="15"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column4.column1}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="345" y="66" width="106" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 					<font size="9" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Planned]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" x="361" y="81" width="85" height="15"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column4.column2}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="345" y="81" width="106" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 					<font size="9" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Cost ratio]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" x="361" y="96" width="85" height="15"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column4.column3}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="345" y="96" width="106" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 					<font size="9" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Planned ratio]]></text>
-			</staticText>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column4.column4}]]></textFieldExpression>
+			</textField>
 			<line>
 				<reportElement x="0" y="17" width="552" height="1">
 					<printWhenExpression><![CDATA[new java.lang.Boolean($F{orderName} != null)]]></printWhenExpression>
 				</reportElement>
 			</line>
-			<staticText>
-				<reportElement style="Column header" mode="Opaque" x="0" y="51" width="85" height="60" backcolor="#E0E4FB"/>
+			<textField>
+				<reportElement style="Column header" mode="Opaque" x="0" y="51" width="80" height="60" backcolor="#E0E4FB"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -428,13 +461,13 @@
 					<bottomPen lineWidth="1.0"/>
 					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 					<font size="10" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Progress]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" mode="Opaque" x="276" y="51" width="85" height="60" backcolor="#E0E4FB"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column2}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" mode="Opaque" x="260" y="51" width="85" height="60" backcolor="#E0E4FB"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -442,13 +475,13 @@
 					<bottomPen lineWidth="1.0"/>
 					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 					<font size="10" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Difference]]></text>
-			</staticText>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column4}]]></textFieldExpression>
+			</textField>
 			<textField pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement x="165" y="51" width="106" height="20"/>
+				<reportElement x="160" y="51" width="94" height="20"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -460,7 +493,7 @@
 				<textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{averageProgress}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="271" y="51" width="5" height="20">
+				<reportElement x="254" y="51" width="5" height="20">
 					<printWhenExpression><![CDATA[new java.lang.Boolean($F{advanceTypeDoesNotApply}.equals(java.lang.Boolean.TRUE))]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
@@ -488,25 +521,32 @@
 				<text><![CDATA[*]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="553" y="96" width="5" height="15">
+				<reportElement x="552" y="96" width="5" height="15">
 					<printWhenExpression><![CDATA[new java.lang.Boolean($F{advanceTypeDoesNotApply}.equals(java.lang.Boolean.TRUE))]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<text><![CDATA[*]]></text>
 			</staticText>
-			<staticText>
-				<reportElement x="1" y="117" width="360" height="16">
+			<textField>
+				<reportElement x="10" y="117" width="360" height="16">
 					<printWhenExpression><![CDATA[($F{advanceTypeDoesNotApply}.equals(java.lang.Boolean.TRUE))]]></printWhenExpression>
 				</reportElement>
-				<textElement/>
-				<text><![CDATA[* Selected advance type is not available for this order.]]></text>
-			</staticText>
-			<staticText>
+				<textElement markup="none"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{note1}]]></textFieldExpression>
+			</textField>
+			<textField>
 				<reportElement x="2" y="133" width="359" height="16">
 					<printWhenExpression><![CDATA[($F{appliedSpreadAdvanceType}.equals(java.lang.Boolean.TRUE))]]></printWhenExpression>
 				</reportElement>
+				<textElement markup="none"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{note1}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="2" y="117" width="7" height="16">
+					<printWhenExpression><![CDATA[($F{advanceTypeDoesNotApply}.equals(java.lang.Boolean.TRUE))]]></printWhenExpression>
+				</reportElement>
 				<textElement/>
-				<text><![CDATA[Using the spread advance type.]]></text>
+				<text><![CDATA[*]]></text>
 			</staticText>
 		</band>
 	</detail>
@@ -515,27 +555,37 @@
 	</columnFooter>
 	<pageFooter>
 		<band height="23" splitType="Stretch">
-			<textField>
-				<reportElement style="Column header" x="433" y="0" width="80" height="20"/>
-				<textElement textAlignment="Right">
-					<font size="10" isBold="false"/>
-				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["Page "+$V{PAGE_NUMBER}+" of"]]></textFieldExpression>
-			</textField>
-			<textField evaluationTime="Report">
-				<reportElement style="Column header" x="513" y="0" width="40" height="20"/>
-				<textElement>
-					<font size="10" isBold="false"/>
-				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
 			<textField pattern="EEEEE dd MMMMM yyyy">
-				<reportElement style="Column header" x="0" y="0" width="197" height="20"/>
+				<reportElement style="Column header" x="2" y="0" width="197" height="20"/>
 				<textElement>
 					<font size="10" isBold="false"/>
 				</textElement>
 				<textFieldExpression class="java.util.Date"><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="439" y="3" width="43" height="20"/>
+				<textElement/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{page}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="502" y="3" width="15" height="20"/>
+				<textElement/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{of}]]></textFieldExpression>
+			</textField>
+			<textField evaluationTime="Report">
+				<reportElement style="Column header" x="519" y="3" width="38" height="20"/>
+				<textElement>
+					<font size="10" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.lang.Integer"><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="482" y="3" width="15" height="20"/>
+				<textElement textAlignment="Right">
+					<font size="10" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.lang.Integer"><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
 		</band>
 	</pageFooter>
 	<lastPageFooter>
diff --git a/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrder_Bundle/schedulingProgressPerOrder.properties b/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrder_Bundle/schedulingProgressPerOrder.properties
new file mode 100644
index 000000000..ac8dd6f14
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrder_Bundle/schedulingProgressPerOrder.properties
@@ -0,0 +1,27 @@
+# Locale for schedulingProgressPerOrderReport.jrxml
+title = Progress report
+subtitle = Scheduling progress per order
+tipo = Advance type:
+order = Order:
+date.start = Starting date.
+date.end = Ending date:
+date.reference = Reference date:
+headers.column1 = Total hours
+headers.column1.column1 = Estimated
+headers.column1.column2 = Planned
+headers.column2 = Progress
+headers.column2.column1 = Measured
+headers.column2.column2 = Imputed
+headers.column2.column3 = Planned
+headers.column3 = Hours up to date
+headers.column3.column1 = Planned
+headers.column3.column2 = Real
+headers.column4 = Difference
+headers.column4.column1 = Cost
+headers.column4.column2 = Planned
+headers.column4.column3 = Cost ratio
+headers.column4.column4 = Planned ratio
+note1 = Selected advance type is not available for this order.
+note2 = Using the spread advance type.
+page = page
+of = of
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrder_Bundle/schedulingProgressPerOrder_en_US.properties b/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrder_Bundle/schedulingProgressPerOrder_en_US.properties
new file mode 100644
index 000000000..3df91e2c9
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrder_Bundle/schedulingProgressPerOrder_en_US.properties
@@ -0,0 +1,27 @@
+# Locale for schedulingProgressPerOrderReport.jrxml
+title = Progress report
+subtitle = Scheduling progress per order
+tipo = Advance type:
+order = Order:
+date.start = Starting date:
+date.end = Ending date:
+date.reference = Reference date:
+headers.column1 = Total hours
+headers.column1.column1 = Estimated
+headers.column1.column2 = Planned
+headers.column2 = Progress
+headers.column2.column1 = Measured
+headers.column2.column2 = Imputed
+headers.column2.column3 = Planned
+headers.column3 = Hours up to date
+headers.column3.column1 = Planned
+headers.column3.column2 = Real
+headers.column4 = Difference
+headers.column4.column1 = Cost
+headers.column4.column2 = Planned
+headers.column4.column3 = Cost ratio
+headers.column4.column4 = Planned ratio
+note1 = Selected advance type is not available for this order.
+note2 = Using the spread advance type.
+page = page
+of = of
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrder_Bundle/schedulingProgressPerOrder_es_ES.properties b/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrder_Bundle/schedulingProgressPerOrder_es_ES.properties
new file mode 100644
index 000000000..be669c091
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrder_Bundle/schedulingProgressPerOrder_es_ES.properties
@@ -0,0 +1,27 @@
+# Locale for schedulingProgressPerOrderReport.jrxml
+title = Informe de Avance
+subtitle = Planificación del avance por pedido
+tipo = Tipo de avance:
+order = Pedido:
+date.start = Fecha inicio:
+date.end = Fecha fin:
+date.reference = Fecha de Referencia:
+headers.column1 = Horas Totales
+headers.column1.column1 = Estimadas
+headers.column1.column2 = Planificadas
+headers.column2 = Avance
+headers.column2.column1 = Calculado
+headers.column2.column2 = Registrado
+headers.column2.column3 = Planificado
+headers.column3 = Horas al dia
+headers.column3.column1 = Planificadas
+headers.column3.column2 = Reales
+headers.column4 = Diferencia
+headers.column4.column1 = Coste
+headers.column4.column2 = Planificada
+headers.column4.column3 = Proporción coste
+headers.column4.column4 = Proporción planificadas
+note1 = El tipo de avance seleccionado no esta disponible para este pedido.
+note2 = Se esta utilizando el tipo de avance propagado.
+page = página
+of = de
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrder_Bundle/schedulingProgressPerOrder_gl_ES.properties b/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrder_Bundle/schedulingProgressPerOrder_gl_ES.properties
new file mode 100644
index 000000000..c90d899f6
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrder_Bundle/schedulingProgressPerOrder_gl_ES.properties
@@ -0,0 +1,27 @@
+# Locale for schedulingProgressPerOrderReport.jrxml
+title = Informe de Avance
+subtitle = Planificación do avance por orde
+tipo = Tipo de avance:
+order = Orde:
+date.start = Data inicio:
+date.end = Data fin:
+date.reference = Data de Referencia:
+headers.column1 = Horas Totais
+headers.column1.column1 = Estimadas
+headers.column1.column2 = Planificadas
+headers.column2 = Avance
+headers.column2.column1 = Calculado
+headers.column2.column2 = Rexistrado
+headers.column2.column3 = Planificado
+headers.column3 = Horas ó dia
+headers.column3.column1 = Planificadas
+headers.column3.column2 = Reais
+headers.column4 = Diferencia
+headers.column4.column1 = Custo
+headers.column4.column2 = Planificada
+headers.column4.column3 = Proporción custo
+headers.column4.column4 = Proporción planificadas
+note1 = O tipo de avance seleccionado non está dispoñible para esta orde.
+note2 = Se esta a utilizar o tipo de avance propagado.
+page = páxina
+of = de
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml b/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml
index e8b63cebb..0f4962bcc 100644
--- a/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml
+++ b/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="timeLineRequiredMaterial" pageWidth="595" pageHeight="842" columnWidth="580" leftMargin="8" rightMargin="7" topMargin="20" bottomMargin="20">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="timeLineRequiredMaterial" pageWidth="595" pageHeight="842" columnWidth="580" leftMargin="8" rightMargin="7" topMargin="20" bottomMargin="20" resourceBundle="timeLineRequiredMaterial">
 	<style name="Column header" isDefault="false" forecolor="#666666" fontName="SansSerif" fontSize="12" isBold="true"/>
 	<style name="Detail" isDefault="false" fontName="SansSerif" fontSize="12"/>
 	<style name="Title" isDefault="false" fontSize="26"/>
@@ -24,9 +24,9 @@
 	<group name="Date group">
 		<groupExpression><![CDATA[$F{date}]]></groupExpression>
 		<groupHeader>
-			<band height="44">
-				<staticText>
-					<reportElement key="" style="Column header" mode="Opaque" x="0" y="24" width="119" height="20" backcolor="#E0E4FB"/>
+			<band height="56">
+				<textField>
+					<reportElement key="" style="Column header" mode="Opaque" x="0" y="24" width="119" height="32" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -34,13 +34,13 @@
 						<bottomPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
+					<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 						<font fontName="SansSerif" size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Material]]></text>
-				</staticText>
-				<staticText>
-					<reportElement style="Column header" mode="Opaque" x="367" y="24" width="66" height="20" backcolor="#E0E4FB"/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column1}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement style="Column header" mode="Opaque" x="390" y="24" width="65" height="32" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -48,13 +48,13 @@
 						<bottomPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
+					<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 						<font fontName="SansSerif" size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Unit price]]></text>
-				</staticText>
-				<staticText>
-					<reportElement key="" style="Column header" mode="Opaque" x="318" y="24" width="49" height="20" backcolor="#E0E4FB"/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column5}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement key="" style="Column header" mode="Opaque" x="340" y="24" width="50" height="32" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -62,13 +62,13 @@
 						<bottomPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
+					<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 						<font fontName="SansSerif" size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Units]]></text>
-				</staticText>
-				<staticText>
-					<reportElement key="" style="Column header" mode="Opaque" x="252" y="24" width="66" height="20" backcolor="#E0E4FB"/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column4}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement key="" style="Column header" mode="Opaque" x="250" y="24" width="90" height="32" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -76,13 +76,58 @@
 						<bottomPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
+					<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 						<font fontName="SansSerif" size="10"/>
 					</textElement>
-					<text><![CDATA[Availability ]]></text>
-				</staticText>
-				<staticText>
-					<reportElement key="" style="Column header" mode="Opaque" x="433" y="24" width="72" height="20" forecolor="#666666" backcolor="#E0E4FB"/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column3}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement key="" style="Column header" mode="Opaque" x="119" y="24" width="131" height="32" backcolor="#E0E4FB"/>
+					<box>
+						<pen lineWidth="1.0"/>
+						<topPen lineWidth="1.0"/>
+						<leftPen lineWidth="1.0"/>
+						<bottomPen lineWidth="1.0"/>
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
+						<font fontName="SansSerif" size="10" isBold="true"/>
+					</textElement>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column2}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement mode="Opaque" x="520" y="24" width="60" height="32" forecolor="#666666" backcolor="#E0E4FB">
+						<printWhenExpression><![CDATA[$P{status} == null]]></printWhenExpression>
+					</reportElement>
+					<box>
+						<pen lineWidth="1.0"/>
+						<topPen lineWidth="1.0"/>
+						<leftPen lineWidth="1.0"/>
+						<bottomPen lineWidth="1.0"/>
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
+						<font isBold="true"/>
+					</textElement>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column7}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="1" y="0" width="56" height="20">
+						<printWhenExpression><![CDATA[$F{date} != null]]></printWhenExpression>
+					</reportElement>
+					<textElement textAlignment="Left" verticalAlignment="Middle" markup="none">
+						<font isBold="true"/>
+					</textElement>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.title}]]></textFieldExpression>
+				</textField>
+				<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+					<reportElement x="57" y="0" width="149" height="20"/>
+					<box leftPadding="0" rightPadding="0"/>
+					<textElement verticalAlignment="Middle"/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$F{date}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement key="" style="Column header" mode="Opaque" x="455" y="24" width="65" height="32" forecolor="#666666" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -93,64 +138,19 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" lineSpacing="Single" markup="none">
 						<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfFontName="Helvetica" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					</textElement>
-					<text><![CDATA[Total price]]></text>
-				</staticText>
-				<staticText>
-					<reportElement key="" style="Column header" mode="Opaque" x="119" y="24" width="133" height="20" backcolor="#E0E4FB"/>
-					<box>
-						<pen lineWidth="1.0" lineColor="#666666"/>
-						<topPen lineWidth="1.0" lineColor="#666666"/>
-						<leftPen lineWidth="1.0" lineColor="#666666"/>
-						<bottomPen lineWidth="1.0" lineColor="#666666"/>
-						<rightPen lineWidth="1.0" lineColor="#666666"/>
-					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font fontName="SansSerif" size="10" isBold="true"/>
-					</textElement>
-					<text><![CDATA[Order - Task]]></text>
-				</staticText>
-				<staticText>
-					<reportElement mode="Opaque" x="505" y="24" width="75" height="20" forecolor="#666666" backcolor="#E0E4FB">
-						<printWhenExpression><![CDATA[$P{status} == null]]></printWhenExpression>
-					</reportElement>
-					<box>
-						<pen lineWidth="1.0"/>
-						<topPen lineWidth="1.0"/>
-						<leftPen lineWidth="1.0"/>
-						<bottomPen lineWidth="1.0"/>
-						<rightPen lineWidth="1.0"/>
-					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font isBold="true"/>
-					</textElement>
-					<text><![CDATA[Status]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="1" y="0" width="33" height="20">
-						<printWhenExpression><![CDATA[$F{date} != null]]></printWhenExpression>
-					</reportElement>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font isBold="true"/>
-					</textElement>
-					<text><![CDATA[Day :]]></text>
-				</staticText>
-				<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-					<reportElement x="34" y="0" width="100" height="20"/>
-					<box leftPadding="0" rightPadding="0"/>
-					<textElement verticalAlignment="Middle"/>
-					<textFieldExpression class="java.lang.String"><![CDATA[$F{date}]]></textFieldExpression>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column6}]]></textFieldExpression>
 				</textField>
 			</band>
 		</groupHeader>
 		<groupFooter>
 			<band height="78">
-				<staticText>
+				<textField>
 					<reportElement x="305" y="14" width="117" height="15"/>
-					<textElement verticalAlignment="Middle">
+					<textElement verticalAlignment="Middle" markup="none">
 						<font isBold="true"/>
 					</textElement>
-					<text><![CDATA[Total amount per day:]]></text>
-				</staticText>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.total}]]></textFieldExpression>
+				</textField>
 				<line>
 					<reportElement x="432" y="13" width="76" height="1"/>
 				</line>
@@ -171,60 +171,60 @@
 				<reportElement x="318" y="0" width="180" height="53"/>
 				<imageExpression class="java.lang.String"><![CDATA["logos/logo.png"]]></imageExpression>
 			</image>
-			<staticText>
-				<reportElement x="0" y="80" width="83" height="15">
+			<textField>
+				<reportElement x="0" y="80" width="100" height="15">
 					<printWhenExpression><![CDATA[new java.lang.Boolean($P{startingDate} != null)]]></printWhenExpression>
 				</reportElement>
-				<textElement>
+				<textElement markup="none">
 					<font isBold="true"/>
 				</textElement>
-				<text><![CDATA[Starting date:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="183" y="80" width="80" height="15">
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{date.start}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="234" y="80" width="98" height="15">
 					<printWhenExpression><![CDATA[new java.lang.Boolean($P{endingDate} != null)]]></printWhenExpression>
 				</reportElement>
-				<textElement>
+				<textElement markup="none">
 					<font isBold="true"/>
 				</textElement>
-				<text><![CDATA[Ending date:]]></text>
-			</staticText>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{date.end}]]></textFieldExpression>
+			</textField>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement x="83" y="80" width="100" height="15"/>
+				<reportElement x="100" y="80" width="134" height="15"/>
 				<textElement/>
 				<textFieldExpression class="java.util.Date"><![CDATA[$P{startingDate}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement x="263" y="80" width="100" height="15"/>
+				<reportElement x="332" y="80" width="148" height="15"/>
 				<textElement/>
 				<textFieldExpression class="java.util.Date"><![CDATA[$P{endingDate}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="83" y="99" width="100" height="15"/>
+				<reportElement x="100" y="99" width="134" height="15"/>
 				<textElement/>
 				<textFieldExpression class="java.lang.String"><![CDATA[$P{status}]]></textFieldExpression>
 			</textField>
-			<staticText>
-				<reportElement x="0" y="99" width="83" height="15">
+			<textField>
+				<reportElement x="0" y="99" width="100" height="15">
 					<printWhenExpression><![CDATA[new java.lang.Boolean($P{status} != null)]]></printWhenExpression>
 				</reportElement>
-				<textElement>
+				<textElement markup="none">
 					<font isBold="true"/>
 				</textElement>
-				<text><![CDATA[Status:]]></text>
-			</staticText>
-			<staticText>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{status}]]></textFieldExpression>
+			</textField>
+			<textField>
 				<reportElement style="Title" x="1" y="10" width="305" height="34"/>
-				<textElement/>
-				<text><![CDATA[Materials]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="58" y="48" width="247" height="32"/>
-				<textElement>
+				<textElement markup="none"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{title}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="1" y="48" width="317" height="32"/>
+				<textElement markup="none">
 					<font size="18"/>
 				</textElement>
-				<text><![CDATA[Time line of the materials]]></text>
-			</staticText>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{subtitle}]]></textFieldExpression>
+			</textField>
 		</band>
 	</title>
 	<pageHeader>
@@ -234,101 +234,118 @@
 		<band splitType="Stretch"/>
 	</columnHeader>
 	<detail>
-		<band height="74" splitType="Stretch">
+		<band height="121" splitType="Stretch">
 			<textField isBlankWhenNull="true">
-				<reportElement x="1" y="1" width="118" height="21"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{code}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement x="1" y="22" width="118" height="31"/>
+				<reportElement x="0" y="22" width="119" height="30"/>
+				<box>
+					<leftPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{name}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="319" y="1" width="48" height="72"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression class="java.lang.Double"><![CDATA[$F{units}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement x="368" y="1" width="65" height="72"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{unitPrice}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement x="434" y="1" width="71" height="72"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{totalPrice}]]></textFieldExpression>
-			</textField>
-			<textField pattern="dd/MM/yy" isBlankWhenNull="true">
-				<reportElement x="252" y="1" width="66" height="72"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression class="java.util.Date"><![CDATA[$F{estimatedAvailability}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement x="120" y="1" width="131" height="40"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{order}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement x="506" y="1" width="74" height="72">
-					<printWhenExpression><![CDATA[$P{status} == null]]></printWhenExpression>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{status}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement x="1" y="53" width="118" height="20"/>
+				<reportElement x="0" y="52" width="119" height="21"/>
+				<box>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{category}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="120" y="41" width="131" height="32"/>
+				<reportElement x="119" y="40" width="131" height="33"/>
+				<box>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{task}]]></textFieldExpression>
 			</textField>
-			<line>
-				<reportElement x="0" y="1" width="1" height="72"/>
-			</line>
-			<line>
-				<reportElement x="119" y="1" width="1" height="72"/>
-			</line>
-			<line>
-				<reportElement x="251" y="1" width="1" height="72"/>
-			</line>
-			<line>
-				<reportElement x="318" y="1" width="1" height="72"/>
-			</line>
-			<line>
-				<reportElement x="367" y="1" width="1" height="72"/>
-			</line>
-			<line>
-				<reportElement x="433" y="1" width="1" height="72"/>
-			</line>
-			<line>
-				<reportElement x="505" y="1" width="1" height="72"/>
-			</line>
-			<line>
-				<reportElement x="580" y="0" width="1" height="73">
+			<textField isBlankWhenNull="true">
+				<reportElement x="0" y="0" width="119" height="22"/>
+				<box>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{code}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="455" y="0" width="65" height="73"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{totalPrice}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="390" y="0" width="65" height="73"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{unitPrice}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="340" y="0" width="50" height="73"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{units}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="520" y="0" width="60" height="73">
 					<printWhenExpression><![CDATA[$P{status} == null]]></printWhenExpression>
 				</reportElement>
-			</line>
-			<line>
-				<reportElement x="0" y="0" width="506" height="1"/>
-			</line>
-			<line>
-				<reportElement x="0" y="73" width="506" height="1"/>
-			</line>
-			<line>
-				<reportElement x="506" y="0" width="74" height="1">
-					<printWhenExpression><![CDATA[$P{status} == null]]></printWhenExpression>
-				</reportElement>
-			</line>
-			<line>
-				<reportElement x="506" y="73" width="75" height="1">
-					<printWhenExpression><![CDATA[$P{status} == null]]></printWhenExpression>
-				</reportElement>
-			</line>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{status}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yy" isBlankWhenNull="true">
+				<reportElement x="250" y="0" width="90" height="73"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression class="java.util.Date"><![CDATA[$F{estimatedAvailability}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="119" y="0" width="131" height="40"/>
+				<box>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{order}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<columnFooter>
@@ -337,18 +354,18 @@
 	<pageFooter>
 		<band height="27" splitType="Stretch">
 			<textField>
-				<reportElement style="Column header" x="433" y="0" width="80" height="20"/>
+				<reportElement style="Column header" x="489" y="0" width="15" height="20"/>
 				<textElement textAlignment="Right">
 					<font size="10" isBold="false"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["Page "+$V{PAGE_NUMBER}+" of"]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Integer"><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report">
-				<reportElement style="Column header" x="513" y="0" width="40" height="20"/>
+				<reportElement style="Column header" x="526" y="0" width="38" height="20"/>
 				<textElement>
 					<font size="10" isBold="false"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Integer"><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<textField pattern="EEEEE dd MMMMM yyyy">
 				<reportElement style="Column header" x="0" y="0" width="197" height="20"/>
@@ -357,6 +374,16 @@
 				</textElement>
 				<textFieldExpression class="java.util.Date"><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="446" y="0" width="43" height="20"/>
+				<textElement/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{page}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="509" y="0" width="15" height="20"/>
+				<textElement/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{of}]]></textFieldExpression>
+			</textField>
 		</band>
 	</pageFooter>
 	<summary>
diff --git a/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/timeLineRequiredMaterial.properties b/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/timeLineRequiredMaterial.properties
new file mode 100644
index 000000000..f5c9491a0
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/timeLineRequiredMaterial.properties
@@ -0,0 +1,17 @@
+# Locale for timeLineRequiredMaterial.jrxml
+title = Materials
+subtitle = Time Line of the Materials
+date.start = Starting date:
+date.end = Ending date:
+status = Status:
+headers.title = Day
+headers.column1 = Material
+headers.column2 = Order - Task
+headers.column3 = Availability
+headers.column4 = Units
+headers.column5 = Unit price
+headers.column6 = Total price
+headers.column7 = Status
+headers.total = Total amount per:
+page = page
+of = of
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/timeLineRequiredMaterial_en_US.properties b/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/timeLineRequiredMaterial_en_US.properties
new file mode 100644
index 000000000..f5c9491a0
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/timeLineRequiredMaterial_en_US.properties
@@ -0,0 +1,17 @@
+# Locale for timeLineRequiredMaterial.jrxml
+title = Materials
+subtitle = Time Line of the Materials
+date.start = Starting date:
+date.end = Ending date:
+status = Status:
+headers.title = Day
+headers.column1 = Material
+headers.column2 = Order - Task
+headers.column3 = Availability
+headers.column4 = Units
+headers.column5 = Unit price
+headers.column6 = Total price
+headers.column7 = Status
+headers.total = Total amount per:
+page = page
+of = of
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/timeLineRequiredMaterial_es_ES.properties b/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/timeLineRequiredMaterial_es_ES.properties
new file mode 100644
index 000000000..5da8973c0
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/timeLineRequiredMaterial_es_ES.properties
@@ -0,0 +1,17 @@
+# Locale for timeLineRequiredMaterial.jrxml
+title = Materiales
+subtitle = L\u00EDnea temporal de los Materiales
+date.start = Fecha de inicio:
+date.end = Fecha de fin:
+status = Estado:
+headers.title = Dia
+headers.column1 = Material
+headers.column2 = Pedido - Tarea
+headers.column3 = Disponibilidad
+headers.column4 = Unidades
+headers.column5 = Precio unidad
+headers.column6 = Precio Total
+headers.column7 = Estado
+headers.total = Cantidad total por:
+page = página
+of = de
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/timeLineRequiredMaterial_gl_ES.properties b/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/timeLineRequiredMaterial_gl_ES.properties
new file mode 100644
index 000000000..3f8b21208
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/timeLineRequiredMaterial_gl_ES.properties
@@ -0,0 +1,17 @@
+# Locale for timeLineRequiredMaterial.jrxml
+title = Materiais
+subtitle = L\u00EDnea temporal dos Materiais
+date.start = Data de inicio:
+date.end = Data de fin:
+status = Estado:
+headers.title = Dia
+headers.column1 = Material
+headers.column2 = Orde - Tarea
+headers.column3 = Dispoñibilidade
+headers.column4 = Unidades
+headers.column5 = Precio unidade
+headers.column6 = Precio Total
+headers.column7 = Estado
+headers.total = Cantidade total por:
+page = páxina
+of = de
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrderReport.jasper b/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrderReport.jasper
new file mode 100644
index 000000000..322315f3b
Binary files /dev/null and b/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrderReport.jasper differ
diff --git a/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrderReport.jrxml b/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrderReport.jrxml
index 17245d888..bcebee6a5 100644
--- a/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrderReport.jrxml
+++ b/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrderReport.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="workingArrangementsPerOrder" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="workingArrangementsPerOrder" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="workingArrangementsPerOrder">
 	<style name="Title" isDefault="false" fontName="Arial" fontSize="26" isBold="true" pdfFontName="Helvetica-Bold"/>
 	<style name="SubTitle" isDefault="false" forecolor="#666666" fontName="Arial" fontSize="18"/>
 	<style name="Column header" isDefault="false" forecolor="#666666" fontName="Arial" fontSize="12" isBold="true"/>
@@ -24,8 +24,8 @@
 	<group name="Task group">
 		<groupExpression><![CDATA[$F{orderCode}]]></groupExpression>
 		<groupHeader>
-			<band height="106">
-				<staticText>
+			<band height="107">
+				<textField>
 					<reportElement style="Column header" mode="Opaque" x="301" y="41" width="74" height="15" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
@@ -34,12 +34,12 @@
 						<bottomPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
+					<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 						<font size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Deadline]]></text>
-				</staticText>
-				<staticText>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers1.column2.column3}]]></textFieldExpression>
+				</textField>
+				<textField>
 					<reportElement style="Column header" mode="Opaque" x="1" y="41" width="70" height="15" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
@@ -48,12 +48,12 @@
 						<bottomPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
+					<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 						<font size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Estimated]]></text>
-				</staticText>
-				<staticText>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers1.column1.column1}]]></textFieldExpression>
+				</textField>
+				<textField isBlankWhenNull="true">
 					<reportElement style="Column header" mode="Opaque" x="151" y="21" width="224" height="20" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
@@ -62,12 +62,12 @@
 						<bottomPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
+					<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 						<font size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Ending date]]></text>
-				</staticText>
-				<staticText>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers1.column2}]]></textFieldExpression>
+				</textField>
+				<textField>
 					<reportElement style="Column header" mode="Opaque" x="1" y="21" width="150" height="20" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
@@ -76,12 +76,12 @@
 						<bottomPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
+					<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 						<font size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Starting date]]></text>
-				</staticText>
-				<staticText>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers1.column1}]]></textFieldExpression>
+				</textField>
+				<textField>
 					<reportElement style="Column header" mode="Opaque" x="71" y="41" width="80" height="15" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
@@ -90,12 +90,12 @@
 						<bottomPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
+					<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 						<font size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[First report]]></text>
-				</staticText>
-				<staticText>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers1.column1.column2}]]></textFieldExpression>
+				</textField>
+				<textField>
 					<reportElement style="Column header" mode="Opaque" x="151" y="41" width="75" height="15" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
@@ -104,12 +104,12 @@
 						<bottomPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
+					<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 						<font size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Estimated]]></text>
-				</staticText>
-				<staticText>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers1.column2.column1}]]></textFieldExpression>
+				</textField>
+				<textField>
 					<reportElement style="Column header" mode="Opaque" x="226" y="41" width="75" height="15" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
@@ -118,12 +118,12 @@
 						<bottomPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
+					<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 						<font size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Last report]]></text>
-				</staticText>
-				<staticText>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers1.column2.column2}]]></textFieldExpression>
+				</textField>
+				<textField>
 					<reportElement style="Column header" mode="Opaque" x="375" y="21" width="60" height="35" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
@@ -132,12 +132,12 @@
 						<bottomPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
+					<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 						<font size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Progress]]></text>
-				</staticText>
-				<staticText>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers1.column2}]]></textFieldExpression>
+				</textField>
+				<textField>
 					<reportElement style="Column header" mode="Opaque" x="435" y="21" width="60" height="35" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
@@ -146,12 +146,12 @@
 						<bottomPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
+					<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 						<font size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Status]]></text>
-				</staticText>
-				<staticText>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers1.column4}]]></textFieldExpression>
+				</textField>
+				<textField>
 					<reportElement style="Column header" mode="Opaque" x="495" y="21" width="60" height="35" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
@@ -160,27 +160,41 @@
 						<bottomPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
+					<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 						<font size="10" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Deadline]]></text>
-				</staticText>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers1.column5}]]></textFieldExpression>
+				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement x="42" y="1" width="227" height="15"/>
+					<reportElement x="53" y="1" width="237" height="15"/>
 					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font size="11"/>
 					</textElement>
 					<textFieldExpression class="java.lang.String"><![CDATA[$F{orderName}]]></textFieldExpression>
 				</textField>
 				<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-					<reportElement x="1" y="56" width="75" height="15"/>
+					<reportElement x="1" y="56" width="70" height="15"/>
+					<box>
+						<pen lineWidth="1.0"/>
+						<topPen lineWidth="1.0"/>
+						<leftPen lineWidth="1.0"/>
+						<bottomPen lineWidth="1.0"/>
+						<rightPen lineWidth="1.0"/>
+					</box>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="9"/>
 					</textElement>
 					<textFieldExpression class="java.util.Date"><![CDATA[$F{estimatedStartingDate}]]></textFieldExpression>
 				</textField>
 				<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-					<reportElement x="76" y="56" width="75" height="15"/>
+					<reportElement x="71" y="56" width="80" height="15"/>
+					<box>
+						<pen lineWidth="1.0"/>
+						<topPen lineWidth="1.0"/>
+						<leftPen lineWidth="1.0"/>
+						<bottomPen lineWidth="1.0"/>
+						<rightPen lineWidth="1.0"/>
+					</box>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="9"/>
 					</textElement>
@@ -188,6 +202,13 @@
 				</textField>
 				<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
 					<reportElement x="151" y="56" width="75" height="15"/>
+					<box>
+						<pen lineWidth="1.0"/>
+						<topPen lineWidth="1.0"/>
+						<leftPen lineWidth="1.0"/>
+						<bottomPen lineWidth="1.0"/>
+						<rightPen lineWidth="1.0"/>
+					</box>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="9"/>
 					</textElement>
@@ -195,6 +216,13 @@
 				</textField>
 				<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
 					<reportElement x="226" y="56" width="75" height="15"/>
+					<box>
+						<pen lineWidth="1.0"/>
+						<topPen lineWidth="1.0"/>
+						<leftPen lineWidth="1.0"/>
+						<bottomPen lineWidth="1.0"/>
+						<rightPen lineWidth="1.0"/>
+					</box>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="9"/>
 					</textElement>
@@ -202,6 +230,13 @@
 				</textField>
 				<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
 					<reportElement x="301" y="56" width="74" height="15"/>
+					<box>
+						<pen lineWidth="1.0"/>
+						<topPen lineWidth="1.0"/>
+						<leftPen lineWidth="1.0"/>
+						<bottomPen lineWidth="1.0"/>
+						<rightPen lineWidth="1.0"/>
+					</box>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="9"/>
 					</textElement>
@@ -209,6 +244,13 @@
 				</textField>
 				<textField isBlankWhenNull="true">
 					<reportElement x="375" y="56" width="60" height="15"/>
+					<box>
+						<pen lineWidth="1.0"/>
+						<topPen lineWidth="1.0"/>
+						<leftPen lineWidth="1.0"/>
+						<bottomPen lineWidth="1.0"/>
+						<rightPen lineWidth="1.0"/>
+					</box>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="9"/>
 					</textElement>
@@ -216,105 +258,19 @@
 				</textField>
 				<textField isBlankWhenNull="true">
 					<reportElement x="435" y="56" width="60" height="15"/>
+					<box>
+						<pen lineWidth="1.0"/>
+						<topPen lineWidth="1.0"/>
+						<leftPen lineWidth="1.0"/>
+						<bottomPen lineWidth="1.0"/>
+						<rightPen lineWidth="1.0"/>
+					</box>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="9"/>
 					</textElement>
 					<textFieldExpression class="java.lang.String"><![CDATA[$F{status}]]></textFieldExpression>
 				</textField>
-				<staticText>
-					<reportElement x="495" y="56" width="60" height="15">
-						<printWhenExpression><![CDATA[new java.lang.Boolean(java.lang.Boolean.FALSE.equals($F{overrun}))]]></printWhenExpression>
-					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font size="9"/>
-					</textElement>
-					<text><![CDATA[In time]]></text>
-				</staticText>
-				<line>
-					<reportElement x="1" y="16" width="553" height="1"/>
-				</line>
-				<staticText>
-					<reportElement x="495" y="56" width="60" height="15">
-						<printWhenExpression><![CDATA[new java.lang.Boolean(java.lang.Boolean.TRUE.equals($F{overrun}))]]></printWhenExpression>
-					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font size="9"/>
-					</textElement>
-					<text><![CDATA[Overrun]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="1" y="1" width="40" height="15"/>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font size="11" isBold="true"/>
-					</textElement>
-					<text><![CDATA[Name:]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="269" y="0" width="40" height="15"/>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font size="11" isBold="true"/>
-					</textElement>
-					<text><![CDATA[Code:]]></text>
-				</staticText>
-				<textField isBlankWhenNull="true">
-					<reportElement x="309" y="0" width="246" height="15"/>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font size="11"/>
-					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$F{orderCode}]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement x="65" y="75" width="100" height="15">
-						<printWhenExpression><![CDATA[new java.lang.Boolean($F{hasDependencies}.equals(java.lang.Boolean.TRUE))]]></printWhenExpression>
-					</reportElement>
-					<textElement>
-						<font size="11" isBold="true"/>
-					</textElement>
-					<text><![CDATA[Dependencies]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="65" y="91" width="145" height="15">
-						<printWhenExpression><![CDATA[new java.lang.Boolean($F{hasDependencies}.equals(java.lang.Boolean.TRUE))]]></printWhenExpression>
-					</reportElement>
-					<box>
-						<pen lineWidth="1.0"/>
-						<topPen lineWidth="1.0"/>
-						<leftPen lineWidth="1.0"/>
-						<bottomPen lineWidth="1.0"/>
-						<rightPen lineWidth="1.0"/>
-					</box>
-					<textElement textAlignment="Center"/>
-					<text><![CDATA[Name]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="210" y="91" width="145" height="15">
-						<printWhenExpression><![CDATA[new java.lang.Boolean($F{hasDependencies}.equals(java.lang.Boolean.TRUE))]]></printWhenExpression>
-					</reportElement>
-					<box>
-						<pen lineWidth="1.0"/>
-						<topPen lineWidth="1.0"/>
-						<leftPen lineWidth="1.0"/>
-						<bottomPen lineWidth="1.0"/>
-						<rightPen lineWidth="1.0"/>
-					</box>
-					<textElement textAlignment="Center"/>
-					<text><![CDATA[Code]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="355" y="91" width="100" height="15">
-						<printWhenExpression><![CDATA[new java.lang.Boolean($F{hasDependencies}.equals(java.lang.Boolean.TRUE))]]></printWhenExpression>
-					</reportElement>
-					<box>
-						<pen lineWidth="1.0"/>
-						<topPen lineWidth="1.0"/>
-						<leftPen lineWidth="1.0"/>
-						<bottomPen lineWidth="1.0"/>
-						<rightPen lineWidth="1.0"/>
-					</box>
-					<textElement textAlignment="Center"/>
-					<text><![CDATA[Type]]></text>
-				</staticText>
-				<staticText>
+				<textField>
 					<reportElement x="455" y="91" width="100" height="15">
 						<printWhenExpression><![CDATA[new java.lang.Boolean($F{hasDependencies}.equals(java.lang.Boolean.TRUE))]]></printWhenExpression>
 					</reportElement>
@@ -325,9 +281,116 @@
 						<bottomPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Center"/>
-					<text><![CDATA[Progress]]></text>
-				</staticText>
+					<textElement textAlignment="Center" markup="none"/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers2.column4}]]></textFieldExpression>
+				</textField>
+				<line>
+					<reportElement x="1" y="16" width="553" height="1"/>
+				</line>
+				<textField>
+					<reportElement x="495" y="56" width="60" height="15">
+						<printWhenExpression><![CDATA[new java.lang.Boolean(java.lang.Boolean.TRUE.equals($F{overrun}))]]></printWhenExpression>
+					</reportElement>
+					<box>
+						<pen lineWidth="1.0"/>
+						<topPen lineWidth="1.0"/>
+						<leftPen lineWidth="1.0"/>
+						<bottomPen lineWidth="1.0"/>
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
+						<font size="9"/>
+					</textElement>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{overrun}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="1" y="1" width="52" height="15"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle" markup="none">
+						<font size="11" isBold="true"/>
+					</textElement>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{name}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="290" y="0" width="65" height="15"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle" markup="none">
+						<font size="11" isBold="true"/>
+					</textElement>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{code}]]></textFieldExpression>
+				</textField>
+				<textField isBlankWhenNull="true">
+					<reportElement x="355" y="0" width="198" height="15"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
+					<textFieldExpression class="java.lang.String"><![CDATA[$F{orderCode}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="65" y="75" width="100" height="15">
+						<printWhenExpression><![CDATA[new java.lang.Boolean($F{hasDependencies}.equals(java.lang.Boolean.TRUE))]]></printWhenExpression>
+					</reportElement>
+					<textElement markup="none">
+						<font size="11" isBold="true"/>
+					</textElement>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers2.title}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="65" y="91" width="145" height="15">
+						<printWhenExpression><![CDATA[new java.lang.Boolean($F{hasDependencies}.equals(java.lang.Boolean.TRUE))]]></printWhenExpression>
+					</reportElement>
+					<box>
+						<pen lineWidth="1.0"/>
+						<topPen lineWidth="1.0"/>
+						<leftPen lineWidth="1.0"/>
+						<bottomPen lineWidth="1.0"/>
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Center" markup="none"/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers2.column1}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="210" y="91" width="145" height="15">
+						<printWhenExpression><![CDATA[new java.lang.Boolean($F{hasDependencies}.equals(java.lang.Boolean.TRUE))]]></printWhenExpression>
+					</reportElement>
+					<box>
+						<pen lineWidth="1.0"/>
+						<topPen lineWidth="1.0"/>
+						<leftPen lineWidth="1.0"/>
+						<bottomPen lineWidth="1.0"/>
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Center" markup="none"/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers2.column2}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="355" y="91" width="100" height="15">
+						<printWhenExpression><![CDATA[new java.lang.Boolean($F{hasDependencies}.equals(java.lang.Boolean.TRUE))]]></printWhenExpression>
+					</reportElement>
+					<box>
+						<pen lineWidth="1.0"/>
+						<topPen lineWidth="1.0"/>
+						<leftPen lineWidth="1.0"/>
+						<bottomPen lineWidth="1.0"/>
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Center" markup="none"/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers2.column3}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="495" y="56" width="60" height="15">
+						<printWhenExpression><![CDATA[new java.lang.Boolean(java.lang.Boolean.FALSE.equals($F{overrun}))]]></printWhenExpression>
+					</reportElement>
+					<box>
+						<pen lineWidth="1.0"/>
+						<topPen lineWidth="1.0"/>
+						<leftPen lineWidth="1.0"/>
+						<bottomPen lineWidth="1.0"/>
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
+						<font size="9"/>
+					</textElement>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{intime}]]></textFieldExpression>
+				</textField>
 			</band>
 		</groupHeader>
 		<groupFooter>
@@ -345,41 +408,41 @@
 	</background>
 	<title>
 		<band height="124" splitType="Stretch">
-			<staticText>
+			<textField>
 				<reportElement style="Title" x="0" y="13" width="263" height="33"/>
-				<textElement verticalAlignment="Middle"/>
-				<text><![CDATA[Order report]]></text>
-			</staticText>
-			<staticText>
+				<textElement verticalAlignment="Middle" markup="none"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{title}]]></textFieldExpression>
+			</textField>
+			<textField>
 				<reportElement style="SubTitle" x="69" y="46" width="207" height="22"/>
-				<textElement/>
-				<text><![CDATA[Task scheduling status]]></text>
-			</staticText>
+				<textElement markup="none"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{subtitle}]]></textFieldExpression>
+			</textField>
 			<image scaleImage="RealHeight">
 				<reportElement x="318" y="0" width="180" height="53"/>
 				<imageExpression class="java.lang.String"><![CDATA["logos/logo.png"]]></imageExpression>
 			</image>
-			<staticText>
+			<textField>
 				<reportElement x="1" y="79" width="68" height="15"/>
-				<textElement textAlignment="Left">
+				<textElement textAlignment="Left" markup="none">
 					<font isBold="true"/>
 				</textElement>
-				<text><![CDATA[Order:]]></text>
-			</staticText>
-			<staticText>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{order}]]></textFieldExpression>
+			</textField>
+			<textField>
 				<reportElement x="1" y="95" width="68" height="15"/>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
+				<textElement textAlignment="Left" verticalAlignment="Middle" markup="none">
 					<font isBold="true"/>
 				</textElement>
-				<text><![CDATA[Status:]]></text>
-			</staticText>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{status}]]></textFieldExpression>
+			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="69" y="79" width="100" height="15"/>
+				<reportElement x="69" y="79" width="426" height="15"/>
 				<textElement/>
 				<textFieldExpression class="java.lang.String"><![CDATA[$P{orderName}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="69" y="95" width="100" height="15"/>
+				<reportElement x="69" y="95" width="200" height="15"/>
 				<textElement/>
 				<textFieldExpression class="java.lang.String"><![CDATA[$P{taskStatus}]]></textFieldExpression>
 			</textField>
@@ -392,24 +455,45 @@
 		<band splitType="Stretch"/>
 	</columnHeader>
 	<detail>
-		<band height="16" splitType="Stretch">
+		<band height="20" splitType="Stretch">
 			<printWhenExpression><![CDATA[new java.lang.Boolean($F{dependencyName} != null)]]></printWhenExpression>
 			<textField isBlankWhenNull="true">
-				<reportElement x="65" y="1" width="145" height="15"/>
+				<reportElement x="65" y="0" width="145" height="15"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="9"/>
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{dependencyName}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="210" y="1" width="145" height="15"/>
+				<reportElement x="210" y="0" width="145" height="15"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="9"/>
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{dependencyCode}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="355" y="1" width="100" height="15"/>
+				<reportElement x="355" y="0" width="100" height="15"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="9"/>
 				</textElement>
@@ -417,6 +501,13 @@
 			</textField>
 			<textField isBlankWhenNull="true">
 				<reportElement x="455" y="0" width="100" height="15"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="9"/>
 				</textElement>
@@ -425,31 +516,41 @@
 		</band>
 	</detail>
 	<columnFooter>
-		<band height="100" splitType="Stretch"/>
+		<band height="36" splitType="Stretch"/>
 	</columnFooter>
 	<pageFooter>
 		<band height="20" splitType="Stretch">
-			<textField>
-				<reportElement style="Column header" x="433" y="0" width="80" height="20"/>
-				<textElement textAlignment="Right">
-					<font size="10" isBold="false"/>
-				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["Page "+$V{PAGE_NUMBER}+" of"]]></textFieldExpression>
-			</textField>
-			<textField evaluationTime="Report">
-				<reportElement style="Column header" x="513" y="0" width="40" height="20"/>
-				<textElement>
-					<font size="10" isBold="false"/>
-				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
 			<textField pattern="EEEEE dd MMMMM yyyy">
-				<reportElement style="Column header" x="0" y="0" width="197" height="20"/>
+				<reportElement style="Column header" x="5" y="0" width="197" height="20"/>
 				<textElement>
 					<font size="10" isBold="false"/>
 				</textElement>
 				<textFieldExpression class="java.util.Date"><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="435" y="0" width="43" height="20"/>
+				<textElement/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{page}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="498" y="0" width="15" height="20"/>
+				<textElement/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{of}]]></textFieldExpression>
+			</textField>
+			<textField evaluationTime="Report">
+				<reportElement style="Column header" x="515" y="0" width="38" height="20"/>
+				<textElement>
+					<font size="10" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.lang.Integer"><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="478" y="0" width="15" height="20"/>
+				<textElement textAlignment="Right">
+					<font size="10" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.lang.Integer"><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
 		</band>
 	</pageFooter>
 	<summary>
diff --git a/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder.properties b/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder.properties
new file mode 100644
index 000000000..2d72cb952
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder.properties
@@ -0,0 +1,26 @@
+# Locale for workingArrangementPerOrderReport.jrxml
+title = Order report
+subtitle = Task scheduling status
+order = Order:
+status = Status:
+name = Name.
+code = Code:
+headers1.column1 = Starting date
+headers1.column1.column1 = Estimated
+headers1.column1.column2 = First report
+headers1.column2 = Ending date
+headers1.column2.column1 = Estimated
+headers1.column2.column2 = Last report
+headers1.column2.column3 = Deadline
+headers1.column3 = Progress
+headers1.column4 = Status
+headers1.column5 = Deadline
+headers2.title = Dependencies
+headers2.column1 = Name
+headers2.column2 = Code
+headers2.column3 = Type
+headers2.column4 = Progress
+overrun = overrun
+intime = In time
+page = page
+of = of
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_en_US.properties b/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_en_US.properties
new file mode 100644
index 000000000..60fb58492
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_en_US.properties
@@ -0,0 +1,26 @@
+# Locale for workingArrangementPerOrderReport.jrxml
+title = Order report
+subtitle = Task scheduling status
+order = Order:
+status = Status:
+name = Name:
+code = Code:
+headers1.column1 = Starting date
+headers1.column1.column1 = Estimated
+headers1.column1.column2 = First report
+headers1.column2 = Ending date
+headers1.column2.column1 = Estimated
+headers1.column2.column2 = Last report
+headers1.column2.column3 = Deadline
+headers1.column3 = Progress
+headers1.column4 = Status
+headers1.column5 = Deadline
+headers2.title = Dependencies
+headers2.column1 = Name
+headers2.column2 = Code
+headers2.column3 = Type
+headers2.column4 = Progress
+overrun = overrun
+intime = In time
+page = page
+of = of
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_es_ES.properties b/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_es_ES.properties
new file mode 100644
index 000000000..5247a43b8
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_es_ES.properties
@@ -0,0 +1,26 @@
+# Locale for workingArrangementPerOrderReport.jrxml
+title = Informe de Pedido
+subtitle = Estado de la planificación de la tarea
+order = Pedido:
+status = Estado:
+name = Nombre:
+code = Código:
+headers1.column1 = Fecha de inicio
+headers1.column1.column1 = Estimada
+headers1.column1.column2 = Primer informe
+headers1.column2 = Fecha de fin
+headers1.column2.column1 = Estimada
+headers1.column2.column2 = Último informe
+headers1.column2.column3 = Fecha limite
+headers1.column3 = Progreso
+headers1.column4 = Estado
+headers1.column5 = Fecha limite
+headers2.title = Dependencias
+headers2.column1 = Nombre
+headers2.column2 = Código
+headers2.column3 = Tipo
+headers2.column4 = Progreso
+overrun = sobrecoste
+intime = A tiempo
+page = página
+of = de
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_gl_ES.properties b/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_gl_ES.properties
new file mode 100644
index 000000000..beaa63131
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_gl_ES.properties
@@ -0,0 +1,26 @@
+# Locale for workingArrangementPerOrderReport.jrxml
+title = Informe de Pedido
+subtitle = Estado de la planificación de la tarea
+order = Orde:
+status = Estado:
+name = Nome:
+code = Código:
+headers1.column1 = Data de inicio
+headers1.column1.column1 = Estimada
+headers1.column1.column2 = Informe Primeiro
+headers1.column2 = Data final
+headers1.column2.column1 = Estimada
+headers1.column2.column2 = Último informe
+headers1.column2.column3 = Data limite
+headers1.column3 = Progreso
+headers1.column4 = Estado
+headers1.column5 = Data limite
+headers2.title = Dependencias
+headers2.column1 = Nome
+headers2.column2 = Código
+headers2.column3 = Tipo
+headers2.column4 = Progreso
+overrun = sobrecusto
+intime = A tempo
+page = páxina
+of = de
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml b/navalplanner-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml
index d0811b1c2..805c53d6a 100644
--- a/navalplanner-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml
+++ b/navalplanner-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="report1" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="report1" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="workingProgressPerTask">
 	<style name="Title" isDefault="false" fontName="Arial" fontSize="26" isBold="true" pdfFontName="Helvetica-Bold"/>
 	<style name="SubTitle" isDefault="false" forecolor="#666666" fontName="Arial" fontSize="18"/>
 	<style name="Column header" isDefault="false" forecolor="#666666" fontName="Arial" fontSize="12" isBold="true"/>
@@ -30,42 +30,42 @@
 				<reportElement x="316" y="3" width="180" height="53"/>
 				<imageExpression class="java.lang.String"><![CDATA["logos/logo.png"]]></imageExpression>
 			</image>
-			<staticText>
-				<reportElement x="1" y="96" width="85" height="20"/>
-				<textElement verticalAlignment="Middle">
+			<textField>
+				<reportElement x="1" y="96" width="150" height="20"/>
+				<textElement verticalAlignment="Middle" markup="none">
 					<font isBold="true"/>
 				</textElement>
-				<text><![CDATA[Reference date:]]></text>
-			</staticText>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{reference}]]></textFieldExpression>
+			</textField>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement x="86" y="96" width="100" height="20"/>
+				<reportElement x="151" y="96" width="155" height="20"/>
 				<textElement verticalAlignment="Middle"/>
 				<textFieldExpression class="java.util.Date"><![CDATA[$P{referenceDate}]]></textFieldExpression>
 			</textField>
-			<staticText>
-				<reportElement mode="Transparent" x="1" y="76" width="85" height="20" backcolor="#FFFFFF"/>
-				<textElement verticalAlignment="Middle">
+			<textField>
+				<reportElement mode="Transparent" x="1" y="76" width="150" height="20" backcolor="#FFFFFF"/>
+				<textElement verticalAlignment="Middle" markup="none">
 					<font isBold="true"/>
 				</textElement>
-				<text><![CDATA[Order:]]></text>
-			</staticText>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{order}]]></textFieldExpression>
+			</textField>
 			<textField>
-				<reportElement x="86" y="76" width="115" height="20"/>
+				<reportElement x="151" y="76" width="220" height="20"/>
 				<textElement verticalAlignment="Middle"/>
 				<textFieldExpression class="java.lang.String"><![CDATA[$P{orderName}]]></textFieldExpression>
 			</textField>
-			<staticText>
+			<textField>
 				<reportElement style="Title" x="0" y="13" width="263" height="33"/>
-				<textElement verticalAlignment="Middle"/>
-				<text><![CDATA[Progress report]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="SubTitle" x="34" y="46" width="229" height="22">
+				<textElement verticalAlignment="Middle" markup="none"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{title}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="SubTitle" x="58" y="46" width="238" height="22">
 					<printWhenExpression><![CDATA[new java.lang.Boolean($P{referenceDate} != null)]]></printWhenExpression>
 				</reportElement>
-				<textElement/>
-				<text><![CDATA[Working progress per task]]></text>
-			</staticText>
+				<textElement markup="none"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{subtitle}]]></textFieldExpression>
+			</textField>
 		</band>
 	</title>
 	<pageHeader>
@@ -75,42 +75,9 @@
 		<band splitType="Stretch"/>
 	</columnHeader>
 	<detail>
-		<band height="123" splitType="Stretch">
-			<staticText>
+		<band height="135" splitType="Stretch">
+			<textField>
 				<reportElement style="Column header" x="86" y="76" width="80" height="20"/>
-				<box>
-					<pen lineWidth="1.0"/>
-					<leftPen lineWidth="1.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="9" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Imputed]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" mode="Opaque" x="86" y="26" width="80" height="15"/>
-				<box>
-					<pen lineWidth="1.0"/>
-					<leftPen lineWidth="1.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="9" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Estimated]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" x="86" y="41" width="80" height="15"/>
-				<box>
-					<pen lineWidth="1.0"/>
-					<leftPen lineWidth="1.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="9" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Planned]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" mode="Opaque" x="1" y="26" width="85" height="30" backcolor="#E0E4FB"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -118,79 +85,139 @@
 					<bottomPen lineWidth="1.0"/>
 					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
+					<font size="9" isBold="true"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column2.column2}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" mode="Opaque" x="86" y="26" width="80" height="15"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
+					<font size="9" isBold="true"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column1.column1}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="86" y="41" width="80" height="15"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
+					<font size="9" isBold="true"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column1.column2}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" mode="Opaque" x="1" y="26" width="85" height="30" forecolor="#666666" backcolor="#E0E4FB"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 					<font size="10" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Total hours]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" x="362" y="56" width="80" height="15" backcolor="#FFFFFF"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column1}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="347" y="56" width="106" height="15" backcolor="#FFFFFF"/>
 				<box>
 					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 					<font size="9" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Cost]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" x="362" y="41" width="80" height="15"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column4.column1}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="347" y="41" width="106" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 					<font size="9" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Real]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" x="362" y="26" width="80" height="15"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column3.column2}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="347" y="26" width="106" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 					<font size="9" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Planned]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" x="362" y="71" width="80" height="15"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column3.column1}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="347" y="71" width="106" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 					<font size="9" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Planned]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" x="362" y="86" width="80" height="15"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column4.column2}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="347" y="86" width="106" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 					<font size="9" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Cost ratio]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" x="362" y="101" width="80" height="15"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column4.column3}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" x="347" y="101" width="106" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 					<font size="9" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Planned ratio]]></text>
-			</staticText>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column4.column4}]]></textFieldExpression>
+			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="442" y="26" width="112" height="15"/>
+				<reportElement x="453" y="26" width="100" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -202,7 +229,7 @@
 				<textFieldExpression class="java.lang.Integer"><![CDATA[$F{partialPlannedHours}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement x="442" y="101" width="112" height="15"/>
+				<reportElement x="453" y="101" width="100" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -214,7 +241,7 @@
 				<textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{ratioPlanningDifference}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="442" y="41" width="112" height="15"/>
+				<reportElement x="453" y="41" width="100" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -225,19 +252,22 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.lang.Integer"><![CDATA[$F{realHours}]]></textFieldExpression>
 			</textField>
-			<staticText>
+			<textField>
 				<reportElement style="Column header" x="86" y="96" width="80" height="20"/>
 				<box>
 					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 					<font size="9" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Planned]]></text>
-			</staticText>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column2.column3}]]></textFieldExpression>
+			</textField>
 			<textField pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement x="442" y="71" width="112" height="15"/>
+				<reportElement x="453" y="71" width="100" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -249,7 +279,7 @@
 				<textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{planningDifference}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement x="442" y="56" width="112" height="15"/>
+				<reportElement x="453" y="56" width="100" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -261,7 +291,7 @@
 				<textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{costDifference}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement x="442" y="86" width="112" height="15"/>
+				<reportElement x="453" y="86" width="100" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -273,7 +303,7 @@
 				<textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{ratioCostDifference}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="166" y="26" width="111" height="15"/>
+				<reportElement x="166" y="26" width="100" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -285,7 +315,7 @@
 				<textFieldExpression class="java.lang.Integer"><![CDATA[$F{estimatedHours}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="166" y="41" width="111" height="15"/>
+				<reportElement x="166" y="41" width="100" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -297,19 +327,7 @@
 				<textFieldExpression class="java.lang.Integer"><![CDATA[$F{totalPlannedHours}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement x="166" y="96" width="111" height="20"/>
-				<box>
-					<pen lineWidth="1.0"/>
-					<topPen lineWidth="1.0"/>
-					<leftPen lineWidth="1.0"/>
-					<bottomPen lineWidth="1.0"/>
-					<rightPen lineWidth="1.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression class="java.lang.Double"><![CDATA[$F{plannedProgress}]]></textFieldExpression>
-			</textField>
-			<textField pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement x="166" y="76" width="111" height="20"/>
+				<reportElement x="166" y="76" width="100" height="20"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -321,7 +339,7 @@
 				<textFieldExpression class="java.lang.Double"><![CDATA[$F{imputedProgress}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement x="166" y="56" width="111" height="20"/>
+				<reportElement x="166" y="56" width="100" height="20"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -332,8 +350,8 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{averageProgress}]]></textFieldExpression>
 			</textField>
-			<staticText>
-				<reportElement style="Column header" mode="Opaque" x="277" y="26" width="85" height="30" backcolor="#E0E4FB"/>
+			<textField>
+				<reportElement style="Column header" mode="Opaque" x="267" y="26" width="80" height="30" backcolor="#E0E4FB"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -341,13 +359,13 @@
 					<bottomPen lineWidth="1.0"/>
 					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 					<font size="10" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Hours up to date]]></text>
-			</staticText>
-			<staticText>
-				<reportElement style="Column header" mode="Opaque" x="277" y="56" width="85" height="60" backcolor="#E0E4FB"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column3}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement style="Column header" mode="Opaque" x="267" y="56" width="80" height="60" backcolor="#E0E4FB"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -355,12 +373,12 @@
 					<bottomPen lineWidth="1.0"/>
 					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 					<font size="10" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Difference]]></text>
-			</staticText>
-			<staticText>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column4}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="false">
 				<reportElement style="Column header" mode="Opaque" x="1" y="56" width="85" height="60" backcolor="#E0E4FB"/>
 				<box>
 					<pen lineWidth="1.0"/>
@@ -369,22 +387,25 @@
 					<bottomPen lineWidth="1.0"/>
 					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="10" isBold="true"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
+					<font fontName="SansSerif" size="10" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Progress]]></text>
-			</staticText>
-			<staticText>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column2}]]></textFieldExpression>
+			</textField>
+			<textField>
 				<reportElement style="Column header" x="86" y="56" width="80" height="20"/>
 				<box>
 					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 					<font size="9" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Measured]]></text>
-			</staticText>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column2.column1}]]></textFieldExpression>
+			</textField>
 			<textField isBlankWhenNull="true">
 				<reportElement x="2" y="0" width="494" height="20"/>
 				<textElement>
@@ -395,27 +416,25 @@
 			<line>
 				<reportElement x="3" y="20" width="550" height="2"/>
 			</line>
+			<textField pattern="###0.00;-###0.00" isBlankWhenNull="true">
+				<reportElement x="166" y="96" width="100" height="20"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{plannedProgress}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<columnFooter>
-		<band height="6" splitType="Stretch"/>
+		<band height="10" splitType="Stretch"/>
 	</columnFooter>
 	<pageFooter>
 		<band height="20" splitType="Stretch">
-			<textField>
-				<reportElement style="Column header" x="433" y="0" width="80" height="20"/>
-				<textElement textAlignment="Right">
-					<font size="10" isBold="false"/>
-				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["Page "+$V{PAGE_NUMBER}+" of"]]></textFieldExpression>
-			</textField>
-			<textField evaluationTime="Report">
-				<reportElement style="Column header" x="513" y="0" width="40" height="20"/>
-				<textElement>
-					<font size="10" isBold="false"/>
-				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
 			<textField pattern="EEEEE dd MMMMM yyyy">
 				<reportElement style="Column header" x="0" y="0" width="197" height="20"/>
 				<textElement>
@@ -423,6 +442,30 @@
 				</textElement>
 				<textFieldExpression class="java.util.Date"><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement style="Column header" x="477" y="0" width="15" height="20"/>
+				<textElement textAlignment="Right">
+					<font size="10" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.lang.Integer"><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField evaluationTime="Report">
+				<reportElement style="Column header" x="514" y="0" width="38" height="20"/>
+				<textElement>
+					<font size="10" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.lang.Integer"><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="497" y="0" width="15" height="20"/>
+				<textElement/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{of}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="434" y="0" width="43" height="20"/>
+				<textElement/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{page}]]></textFieldExpression>
+			</textField>
 		</band>
 	</pageFooter>
 	<summary>
diff --git a/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask.properties b/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask.properties
new file mode 100644
index 000000000..ae02bd6a2
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask.properties
@@ -0,0 +1,22 @@
+# Locale for workingProgressPerTaskReport.jrxml
+title = Progress report
+subtitle = Working progress per task
+order = Order:
+reference = Reference date:
+headers.column1 = Total hours
+headers.column1.column1 = Estimated
+headers.column1.column2 = Planned
+headers.column2 = Progress
+headers.column2.column1 = Measured
+headers.column2.column2 = Imputed
+headers.column2.column3 = Planned
+headers.column3 = Hours up to date
+headers.column3.column1 = Planned
+headers.column3.column2 = Real
+headers.column4 = Difference
+headers.column4.column1 = Cost
+headers.column4.column2 = Planned
+headers.column4.column3 = Cost ratio
+headers.column4.column4 = Planned ratio
+page = page
+of = of
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_en_US.properties b/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_en_US.properties
new file mode 100644
index 000000000..ae02bd6a2
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_en_US.properties
@@ -0,0 +1,22 @@
+# Locale for workingProgressPerTaskReport.jrxml
+title = Progress report
+subtitle = Working progress per task
+order = Order:
+reference = Reference date:
+headers.column1 = Total hours
+headers.column1.column1 = Estimated
+headers.column1.column2 = Planned
+headers.column2 = Progress
+headers.column2.column1 = Measured
+headers.column2.column2 = Imputed
+headers.column2.column3 = Planned
+headers.column3 = Hours up to date
+headers.column3.column1 = Planned
+headers.column3.column2 = Real
+headers.column4 = Difference
+headers.column4.column1 = Cost
+headers.column4.column2 = Planned
+headers.column4.column3 = Cost ratio
+headers.column4.column4 = Planned ratio
+page = page
+of = of
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_es_ES.properties b/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_es_ES.properties
new file mode 100644
index 000000000..0b1d4329a
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_es_ES.properties
@@ -0,0 +1,22 @@
+# Locale for workingProgressPerTaskReport.jrxml
+title = Informe de Progreso
+subtitle = Progreso por tarea
+order = Pedido:
+reference = Fecha de referencia:
+headers.column1 = Horas Totales
+headers.column1.column1 = Estimadas
+headers.column1.column2 = Planificadas
+headers.column2 = Avance
+headers.column2.column1 = Calculado
+headers.column2.column2 = Registrado
+headers.column2.column3 = Planificado
+headers.column3 = Horas al dia
+headers.column3.column1 = Planificadas
+headers.column3.column2 = Reales
+headers.column4 = Diferencia
+headers.column4.column1 = Coste
+headers.column4.column2 = Planificada
+headers.column4.column3 = Proporción coste
+headers.column4.column4 = Proporción planificadas
+page = página
+of = de
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_gl_ES.properties b/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_gl_ES.properties
new file mode 100644
index 000000000..ea01fe708
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_gl_ES.properties
@@ -0,0 +1,22 @@
+# Locale for workingProgressPerTaskReport.jrxml
+title = Informe de Progreso
+subtitle = Progreso por tarea
+order = Orde:
+reference = Data de referencia:
+headers.column1 = Horas Totais
+headers.column1.column1 = Estimadas
+headers.column1.column2 = Planificadas
+headers.column2 = Avance
+headers.column2.column1 = Calculado
+headers.column2.column2 = Rexistrado
+headers.column2.column3 = Planificado
+headers.column3 = Horas ó dia
+headers.column3.column1 = Planificadas
+headers.column3.column2 = Reais
+headers.column4 = Diferencia
+headers.column4.column1 = Custo
+headers.column4.column2 = Planificada
+headers.column4.column3 = Proporción custo
+headers.column4.column4 = Proporción planificadas
+page = páxina
+of = de
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2f5ee4f42..588de8567 100644
--- a/pom.xml
+++ b/pom.xml
@@ -594,6 +594,29 @@
                 <targetPath>../jetty</targetPath>
                 <filtering>true</filtering>
             </resource>
+
+            <resource>
+                <directory>../navalplanner-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/</directory>
+            </resource>
+            <resource>
+                <directory>../navalplanner-webapp/src/main/jasper/completedEstimatedHours_Bundle/</directory>
+            </resource>
+            <resource>
+                <directory>../navalplanner-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/</directory>
+            </resource>
+            <resource>
+                <directory>../navalplanner-webapp/src/main/jasper/orderCostsPerResource_Bundle/</directory>
+            </resource>
+            <resource>
+                <directory>../navalplanner-webapp/src/main/jasper/schedulingProgressPerOrder_Bundle/</directory>
+            </resource>
+            <resource>
+                <directory>../navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/</directory>
+            </resource>
+            <resource>
+                <directory>../navalplanner-webapp/src/main/jasper/workingProgressPerTask_Bundle/</directory>
+            </resource>
+
         </resources>
 
         <testResources>