@@ -, +, @@ number --- acqui/ordered.pl | 4 ++-- acqui/spent.pl | 4 ++-- .../prog/en/modules/acqui/acqui-home.tt | 8 ++++---- .../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 10 +++++----- .../intranet-tmpl/prog/en/modules/acqui/spent.tt | 12 ++++++------ 5 files changed, 19 insertions(+), 19 deletions(-) --- a/acqui/ordered.pl +++ a/acqui/ordered.pl @@ -38,8 +38,7 @@ use C4::Dates; my $dbh = C4::Context->dbh; my $input = new CGI; my $fund_id = $input->param('fund'); -my $start = $input->param('start'); -my $end = $input->param('end'); +my $fund_code = $input->param('fund_code'); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { @@ -103,6 +102,7 @@ $total = sprintf( "%.2f", $total ); $template->{VARS}->{'fund'} = $fund_id; $template->{VARS}->{'ordered'} = \@ordered; $template->{VARS}->{'total'} = $total; +$template->{VARS}->{'fund_code'} = $fund_code; $sth->finish; --- a/acqui/spent.pl +++ a/acqui/spent.pl @@ -40,8 +40,7 @@ use CGI; my $dbh = C4::Context->dbh; my $input = new CGI; my $bookfund = $input->param('fund'); -my $start = $input->param('start'); -my $end = $input->param('end'); +my $fund_code = $input->param('fund_code'); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { @@ -107,6 +106,7 @@ $total = sprintf( "%.2f", $total ); $template->{VARS}->{'fund'} = $bookfund; $template->{VARS}->{'spent'} = \@spent; $template->{VARS}->{'total'} = $total; +$template->{VARS}->{'fund_code'} = $fund_code; $sth->finish; output_html_with_http_headers $input, $cookie, $template->output; --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -122,8 +122,8 @@ $(document).ready(function() {
- [% order.ecost %] + [% order.ecost %] | -+ | [% order.entrydate | $KohaDates %] |
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
@@ -7,7 +7,7 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'acquisitions-search.inc' %]
-
@@ -15,7 +15,7 @@
- Bookfund [% fund %]+Fund: [% fund_code %]Spent@@ -65,13 +65,13 @@ [% order.unitprice %] |
+
- [% order.freight %] + [% order.freight %] | -+ | [% order.entrydate | $KohaDates %] | -- [% order.datereceived | $KohaDates %] + | + [% order.datereceived | $KohaDates %] | [% order.subtotal %] -- |