[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha acqui/acqui-home.pl koha-tmpl/intranet-tmp... [rel_2_2]
From: |
paul poulain |
Subject: |
[Koha-cvs] koha acqui/acqui-home.pl koha-tmpl/intranet-tmp... [rel_2_2] |
Date: |
Mon, 31 Jul 2006 14:17:29 +0000 |
CVSROOT: /cvsroot/koha
Module name: koha
Branch: rel_2_2
Changes by: paul poulain <tipaul> 06/07/31 14:17:29
Modified files:
acqui : acqui-home.pl
koha-tmpl/intranet-tmpl/default/en/acqui: acqui-home.tmpl
Log message:
fix for smpfl suggestion : startdate & enddate are now available for
templates
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/acqui-home.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.3.2.4&r2=1.3.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.14.2.1&r2=1.14.2.2
Patches:
Index: acqui/acqui-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/acqui-home.pl,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -b -r1.3.2.4 -r1.3.2.5
--- acqui/acqui-home.pl 5 Feb 2006 21:59:21 -0000 1.3.2.4
+++ acqui/acqui-home.pl 31 Jul 2006 14:17:29 -0000 1.3.2.5
@@ -9,6 +9,7 @@
use C4::Suggestions;
use HTML::Template;
use C4::Acquisition;
+use C4::Date;
my $query = new CGI;
my ($template, $loggedinuser, $cookie)
@@ -37,6 +38,8 @@
$line{spent} = sprintf ("%.2f", $spent);
$line{comtd} = sprintf ("%.2f",$comtd);
$line{avail} = sprintf ("%.2f",$avail);
+ $line{startdate} = format_date($results[$i]->{'startdate'});
+ $line{enddate} = format_date($results[$i]->{'enddate'});
push @loop_budget, \%line;
$total+=$results[$i]->{'budgetamount'};
$totspent+=$spent;
Index: koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -b -r1.14.2.1 -r1.14.2.2
--- koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl 7 Jun 2005
13:17:38 -0000 1.14.2.1
+++ koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl 31 Jul 2006
14:17:29 -0000 1.14.2.2
@@ -48,6 +48,8 @@
<table class="noborder">
<tr>
<th class="acquisition">Budgets</th>
+ <th class="acquisition">From</th>
+ <th class="acquisition">To</th>
<th class="acquisition">Total</th>
<th class="acquisition">Spent</th>
<th class="acquisition">Comtd</th>
@@ -56,6 +58,8 @@
<!-- TMPL_LOOP NAME="loop_budget" -->
<tr>
<td><!-- TMPL_VAR NAME="bookfundname"
--></td>
+ <td align="right"><!-- TMPL_VAR
NAME="startdate" --></td>
+ <td align="right"><!-- TMPL_VAR
NAME="enddate" --></td>
<td align="right"><!-- TMPL_VAR
NAME="budgetamount" --></td>
<td align="right"><!-- TMPL_VAR
NAME="spent" --></td>
<td align="right"><!-- TMPL_VAR
NAME="comtd" --></td>
@@ -63,7 +67,7 @@
</tr>
<!-- /TMPL_LOOP -->
<tr>
- <th class="acquisition" align="right">Total</th>
+ <th class="acquisition" align="right"
colspan="3">Total</th>
<th class="acquisition" align="right"><!--
TMPL_VAR NAME="total" --></th>
<th class="acquisition" align="right"><!--
TMPL_VAR NAME="totspent" --></th>
<th class="acquisition" align="right"><!--
TMPL_VAR NAME="totcomtd" --></th>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha acqui/acqui-home.pl koha-tmpl/intranet-tmp... [rel_2_2],
paul poulain <=