[Phpgroupware-cvs] property/templates/base budget.xsl

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Branch:         
Changes by:     Sigurd Nes <address@hidden>     06/05/06 09:30:35

Modified files:
        templates/base : budget.xsl 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/templates/base/budget.xsl.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: property/templates/base/budget.xsl
diff -u property/templates/base/budget.xsl:1.10 
property/templates/base/budget.xsl:1.11
--- property/templates/base/budget.xsl:1.10     Fri May  5 09:50:52 2006
+++ property/templates/base/budget.xsl  Sat May  6 09:30:35 2006
@@ -787,6 +787,10 @@
                        </xsl:choose>
                        <tr>
                                <td align="left">
+                                       <xsl:call-template name="filter_year"/>
+                               </td>
+
+                               <td align="left">
                                        <xsl:call-template 
name="filter_district"/>
                                </td>
 
@@ -816,7 +820,10 @@
                                                <xsl:value-of 
select="sum_hits"/>
                                        </td>
                                        <td class="th_text" align="right">
-                                               <xsl:value-of select="sum"/>
+                                               <xsl:value-of 
select="sum_budget_cost"/>
+                                       </td>
+                                       <td class="th_text" align="right">
+                                               <xsl:value-of 
select="sum_obligation"/>
                                        </td>
                                        <td>
                                        </td>
@@ -827,7 +834,7 @@
        <xsl:template match="table_header_budget_obligations">
                <xsl:variable name="sort_district_id"><xsl:value-of 
select="sort_district_id"/></xsl:variable>
                <xsl:variable name="sort_hits"><xsl:value-of 
select="sort_hits"/></xsl:variable>
-               <xsl:variable name="sort_budget_cost"><xsl:value-of 
select="sort_budget_cost"/></xsl:variable>
+               <xsl:variable name="sort_obligations"><xsl:value-of 
select="sort_obligations"/></xsl:variable>
                <xsl:variable name="sort_grouping"><xsl:value-of 
select="sort_grouping"/></xsl:variable>
                <tr class="th">
                        <td class="th_text" width="10%" align="left">
@@ -841,9 +848,14 @@
                                <a href="{$sort_hits}"><xsl:value-of 
select="lang_hits"/></a>
                        </td>
 
+                       <td class="th_text" width="5%" align="center">
+                               <xsl:value-of select="lang_budget_cost"/>
+                       </td>
+
                        <td class="th_text" width="5%" align="right">
-                               <a href="{$sort_budget_cost}"><xsl:value-of 
select="lang_budget_cost"/></a>
+                               <a href="{$sort_obligations}"><xsl:value-of 
select="lang_obligations"/></a>
                        </td>
+
                        <td class="th_text" width="5%" align="center">
                                <xsl:value-of select="lang_details"/>
                        </td>
@@ -882,6 +894,10 @@
                                        <xsl:value-of select="budget_cost"/>
                                </td>
 
+                               <td align = "right">
+                                       <xsl:value-of select="obligation"/>
+                               </td>
+
                                <td align="center">
                                        <xsl:variable 
name="link_details"><xsl:value-of select="link_details"/></xsl:variable>
                                        <a href="{$link_details}" 
onMouseover="window.status='{$lang_details_text}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_details"/></a>