diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/relatorio.xsl b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/relatorio.xsl
index b441bb8d..1abcd88e 100644
--- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/relatorio.xsl
+++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/relatorio.xsl
@@ -196,10 +196,12 @@
 					<fo:block font-size="12pt"> </fo:block>
 					<fo:block font-size="12pt"> </fo:block>
 					<fo:block font-size="12pt" text-align="center">
-						<xsl:variable name="logotipo"
-							select="empresa/logotipo" />
-						<fo:external-graphic src="url('{$logotipo}')"
-							height="2cm" />
+						<xsl:if test="empresa/logotipo">
+							<xsl:variable name="logotipo"
+								select="empresa/logotipo" />
+							<fo:external-graphic
+								src="url('{$logotipo}')" height="2cm" />
+						</xsl:if>
 					</fo:block>
 					<fo:block font-size="12pt"> </fo:block>
 					<fo:block font-size="12pt"> </fo:block>
@@ -219,7 +221,7 @@
 			<fo:page-sequence master-reference="Standard_1"
 				initial-page-number="1" force-page-count="no-force">
 				<fo:static-content flow-name="xsl-region-before">
-					<fo:table>
+					<fo:table table-layout="fixed" width="100%">
 						<fo:table-column />
 						<fo:table-column />
 						<fo:table-body>
@@ -235,10 +237,13 @@
 								<fo:table-cell display-align="after">
 									<fo:block font-size="13pt"
 										text-align="right">
-										<xsl:variable name="logotipo"
-											select="empresa/logotipo" />
-										<fo:external-graphic
-											src="url('{$logotipo}')" height="2cm" />
+										<xsl:if
+											test="empresa/logotipo">
+											<xsl:variable
+												name="logotipo" select="empresa/logotipo" />
+											<fo:external-graphic
+												src="url('{$logotipo}')" height="2cm" />
+										</xsl:if>
 									</fo:block>
 								</fo:table-cell>
 							</fo:table-row>
@@ -246,7 +251,7 @@
 					</fo:table>
 				</fo:static-content>
 				<fo:static-content flow-name="xsl-region-after">
-					<fo:table>
+					<fo:table table-layout="fixed" width="100%">
 						<fo:table-column />
 						<fo:table-column />
 						<fo:table-body>
@@ -842,7 +847,7 @@
 					<xsl:for-each select="categoria-legislacao">
 						<fo:block font-size="12pt" text-indent="-0.3cm"
 							text-align="justify" margin-left="1.5cm"
-							font-decoration="underline" font-weight="bold">
+							text-decoration="underline" font-weight="bold">
 							<xsl:value-of select="designacao" />
 						</fo:block>
 						<fo:list-block>
@@ -3333,6 +3338,66 @@
 						eliminação, redução ou controlo para níveis
 						aceitáveis.  
 					</fo:block>
+
+					<fo:block font-size="12pt"
+						text-decoration="underline" font-weight="bold"
+						margin-right="-0.0146in" text-indent="0in" text-align="center"
+						margin-left="0in" break-before="page">
+						ÍNDICE DAS TABELAS DE RISCO POR ÁREA DE
+						ACTIVIDADE
+					</fo:block>
+					<xsl:for-each select="conclusoes/area">
+						<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 text-align-last="justify"
+							line-height="17pt" font-size="14pt" space-after="3pt"
+							text-align="start" text-indent="0cm" font-weight="bold">
+							<fo:basic-link
+								internal-destination="N68350">
+								<xsl:attribute
+									name="internal-destination">
+									<xsl:value-of
+										select="generate-id()" />
+								</xsl:attribute>
+								Gen&#xe9;rico -
+								<xsl:value-of select="designacao" />
+							</fo:basic-link>
+							<fo:leader leader-pattern="dots"
+								leader-pattern-width="5pt" />
+							<fo:page-number-citation>
+								<xsl:attribute name="ref-id">
+									<xsl:value-of
+										select="generate-id()" />
+								</xsl:attribute>
+							</fo:page-number-citation>
+						</fo:block>
+						<xsl:for-each select="posto">
+							<fo:block text-align-last="justify"
+								line-height="17pt" font-size="14pt" space-after="3pt"
+								text-align="start" text-indent="0cm">
+								<fo:basic-link
+									internal-destination="N68350">
+									<xsl:attribute
+										name="internal-destination">
+									<xsl:value-of
+											select="generate-id()" />
+								</xsl:attribute>
+									<xsl:value-of select="designacao" />
+								</fo:basic-link>
+								<fo:leader leader-pattern="dots"
+									leader-pattern-width="5pt" />
+								<fo:page-number-citation>
+									<xsl:attribute name="ref-id">
+									<xsl:value-of
+											select="generate-id()" />
+								</xsl:attribute>
+								</fo:page-number-citation>
+							</fo:block>
+						</xsl:for-each>
+					</xsl:for-each>
 				</fo:flow>
 			</fo:page-sequence>
 
@@ -3340,7 +3405,7 @@
 				<fo:page-sequence master-reference="Standard_2"
 					force-page-count="no-force" initial-page-number="auto">
 					<fo:static-content flow-name="xsl-region-before">
-						<fo:table>
+						<fo:table table-layout="fixed" width="100%">
 							<fo:table-column />
 							<fo:table-column />
 							<fo:table-body>
@@ -3358,10 +3423,13 @@
 										display-align="after">
 										<fo:block font-size="13pt"
 											text-align="right">
-											<xsl:variable
-												name="logotipo" select="empresa/logotipo" />
-											<fo:external-graphic
-												src="url('{$logotipo}')" height="2cm" />
+											<xsl:if
+												test="empresa/logotipo">
+												<xsl:variable
+													name="logotipo" select="empresa/logotipo" />
+												<fo:external-graphic
+													src="url('{$logotipo}')" height="2cm" />
+											</xsl:if>
 										</fo:block>
 									</fo:table-cell>
 								</fo:table-row>
@@ -3369,7 +3437,7 @@
 						</fo:table>
 					</fo:static-content>
 					<fo:static-content flow-name="xsl-region-after">
-						<fo:table>
+						<fo:table table-layout="fixed" width="100%">
 							<fo:table-column />
 							<fo:table-column />
 							<fo:table-body>
@@ -3427,26 +3495,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">
@@ -3455,6 +3503,9 @@
 						<fo:block font-size="16pt" font-weight="bold"
 							margin-right="-0.0146in" text-indent="0in" text-align="center"
 							margin-left="0in">
+							<xsl:attribute name="id">
+								<xsl:value-of select="generate-id()" />
+							</xsl:attribute>
 							Riscos Comuns a
 							<xsl:value-of select="designacao" />
 						</fo:block>
@@ -3468,7 +3519,8 @@
 							force-page-count="no-force" initial-page-number="auto">
 							<fo:static-content
 								flow-name="xsl-region-before">
-								<fo:table>
+								<fo:table table-layout="fixed"
+									width="100%">
 									<fo:table-column />
 									<fo:table-column />
 									<fo:table-body>
@@ -3486,10 +3538,12 @@
 												display-align="after">
 												<fo:block
 													font-size="13pt" text-align="right">
-													<xsl:variable
-														name="logotipo" select="empresa/logotipo" />
-													<fo:external-graphic
-														src="url('{$logotipo}')" height="2cm" />
+													<xsl:if test="../../../empresa/logotipo">
+														<xsl:variable
+															name="logotipo" select="../../../empresa/logotipo" />
+														<fo:external-graphic
+															src="url('{$logotipo}')" height="2cm" />
+													</xsl:if>
 												</fo:block>
 											</fo:table-cell>
 										</fo:table-row>
@@ -3498,7 +3552,8 @@
 							</fo:static-content>
 							<fo:static-content
 								flow-name="xsl-region-after">
-								<fo:table>
+								<fo:table table-layout="fixed"
+									width="100%">
 									<fo:table-column />
 									<fo:table-column />
 									<fo:table-body>
@@ -3591,7 +3646,7 @@
 			<fo:page-sequence master-reference="Standard_1"
 				force-page-count="no-force" initial-page-number="auto">
 				<fo:static-content flow-name="xsl-region-before">
-					<fo:table>
+					<fo:table table-layout="fixed" width="100%">
 						<fo:table-column />
 						<fo:table-column />
 						<fo:table-body>
@@ -3607,10 +3662,12 @@
 								<fo:table-cell display-align="after">
 									<fo:block font-size="13pt"
 										text-align="right">
-										<xsl:variable name="logotipo"
-											select="empresa/logotipo" />
-										<fo:external-graphic
-											src="url('{$logotipo}')" height="2cm" />
+										<xsl:if test="../../../empresa/logotipo">
+											<xsl:variable name="logotipo"
+												select="empresa/logotipo" />
+											<fo:external-graphic
+												src="url('{$logotipo}')" height="2cm" />
+										</xsl:if>
 									</fo:block>
 								</fo:table-cell>
 							</fo:table-row>
@@ -3618,7 +3675,7 @@
 					</fo:table>
 				</fo:static-content>
 				<fo:static-content flow-name="xsl-region-after">
-					<fo:table>
+					<fo:table table-layout="fixed" width="100%">
 						<fo:table-column />
 						<fo:table-column />
 						<fo:table-body>
@@ -3789,7 +3846,7 @@
 		<fo:page-sequence master-reference="Standard_2"
 			force-page-count="no-force" initial-page-number="auto">
 			<fo:static-content flow-name="xsl-region-before">
-				<fo:table>
+				<fo:table table-layout="fixed" width="100%">
 					<fo:table-column />
 					<fo:table-column />
 					<fo:table-body>
@@ -3805,16 +3862,18 @@
 							<fo:table-cell display-align="after">
 								<fo:block font-size="13pt"
 									text-align="right">
-									<xsl:variable name="logotipo"
-										select="empresa/logotipo" />
-									<fo:external-graphic
-										src="url('{$logotipo}')" height="2cm" />
+									<xsl:if test="../../../empresa/logotipo">
+										<xsl:variable name="logotipo"
+											select="../../../empresa/logotipo" />
+										<fo:external-graphic
+											src="url('{$logotipo}')" height="2cm" />
+									</xsl:if>
 								</fo:block>
 							</fo:table-cell>
 						</fo:table-row>
 					</fo:table-body>
 				</fo:table>
-				<fo:table table-layout="fixed" width="10.0208in">
+				<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" />
@@ -3854,7 +3913,9 @@
 										EMPRESA
 									</fo:inline>
 									<fo:inline font-size="9pt">
-										: Auchan
+										:
+										<xsl:value-of
+											select="../../../empresa/designacao-social" />
 									</fo:inline>
 									 
 								</fo:block>
@@ -3876,7 +3937,15 @@
 										DATA DA AVALIAÇÃO
 									</fo:inline>
 									<fo:inline font-size="9pt">
-										: 6 de Março de 2008
+										:
+										<xsl:value-of
+											select="../../../data-hs/dia" />
+										de
+										<xsl:value-of
+											select="../../../data-hs/mes-extenso" />
+										de
+										<xsl:value-of
+											select="../../../data-hs/ano" />
 									</fo:inline>
 									 
 								</fo:block>
@@ -4076,7 +4145,7 @@
 				</fo:table>
 			</fo:static-content>
 			<fo:static-content flow-name="xsl-region-after">
-				<fo:table>
+				<fo:table table-layout="fixed" width="100%">
 					<fo:table-column />
 					<fo:table-column />
 					<fo:table-body>
@@ -4100,7 +4169,11 @@
 			</fo:static-content>
 
 			<fo:flow flow-name="xsl-region-body">
-				<fo:block></fo:block>
+				<fo:block>
+					<xsl:attribute name="id">
+						<xsl:value-of select="generate-id()" />
+					</xsl:attribute>
+				</fo:block>
 			</fo:flow>
 		</fo:page-sequence>
 	</xsl:template>
diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/teste_input.xml b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/teste_input.xml
index d305826b..30e79c37 100644
--- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/teste_input.xml
+++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/teste_input.xml
@@ -5,7 +5,8 @@
 			COMPANHIA PORTUGUESA DE HIPERMERCADOS
 		</designacao-social>
 		<estabelecimento>ALVERCA</estabelecimento>
-		<logotipo>http://apdp/siprp/auchan_jumbo_lado.jpg</logotipo>
+<!--		<logotipo>http://apdp/siprp/auchan_jumbo_lado.jpg</logotipo>-->
+		<logotipo>http://www.evolute.pt/~siprp/planoactuacao/siprp_logo.jpg</logotipo>
 		<morada>rua do estabelecimento</morada>
 	</empresa>
 	<data-relatorio>