From 8ddcbe88ed43f1470842cb0796c1183f360233fc Mon Sep 17 00:00:00 2001
From: qdp <>
Date: Wed, 9 Jan 2008 11:26:21 +0000
Subject: [PATCH] in report user_timesheet and users_timesheet, the background
 of sunday column is now grey even if there is no saturday before.

bzr revid: qdp-3df256bffe6dc332b35a06b922a0e442c63a2e8d
---
 addons/hr_timesheet/report/user_timesheet.xsl  | 4 ++--
 addons/hr_timesheet/report/users_timesheet.xsl | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_timesheet/report/user_timesheet.xsl b/addons/hr_timesheet/report/user_timesheet.xsl
index 0cf95bce642..3479063b91f 100644
--- a/addons/hr_timesheet/report/user_timesheet.xsl
+++ b/addons/hr_timesheet/report/user_timesheet.xsl
@@ -30,7 +30,7 @@
 					<blockFont name="Helvetica" size="6" start="0,2" stop="-2,-2"/>
 					<blockFont name="Helvetica-BoldOblique" size="8" start="0,-1" stop="-1,-1"/>
 					<blockBackground colorName="#AAAAAA" start="1,0" stop="-2,1"/>
-					<xsl:for-each select="/report/days/day[@name='Sat']">
+					<xsl:for-each select="/report/days/day[@name='Sat' or @name='Sun']">
 						<xsl:variable name="col" select="attribute::number" />
 						<blockBackground>
 							<xsl:attribute name="colorName">lightgrey</xsl:attribute>
@@ -39,7 +39,7 @@
 								<xsl:text>,0</xsl:text>
 							</xsl:attribute>
 							<xsl:attribute name="stop">
-								<xsl:value-of select="$col+1" />
+								<xsl:value-of select="$col" />
 								<xsl:text>,-1</xsl:text>
 							</xsl:attribute>
 						</blockBackground>
diff --git a/addons/hr_timesheet/report/users_timesheet.xsl b/addons/hr_timesheet/report/users_timesheet.xsl
index c2ce8774958..b5795e22745 100644
--- a/addons/hr_timesheet/report/users_timesheet.xsl
+++ b/addons/hr_timesheet/report/users_timesheet.xsl
@@ -30,7 +30,7 @@
 					<blockFont name="Helvetica" size="6" start="0,2" stop="-2,-2"/>
 					<blockFont name="Helvetica-BoldOblique" size="8" start="0,-1" stop="-1,-1"/>
 					<blockBackground colorName="#AAAAAA" start="1,0" stop="-2,1"/>
-					<xsl:for-each select="/report/days/day[@name='Sat']">
+					<xsl:for-each select="/report/days/day[@name='Sat' or @name='Sun']">
 						<xsl:variable name="col" select="attribute::number" />
 						<blockBackground>
 							<xsl:attribute name="colorName">lightgrey</xsl:attribute>
@@ -39,7 +39,7 @@
 								<xsl:text>,0</xsl:text>
 							</xsl:attribute>
 							<xsl:attribute name="stop">
-								<xsl:value-of select="$col+1" />
+								<xsl:value-of select="$col" />
 								<xsl:text>,-1</xsl:text>
 							</xsl:attribute>
 						</blockBackground>