diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/relatorio.xsl b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/relatorio.xsl
index 7155fb41..26c26434 100644
--- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/relatorio.xsl
+++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/relatorio.xsl
@@ -66,9 +66,9 @@
 				<fo:simple-page-master master-name="pm1_2"
 					page-height="8.2701in" page-width="11.6902in" margin-top="0.4917in"
 					margin-right="1.3in" margin-left="0.6in">
-					<fo:region-body margin-top="2.2in"
+					<fo:region-body margin-top="2.8in"
 						margin-bottom="0.6201in" />
-					<fo:region-before extent="2.2in"
+					<fo:region-before extent="2.8in"
 						margin-bottom="0in" />
 					<fo:region-after extent="0.6201in"
 						margin-top="0.4201in" />
@@ -3485,36 +3485,6 @@
 							margin-left="0in">
 							 
 						</fo:block>
-						<fo:block font-size="16pt" font-weight="bold"
-							margin-right="-0.0146in" text-indent="0in" text-align="center"
-							margin-left="0in">
-							 
-						</fo:block>
-						<fo:block font-size="16pt" font-weight="bold"
-							margin-right="-0.0146in" text-indent="0in" text-align="center"
-							margin-left="0in">
-							 
-						</fo:block>
-						<fo:block font-size="16pt" font-weight="bold"
-							margin-right="-0.0146in" text-indent="0in" text-align="center"
-							margin-left="0in">
-							 
-						</fo:block>
-						<fo:block font-size="16pt" font-weight="bold"
-							margin-right="-0.0146in" text-indent="0in" text-align="center"
-							margin-left="0in">
-							 
-						</fo:block>
-						<fo:block font-size="16pt" font-weight="bold"
-							margin-right="-0.0146in" text-indent="0in" text-align="center"
-							margin-left="0in">
-							 
-						</fo:block>
-						<fo:block font-size="16pt" font-weight="bold"
-							margin-right="-0.0146in" text-indent="0in" text-align="center"
-							margin-left="0in">
-							 
-						</fo:block>
 						<fo:block font-size="16pt" font-weight="bold"
 							margin-right="-0.0146in" text-indent="0in" text-align="center"
 							margin-left="0in">
@@ -3719,10 +3689,14 @@
 						<fo:inline>
 							Este Plano permitirá auxiliar a
 						</fo:inline>
-						<fo:inline font-weight="bold">AUCHAN</fo:inline>
+						<fo:inline font-weight="bold">
+							<xsl:value-of
+								select="empresa/designacao-social" />
+						</fo:inline>
 						<fo:inline>-</fo:inline>
 						<fo:inline font-weight="bold">
-							Loja de Coimbra
+							<xsl:value-of
+								select="empresa/estabelecimento" />
 						</fo:inline>
 						<fo:inline>
 							na programação e acompanhamento das
@@ -3753,10 +3727,14 @@
 							Trabalho da SIPRP agradece a colaboração de
 							todos os colaboradores da
 						</fo:inline>
-						<fo:inline font-weight="bold">AUCHAN</fo:inline>
+						<fo:inline font-weight="bold">
+							<xsl:value-of
+								select="empresa/designacao-social" />
+						</fo:inline>
 						<fo:inline>-</fo:inline>
 						<fo:inline font-weight="bold">
-							Loja de Coimbra
+							<xsl:value-of
+								select="empresa/estabelecimento" />
 						</fo:inline>
 						<fo:inline>
 							durante a realização desta auditoria,
@@ -3775,7 +3753,19 @@
 						 
 					</fo:block>
 					<fo:block font-size="12pt" line-height="130%">
-						Lisboa, 29 de Abril de 2008  
+						Lisboa,
+						<fo:inline font-size="9pt">
+							:
+							<xsl:value-of
+								select="../../../data-relatorio/dia" />
+							de
+							<xsl:value-of
+								select="../../../data-relatorio/mes-extenso" />
+							de
+							<xsl:value-of
+								select="../../../data-relatorio/ano" />
+						</fo:inline>
+						 
 					</fo:block>
 					<fo:block font-size="12pt" line-height="130%">
 						 
@@ -3871,16 +3861,9 @@
 					</fo:table-body>
 				</fo:table>
 				<fo:table table-layout="fixed" width="10.0209in">
-<!--					<fo:table-column column-width="0.716in" />-->
-<!--					<fo:table-column column-width="0.6729in" />-->
-<!--					<fo:table-column column-width="0.8208in" />-->
-<!--					<fo:table-column column-width="0.4403in" />-->
-<!--					<fo:table-column column-width="2.4688in" />-->
-<!--					<fo:table-column column-width="1.7875in" />-->
-<!--					<fo:table-column column-width="3.1146in" />-->
-						<fo:table-column />
-						<fo:table-column />
-						<fo:table-column />
+					<fo:table-column />
+					<fo:table-column />
+					<fo:table-column />
 					<fo:table-body>
 						<fo:table-row>
 							<fo:table-cell number-columns-spanned="3"
@@ -3898,11 +3881,9 @@
 						<fo:table-row>
 							<fo:table-cell number-columns-spanned="3"
 								padding-bottom="0in" padding-left="0.0486in"
-								border-left="0.0139in solid #000000"
-								border-bottom="0.0069in solid #000000" padding-top="0in"
-								border-top="0.0139in solid #000000" display-align="before"
-								writing-mode="lr-tb" padding-right="0.0486in"
-								border-right="none">
+								border="0.0069in solid #000000" padding-top="0in"
+								display-align="before" writing-mode="lr-tb"
+								padding-right="0.0486in">
 								<fo:block font-size="4pt"
 									margin-right="-0.0146in" text-indent="0in" margin-left="0in">
 									 
@@ -3923,33 +3904,26 @@
 						<fo:table-row>
 							<fo:table-cell number-columns-spanned="3"
 								padding-bottom="0in" padding-left="0.0486in"
-								border-left="0.0139in solid #000000"
-								border-bottom="0.0069in solid #000000" padding-top="0in"
-								border-top="0.0069in solid #000000" display-align="before"
-								writing-mode="lr-tb" padding-right="0.0486in"
-								border-right="none">
+								border="0.0069in solid #000000" padding-top="0in"
+								display-align="before" writing-mode="lr-tb"
+								padding-right="0.0486in">
 								<fo:block font-size="4pt"
 									margin-right="-0.0146in" text-indent="0in" margin-left="0in">
 									 
 								</fo:block>
 								<fo:block font-size="10pt"
 									margin-right="-0.0146in" text-indent="0in" margin-left="0in">
-									ESTABELECIMENTO: Coimbra  
+									ESTABELECIMENTO:
+									<xsl:value-of
+										select="../../../empresa/estabelecimento" />
 								</fo:block>
 							</fo:table-cell>
 						</fo:table-row>
 						<fo:table-row>
-							<fo:table-cell
-								padding-bottom="0in" padding-left="0.0486in"
-								border-left="0.0069in solid #000000"
-								border-bottom="0.0069in solid #000000" padding-top="0in"
-								border-top="0.0139in solid #000000" display-align="before"
-								writing-mode="lr-tb" padding-right="0.0486in"
-								border-right="none">
-								<fo:block font-size="4pt"
-									margin-right="-0.0146in" text-indent="0in" margin-left="0in">
-									 
-								</fo:block>
+							<fo:table-cell padding-bottom="0in"
+								padding-left="0.0486in" border="0.0069in solid #000000"
+								padding-top="0in" display-align="before" writing-mode="lr-tb"
+								padding-right="0.0486in">
 								<fo:block font-size="12pt"
 									margin-right="-0.0146in" text-indent="0in" margin-left="0in">
 									<fo:inline font-size="10pt">
@@ -3969,13 +3943,10 @@
 									 
 								</fo:block>
 							</fo:table-cell>
-							<fo:table-cell number-columns-spanned="2"
-								padding-bottom="0in" padding-left="0.0486in"
-								border-left="0.0069in solid #000000"
-								border-bottom="0.0069in solid #000000" padding-top="0in"
-								border-top="0.0139in solid #000000" display-align="center"
-								writing-mode="lr-tb" padding-right="0.0486in"
-								border-right="0.0139in solid #000000">
+							<fo:table-cell padding-bottom="0in"
+								padding-left="0.0486in" border="0.0069in solid #000000"
+								padding-top="0in" display-align="center" writing-mode="lr-tb"
+								padding-right="0.0486in">
 								<fo:block font-size="12pt"
 									margin-right="-0.0146in" text-indent="0in" margin-left="0in">
 									<fo:inline font-size="10pt">
@@ -3995,56 +3966,54 @@
 									 
 								</fo:block>
 							</fo:table-cell>
-							<fo:table-cell
-								padding-bottom="0in" padding-left="0.0486in"
-								border-left="0.0069in solid #000000"
-								border-bottom="0.0069in solid #000000" padding-top="0in"
-								border-top="0.0069in solid #000000" display-align="before"
-								writing-mode="lr-tb" padding-right="0.0486in"
-								border-right="none">
-								<fo:block font-size="4pt"
-									margin-right="-0.0146in" text-indent="0in" margin-left="0in">
-									 
-								</fo:block>
+							<fo:table-cell padding-bottom="0in"
+								padding-left="0.0486in" border="0.0069in solid #000000"
+								padding-top="0in" display-align="before" writing-mode="lr-tb"
+								padding-right="0.0486in">
 								<fo:block font-size="12pt"
 									margin-right="-0.0146in" text-indent="0in" margin-left="0in">
 									<fo:inline font-size="10pt">
 										DATA DA PRÓXIMA
 									</fo:inline>
 									<fo:inline font-size="9pt">
-										: 25 de Setembro de 2008
+										:
+										<xsl:value-of
+											select="../../../data-proxima-hs/dia" />
+										de
+										<xsl:value-of
+											select="../../../data-proxima-hs/mes-extenso" />
+										de
+										<xsl:value-of
+											select="../../../data-proxima-hs/ano" />
 									</fo:inline>
 									 
 								</fo:block>
 							</fo:table-cell>
-							<fo:table-cell number-columns-spanned="2"
+						</fo:table-row>
+						<fo:table-row>
+							<fo:table-cell number-columns-spanned="3"
 								padding-bottom="0in" padding-left="0.0486in"
-								border-left="0.0069in solid #000000"
-								border-bottom="0.0069in solid #000000" padding-top="0in"
-								border-top="0.0069in solid #000000" display-align="center"
-								writing-mode="lr-tb" padding-right="0.0486in"
-								border-right="0.0139in solid #000000">
-								<fo:block font-size="10pt"
-									margin-right="-0.0146in" text-indent="0in" text-align="justify"
-									margin-left="0in">
-									REALIZADA POR: Sónia Campos  
-								</fo:block>
-								<fo:block font-size="9pt"
+								border="0.0069in solid #000000" padding-top="0in"
+								display-align="before" writing-mode="lr-tb"
+								padding-right="0.0486in">
+								<fo:block font-size="12pt"
 									margin-right="-0.0146in" text-indent="0in" text-align="justify"
 									margin-left="0in">
-									SIPRP – Sociedade Ibérica de
-									Prevenção de Riscos Profissionais  
+									<fo:inline font-size="10pt">
+										REALIZADA POR: Sónia Campos  /
+										SIPRP – Sociedade Ibérica de
+										Prevenção de Riscos
+										Profissionais  
+									</fo:inline>
 								</fo:block>
 							</fo:table-cell>
 						</fo:table-row>
 						<fo:table-row>
-							<fo:table-cell number-columns-spanned="6"
+							<fo:table-cell number-columns-spanned="3"
 								padding-bottom="0in" padding-left="0.0486in"
-								border-left="0.0139in solid #000000"
-								border-bottom="0.0139in solid #000000" padding-top="0in"
-								border-top="0.0069in solid #000000" display-align="center"
-								writing-mode="lr-tb" padding-right="0.0486in"
-								border-right="none">
+								border="0.0069in solid #000000" padding-top="0in"
+								display-align="center" writing-mode="lr-tb"
+								padding-right="0.0486in">
 								<fo:block font-size="12pt"
 									margin-right="-0.0146in" text-indent="0in" margin-left="0in">
 									<fo:inline font-size="11pt"
@@ -4053,90 +4022,74 @@
 									</fo:inline>
 									<fo:inline>:</fo:inline>
 									<fo:inline font-size="11pt">
-										Genérico Área Administrativa
+										<xsl:value-of
+											select="designacao" />
 									</fo:inline>
-									 
-								</fo:block>
-							</fo:table-cell>
-							<fo:table-cell padding-bottom="0in"
-								padding-left="0.0486in" border-left="0.0069in solid #000000"
-								border-bottom="0.0139in solid #000000" padding-top="0in"
-								border-top="0.0069in solid #000000" display-align="before"
-								writing-mode="lr-tb" padding-right="0.0486in"
-								border-right="0.0139in solid #000000">
-								<fo:block font-size="12pt"
-									font-weight="bold" margin-right="-0.0146in" text-indent="0in"
-									text-align="center" margin-left="0in">
-									Página 1 de 11  
 								</fo:block>
 							</fo:table-cell>
 						</fo:table-row>
+					</fo:table-body>
+				</fo:table>
+				<fo:table table-layout="fixed" width="10.0209in">
+					<fo:table-column column-width="0.716in" />
+					<fo:table-column column-width="0.6729in" />
+					<fo:table-column column-width="1.2611in" />
+					<fo:table-column column-width="7.3709in" />
+					<fo:table-body>
 						<fo:table-row>
 							<fo:table-cell
-								border-left="0.0069in solid #000000"
-								border-bottom="0.0139in solid #000000"
-								border-top="0.0069in solid #000000" display-align="center"
-								background-color="#000000" writing-mode="lr-tb"
-								border-right="none">
+								border="0.0069in solid #000000" display-align="center"
+								background-color="#000000" writing-mode="lr-tb">
 								<fo:block font-size="11pt"
 									font-weight="bold" margin-right="-0.0146in" text-indent="0in"
-									text-align="center" margin-left="0in">
+									text-align="center" margin-left="0in" color="white">
 									SEV.  
 								</fo:block>
 								<fo:block font-size="11pt"
 									font-weight="bold" margin-right="-0.0146in" text-indent="0in"
-									text-align="center" margin-left="0in">
+									text-align="center" margin-left="0in" color="white">
 									(S)  
 								</fo:block>
-							</fo:table-cell> 
+							</fo:table-cell>
 							<fo:table-cell
-								border-left="0.0069in solid #000000"
-								border-bottom="0.0139in solid #000000"
-								border-top="0.0069in solid #000000" display-align="center"
-								background-color="#000000" writing-mode="lr-tb"
-								border-right="none">
+								border="0.0069in solid #000000" display-align="center"
+								background-color="#000000" writing-mode="lr-tb">
 								<fo:block font-size="11pt"
 									font-weight="bold" margin-right="-0.0146in" text-indent="0in"
-									text-align="center" margin-left="0in">
+									text-align="center" margin-left="0in" color="white">
 									PROB.  
 								</fo:block>
 								<fo:block font-size="11pt"
 									font-weight="bold" margin-right="-0.0146in" text-indent="0in"
-									text-align="center" margin-left="0in">
+									text-align="center" margin-left="0in" color="white">
 									(P)  
 								</fo:block>
 							</fo:table-cell>
-							<fo:table-cell number-columns-spanned="2"
-								border-left="0.0069in solid #000000"
-								border-bottom="0.0139in solid #000000"
-								border-top="0.0069in solid #000000" display-align="center"
-								background-color="#000000" writing-mode="lr-tb"
-								border-right="none">
+							<fo:table-cell
+								border="0.0069in solid #000000" display-align="center"
+								background-color="#000000" writing-mode="lr-tb">
 								<fo:block font-size="11pt"
 									font-weight="bold" margin-right="-0.0146in" text-indent="0in"
-									text-align="center" margin-left="0in">
+									text-align="center" margin-left="0in" color="white">
 									VALOR RISCO  
 								</fo:block>
 								<fo:block font-size="11pt"
 									font-weight="bold" margin-right="-0.0146in" text-indent="0in"
-									text-align="center" margin-left="0in">
+									text-align="center" margin-left="0in" color="white">
 									(S x P)  
 								</fo:block>
 							</fo:table-cell>
-							<fo:table-cell number-columns-spanned="3"
-								border-left="0.0069in solid #000000"
-								border-bottom="0.0139in solid #000000"
-								border-top="0.0069in solid #000000" display-align="before"
-								background-color="#000000" writing-mode="lr-tb"
-								border-right="0.0069in solid #000000">
+							<fo:table-cell
+								border="0.0069in solid #000000" display-align="before"
+								background-color="#000000" writing-mode="lr-tb">
 								<fo:block font-size="11pt"
 									font-weight="bold" margin-right="-0.0146in" text-indent="0in"
-									text-align="center" margin-left="0in">
+									text-align="center" margin-left="0in" color="white">
 									RISCO / CONDIÇÕES ANÓMALAS /  
 								</fo:block>
 								<fo:block font-size="11pt"
 									font-weight="bold" margin-right="-0.0146in" text-indent="0in"
-									text-align="center" margin-left="0in">
+									text-align="center" margin-left="0in" color="white">
 									/ ACÇÕES DE CONTROLO OU REDUÇÃO DO
 									RISCO  
 								</fo:block>
@@ -4175,6 +4128,82 @@
 						<xsl:value-of select="generate-id()" />
 					</xsl:attribute>
 				</fo:block>
+				<fo:table table-layout="fixed" width="10.0209in">
+					<fo:table-column column-width="0.716in" />
+					<fo:table-column column-width="0.6729in" />
+					<fo:table-column column-width="1.2611in" />
+					<fo:table-column column-width="7.3709in" />
+					<fo:table-body>
+						<xsl:for-each select="risco">
+							<fo:table-row>
+								<fo:table-cell
+									border="0.0069in solid #000000" display-align="center"
+									background-color="#000000" writing-mode="lr-tb">
+									<fo:block font-size="11pt"
+										font-weight="bold" margin-right="-0.0146in" text-indent="0in"
+										text-align="center" margin-left="0in">
+										<xsl:value-of
+											select="severidade" />
+									</fo:block>
+								</fo:table-cell>
+								<fo:table-cell
+									border="0.0069in solid #000000" display-align="center"
+									background-color="#000000" writing-mode="lr-tb">
+									<fo:block font-size="11pt"
+										font-weight="bold" margin-right="-0.0146in" text-indent="0in"
+										text-align="center" margin-left="0in">
+										<xsl:value-of
+											select="probabilidade" />
+									</fo:block>
+								</fo:table-cell>
+								<fo:table-cell
+									border="0.0069in solid #000000" display-align="center"
+									background-color="#000000" writing-mode="lr-tb">
+									<fo:block font-size="11pt"
+										font-weight="bold" margin-right="-0.0146in" text-indent="0in"
+										text-align="center" margin-left="0in">
+										<xsl:value-of
+											select="valor-numerico" />
+									</fo:block>
+									<fo:block font-size="11pt"
+										font-weight="bold" margin-right="-0.0146in" text-indent="0in"
+										text-align="center" margin-left="0in">
+										<xsl:value-of
+											select="valor-qualitativo" />
+									</fo:block>
+								</fo:table-cell>
+								<fo:table-cell
+									border="0.0069in solid #000000" display-align="center"
+									background-color="#000000" writing-mode="lr-tb">
+									<fo:block font-size="11pt"
+										font-weight="bold" margin-right="-0.0146in" text-indent="0in"
+										text-align="center" margin-left="0in">
+										<xsl:value-of
+											select="descricao" />
+									</fo:block>
+									<xsl:for-each select="medida">
+										<fo:block font-size="11pt"
+											margin-right="-0.0146in" text-indent="0in"
+											text-align="center" margin-left="0.2in">
+											-
+											<xsl:value-of
+												select="requisitos" />
+											<xsl:choose>
+												<xsl:when
+													test="position()=last()">
+													.
+												</xsl:when>
+												<xsl:otherwise>
+													;
+												</xsl:otherwise>
+											</xsl:choose>
+										</fo:block>
+									</xsl:for-each>
+								</fo:table-cell>
+							</fo:table-row>
+						</xsl:for-each>
+					</fo:table-body>
+				</fo:table>
 			</fo:flow>
 		</fo:page-sequence>
 	</xsl:template>