diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/relatorio.xsl b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/relatorio.xsl
index 1abcd88e..7155fb41 100644
--- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/relatorio.xsl
+++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/relatorio.xsl
@@ -3352,28 +3352,28 @@
 							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>
+						<!--						<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"
@@ -3424,9 +3424,9 @@
 										<fo:block font-size="13pt"
 											text-align="right">
 											<xsl:if
-												test="empresa/logotipo">
+												test="../../../empresa/logotipo">
 												<xsl:variable
-													name="logotipo" select="empresa/logotipo" />
+													name="logotipo" select="../../../empresa/logotipo" />
 												<fo:external-graphic
 													src="url('{$logotipo}')" height="2cm" />
 											</xsl:if>
@@ -3498,147 +3498,142 @@
 						<fo:block font-size="16pt" font-weight="bold"
 							margin-right="-0.0146in" text-indent="0in" text-align="center"
 							margin-left="0in">
-							Genérico  
+							 
+						</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">
-							<xsl:attribute name="id">
-								<xsl:value-of select="generate-id()" />
-							</xsl:attribute>
-							Riscos Comuns a
 							<xsl:value-of select="designacao" />
 						</fo:block>
 					</fo:flow>
 				</fo:page-sequence>
+				<!--				<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 table-layout="fixed" width="100%">-->
+				<!--							<fo:table-column />-->
+				<!--							<fo:table-column />-->
+				<!--							<fo:table-body>-->
+				<!--								<fo:table-row>-->
+				<!--									<fo:table-cell-->
+				<!--										display-align="after">-->
+				<!--										<fo:block font-size="13pt"-->
+				<!--											text-align="left">-->
+				<!--											<fo:external-graphic-->
+				<!--												src="url('http://www.evolute.pt/~siprp/planoactuacao/siprp_logo.jpg')"-->
+				<!--												height="2cm" />-->
+				<!--										</fo:block>-->
+				<!--									</fo:table-cell>-->
+				<!--									<fo:table-cell-->
+				<!--										display-align="after">-->
+				<!--										<fo:block font-size="13pt"-->
+				<!--											text-align="right">-->
+				<!--											<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:static-content>-->
+				<!--					<fo:static-content flow-name="xsl-region-after">-->
+				<!--						<fo:table table-layout="fixed" width="100%">-->
+				<!--							<fo:table-column />-->
+				<!--							<fo:table-column />-->
+				<!--							<fo:table-body>-->
+				<!--								<fo:table-row>-->
+				<!--									<fo:table-cell>-->
+				<!--										<fo:block font-size="10pt"-->
+				<!--											text-align="left">-->
+				<!--											Avaliação Periódica de-->
+				<!--											Riscos Laborais-->
+				<!--										</fo:block>-->
+				<!--									</fo:table-cell>-->
+				<!--									<fo:table-cell>-->
+				<!--										<fo:block font-size="10pt"-->
+				<!--											text-align="end">-->
+				<!--											<fo:page-number />-->
+				<!--										</fo:block>-->
+				<!--									</fo:table-cell>-->
+				<!--								</fo:table-row>-->
+				<!--							</fo:table-body>-->
+				<!--						</fo:table>-->
+				<!--					</fo:static-content>-->
+				<!---->
+				<!--					<fo:flow flow-name="xsl-region-body">-->
+				<!--						<fo:block font-size="12pt"-->
+				<!--							margin-right="-0.0146in" text-indent="0in" 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">-->
+				<!--							Genérico  -->
+				<!--						</fo:block>-->
+				<!--						<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>-->
+				<!--					</fo:flow>-->
+				<!--				</fo:page-sequence>-->
 
 				<xsl:for-each select="posto">
 					<xsl:call-template name="posto" />
-					<xsl:if test="position()=1">
-						<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 table-layout="fixed"
-									width="100%">
-									<fo:table-column />
-									<fo:table-column />
-									<fo:table-body>
-										<fo:table-row>
-											<fo:table-cell
-												display-align="after">
-												<fo:block
-													font-size="13pt" text-align="left">
-													<fo:external-graphic
-														src="url('http://www.evolute.pt/~siprp/planoactuacao/siprp_logo.jpg')"
-														height="2cm" />
-												</fo:block>
-											</fo:table-cell>
-											<fo:table-cell
-												display-align="after">
-												<fo:block
-													font-size="13pt" text-align="right">
-													<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:static-content>
-							<fo:static-content
-								flow-name="xsl-region-after">
-								<fo:table table-layout="fixed"
-									width="100%">
-									<fo:table-column />
-									<fo:table-column />
-									<fo:table-body>
-										<fo:table-row>
-											<fo:table-cell>
-												<fo:block
-													font-size="10pt" text-align="left">
-													Avaliação Periódica
-													de Riscos Laborais
-												</fo:block>
-											</fo:table-cell>
-											<fo:table-cell>
-												<fo:block
-													font-size="10pt" text-align="end">
-													<fo:page-number />
-												</fo:block>
-											</fo:table-cell>
-										</fo:table-row>
-									</fo:table-body>
-								</fo:table>
-							</fo:static-content>
-
-							<fo:flow flow-name="xsl-region-body">
-								<fo:block font-size="12pt"
-									margin-right="-0.0146in" text-indent="0in" 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">
-									 
-								</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">
-									<xsl:value-of select="designacao" />
-								</fo:block>
-							</fo:flow>
-						</fo:page-sequence>
-					</xsl:if>
 				</xsl:for-each>
 			</xsl:for-each>
 
@@ -3662,9 +3657,10 @@
 								<fo:table-cell display-align="after">
 									<fo:block font-size="13pt"
 										text-align="right">
-										<xsl:if test="../../../empresa/logotipo">
-											<xsl:variable name="logotipo"
-												select="empresa/logotipo" />
+										<xsl:if
+											test="../../../empresa/logotipo">
+											<xsl:variable
+												name="logotipo" select="empresa/logotipo" />
 											<fo:external-graphic
 												src="url('{$logotipo}')" height="2cm" />
 										</xsl:if>
@@ -3862,7 +3858,8 @@
 							<fo:table-cell display-align="after">
 								<fo:block font-size="13pt"
 									text-align="right">
-									<xsl:if test="../../../empresa/logotipo">
+									<xsl:if
+										test="../../../empresa/logotipo">
 										<xsl:variable name="logotipo"
 											select="../../../empresa/logotipo" />
 										<fo:external-graphic
@@ -3874,16 +3871,19 @@
 					</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 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-body>
 						<fo:table-row>
-							<fo:table-cell number-columns-spanned="7"
+							<fo:table-cell number-columns-spanned="3"
 								padding-bottom="0in" padding-left="0.0486in" padding-top="0in"
 								display-align="center" border="0.0139in solid #000000"
 								background-color="#808080" writing-mode="lr-tb"
@@ -3917,10 +3917,29 @@
 										<xsl:value-of
 											select="../../../empresa/designacao-social" />
 									</fo:inline>
+								</fo:block>
+							</fo:table-cell>
+						</fo:table-row>
+						<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">
+								<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  
+								</fo:block>
 							</fo:table-cell>
-							<fo:table-cell number-columns-spanned="2"
+						</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"
@@ -3976,25 +3995,7 @@
 									 
 								</fo:block>
 							</fo:table-cell>
-						</fo:table-row>
-						<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">
-								<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  
-								</fo:block>
-							</fo:table-cell>
-							<fo:table-cell number-columns-spanned="2"
+							<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"
@@ -4087,7 +4088,7 @@
 									text-align="center" margin-left="0in">
 									(S)  
 								</fo:block>
-							</fo:table-cell>
+							</fo:table-cell> 
 							<fo:table-cell
 								border-left="0.0069in solid #000000"
 								border-bottom="0.0139in solid #000000"