# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ivan_gudym-20100202183154-3oz5s0rxjdxubz9b
# target_branch: file:///home/ivan/devel/openerp/remote/addons/
# testament_sha1: 683963badd002dcaefb953a8286182ef7ee0e4bb
# timestamp: 2010-02-02 21:00:17 +0200
# base_revision_id: olt@tinyerp.com-20100201124558-dt9204wz55om09uc
# 
# Begin patch
=== modified file 'base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl'
--- base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl	2009-02-17 11:38:59 +0000
+++ base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl	2010-02-02 18:31:54 +0000
@@ -151,7 +151,7 @@
 				<xsl:variable name="colorname">
 					<xsl:value-of select="substring-after($linebefore,'#')"/>
 				</xsl:variable>
-				<lineStyle kind="LINEBEFORE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
+				<lineStyle kind="LINEBEFORE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},{$row}"/>
 			</xsl:if>
 			<xsl:variable name="lineafter">
 				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border-right"/>
@@ -160,7 +160,7 @@
 				<xsl:variable name="colorname">
 					<xsl:value-of select="substring-after($lineafter,'#')"/>
 				</xsl:variable>
-				<lineStyle kind="LINEAFTER" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
+				<lineStyle kind="LINEAFTER" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},{$row}"/>
 			</xsl:if>
 			<xsl:variable name="lineabove">
 				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border-top"/>
@@ -178,7 +178,7 @@
 				<xsl:variable name="colorname">
 					<xsl:value-of select="substring-after($linebelow,'#')"/>
 				</xsl:variable>
-				<lineStyle kind="LINEBELOW" colorName="#{$colorname}" start="{$col},{-1}" stop="{$col},{-1}"/>
+				<lineStyle kind="LINEBELOW" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},{$row}"/>
 			</xsl:if>
 			<xsl:variable name="grid">
 				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border"/>
@@ -188,10 +188,10 @@
 					<xsl:value-of select="substring-after($grid,'#')"/>
 				</xsl:variable>
 				<!-- Don't use grid because we don't need a line between each rows -->
-				<lineStyle kind="LINEBEFORE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
-				<lineStyle kind="LINEAFTER" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
+				<lineStyle kind="LINEBEFORE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},{$row}"/>
+				<lineStyle kind="LINEAFTER" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},{$row}"/>
 				<lineStyle kind="LINEABOVE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},{$row}"/>
-				<lineStyle kind="LINEBELOW" colorName="#{$colorname}" start="{$col},{-1}" stop="{$col},{-1}"/>
+				<lineStyle kind="LINEBELOW" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},{$row}"/>
 			</xsl:if>
 		</xsl:for-each>
 	</xsl:for-each>

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWYovXEAAfFfgEAwXGf/93Ol
nIC////6UAP46eRRsACDmEwCYATCYTTAAAJk00DHMJgEwAmEwmmAAATJpoGEiQhBiamyUxPRqAaa
NMmh6jQzUACKqTyGo81T9KGnqNA0G1DQHpAAAP1QSSJkJ6ak9MptDUyNDTSeiGmmTQGQNDAUCu5d
ULiwml3dRifqarGszzYTlMFs5LOSrlqdRVPiOu9ti+u8V3ClbNcQ3cOKQTqnA68wn8Tul+98TFKO
DD6MFNhbf7T4b2+/Krvezp/wLda6/cKYmM2zimBaxkK200Aw+yIkXaGtwvxkjf+g0nTLWD2+PLty
YX1CND8lDcggJjBccIL5CmNYcxRYSWk1zxVCyRuNgrhZmFIbogZSwkvPRYzjIyHEvEalvQoVivFa
Zh4m73DhdLgak6TA3SI36Dj70J6B6uHJW3q4LDOw4JHrgVEk/2rJTTSRLPCtgUBkT51nFlm1DSrw
Zx6KlFDmos6osDQrjTrMjYYrkqeyWGlUvsMS9BpM9a/ynWms5XQwoqhabVYt8nBga9e1MmVTl6la
WlaazhsWNLtDXNgEiJQ9VUCkXQJ2QpLCB+3ze6B2pi8WBQnsW6FaKWo1BTqXla7RNdbNouh3lsej
IUpdElDKCqF89rS3WyrgscS6bF2E7WNuEdh4Clzh+Sh9jn4C0pTOAsheBQmfguFM45GsCbwgPEpY
40ybgNxRbZkNTNw2blcekia4Z3PujEDWkuDNUM40O9cMC0cbzqOQcUWyw/wtwDdhUdxYYHaRXaYa
bGmusXmIO4HS5y2tMmSqRQu4zkjEu714eorkvFBlaQ7DUTdsFuzOPAqx2tAUoBwkayUlkM7zoOlM
jPHLs7A0hiXqoCKclZiTOYznAYYrPLl5jUy7NeiwVvqLTQ2cKciV9JKpDzQWpxPyEbBV/rM6EUTA
5ANPkexNZCQeguHGbVcExblVYEU5Y7UtTi8WIVb0lxbnAqmBhMuQUQL6qx4pwCL9Zvi+gGEwbFmK
RUQEQZLr61ZqIbgiyGAxeq8AUco4A1JqQN/PiquUTBpE4L1NPFvoWWILMJgweLOX6LlAgFeMYjbl
p0KkRruoFTzzrZPxrprFzAwrn5Q4AohYJiLG8Tl0GwWqGQZugw6kymcoDVxVKuBRBmhPYmMRa1PI
TSaWQhxUjzb/AqEaI37zGTMTyGoepjLlGty0edQwbAMtVziBwVjc4WI0zwvQsmmgmguBfdpG0ccE
q/hxgyBmGgGAP+LuSKcKEgzFF64g