Koha-community
/
Koha
13
5
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Bug 929: Follow up - showing fund code instead of internal number 

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
3.8.x
Katrin Fischer 13 years ago
committed by Paul Poulain
parent
01875b565d
commit
71d2d81e34
5 changed files with 16 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      acqui/ordered.pl
  2. 4
      acqui/spent.pl
  3. 8
      koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
  4. 8
      koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
  5. 8
      koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt

4
acqui/ordered.pl
View File

@ -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;

4
acqui/spent.pl
View File

@ -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;

8
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
View File

@ -122,8 +122,8 @@ $(document).ready(function() {
<td align="center">[% loop_budge.budget_owner %]</td>
<td align="center">[% loop_budge.budget_branchname %]</td>
<td align="right" >[% loop_budge.budget_amount %]</td>
<td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]">[% loop_budge.budget_ordered %]</a></td>
<td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]">[% loop_budge.budget_spent %]</a></td>
<td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td>
<td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td>
<td align="right" >[% loop_budge.budget_avail %]</td>
</tr>
[% ELSE %]
@ -136,8 +136,8 @@ $(document).ready(function() {
<td align="center">[% loop_budge.budget_owner %]</td>
<td align="center">[% loop_budge.budget_branchname %]</td>
<td align="right" >[% loop_budge.budget_amount %]</td>
<td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]">[% loop_budge.budget_ordered %]</a></td>
<td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]">[% loop_budge.budget_spent %]</a></td>
<td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td>
<td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td>
<td align="right" >[% loop_budge.budget_avail %]</td>
[% END %]
[% END %]

8
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
View File

@ -7,7 +7,7 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'acquisitions-search.inc' %]
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Ordered - [% fund %]</div>
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Ordered - [% fund_code %]</div>
<div id="doc3" class="yui-t2">
@ -15,8 +15,8 @@
<div id="yui-main">
<div class="yui-b">
<h1>Bookfunds</h1>
<h2>Ordered - [% fund %]</h2>
<h1>Fund: [% fund_code %]</h1>
<h2>Ordered</h2>
<table cellspacing="0" cellpadding="0" border="0" id="spent" class="collapse">
<thead>
@ -56,7 +56,7 @@
<td class="cell" align="right">
[% order.ecost %]
</td>
<td class="cell">
<td class="cell" align="right">
[% order.entrydate | $KohaDates %]
</td>
<td class="cell" align="right">

8
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
View File

@ -7,7 +7,7 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'acquisitions-search.inc' %]
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Spent [% fund %]</div>
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Spent - [% fund_code %]</div>
<div id="doc3" class="yui-t2">
@ -15,7 +15,7 @@
<div id="yui-main">
<div class="yui-b">
<h1>Bookfund [% fund %]</h1>
<h1>Fund: [% fund_code %]</h1>
<h2>Spent</h2>
@ -67,10 +67,10 @@
<td class="cell" align="right">
[% order.freight %]
</td>
<td class="cell">
<td class="cell" align="right">
[% order.entrydate | $KohaDates %]
</td>
<td class="cell">
<td class="cell" align="right">
[% order.datereceived | $KohaDates %]
</td>
<td class="cell" align="right">

Write Preview
Loading…
Cancel
Save