View | Details | Raw Unified | Return to bug 929
Collapse All | Expand All

(-)a/acqui/ordered.pl (-2 / +2 lines)
Lines 38-45 use C4::Dates; Link Here
38
my $dbh     = C4::Context->dbh;
38
my $dbh     = C4::Context->dbh;
39
my $input   = new CGI;
39
my $input   = new CGI;
40
my $fund_id = $input->param('fund');
40
my $fund_id = $input->param('fund');
41
my $start   = $input->param('start');
41
my $fund_code = $input->param('fund_code');
42
my $end     = $input->param('end');
43
42
44
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
43
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
45
    {
44
    {
Lines 103-108 $total = sprintf( "%.2f", $total ); Link Here
103
$template->{VARS}->{'fund'}    = $fund_id;
102
$template->{VARS}->{'fund'}    = $fund_id;
104
$template->{VARS}->{'ordered'} = \@ordered;
103
$template->{VARS}->{'ordered'} = \@ordered;
105
$template->{VARS}->{'total'}   = $total;
104
$template->{VARS}->{'total'}   = $total;
105
$template->{VARS}->{'fund_code'} = $fund_code;
106
106
107
$sth->finish;
107
$sth->finish;
108
108
(-)a/acqui/spent.pl (-2 / +2 lines)
Lines 40-47 use CGI; Link Here
40
my $dbh      = C4::Context->dbh;
40
my $dbh      = C4::Context->dbh;
41
my $input    = new CGI;
41
my $input    = new CGI;
42
my $bookfund = $input->param('fund');
42
my $bookfund = $input->param('fund');
43
my $start    = $input->param('start');
43
my $fund_code = $input->param('fund_code');
44
my $end      = $input->param('end');
45
44
46
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
45
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
47
    {
46
    {
Lines 107-112 $total = sprintf( "%.2f", $total ); Link Here
107
$template->{VARS}->{'fund'}  = $bookfund;
106
$template->{VARS}->{'fund'}  = $bookfund;
108
$template->{VARS}->{'spent'} = \@spent;
107
$template->{VARS}->{'spent'} = \@spent;
109
$template->{VARS}->{'total'} = $total;
108
$template->{VARS}->{'total'} = $total;
109
$template->{VARS}->{'fund_code'} = $fund_code;
110
$sth->finish;
110
$sth->finish;
111
111
112
output_html_with_http_headers $input, $cookie, $template->output;
112
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt (-4 / +4 lines)
Lines 122-129 $(document).ready(function() { Link Here
122
                <td align="center">[% loop_budge.budget_owner %]</td>
122
                <td align="center">[% loop_budge.budget_owner %]</td>
123
                <td align="center">[% loop_budge.budget_branchname %]</td>
123
                <td align="center">[% loop_budge.budget_branchname %]</td>
124
                <td align="right" >[% loop_budge.budget_amount %]</td>
124
                <td align="right" >[% loop_budge.budget_amount %]</td>
125
                <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]">[% loop_budge.budget_ordered %]</a></td>
125
                <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td>
126
                <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]">[% loop_budge.budget_spent %]</a></td>
126
                <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td>
127
                <td align="right" >[% loop_budge.budget_avail %]</td>
127
                <td align="right" >[% loop_budge.budget_avail %]</td>
128
            </tr>
128
            </tr>
129
            [% ELSE %]
129
            [% ELSE %]
Lines 136-143 $(document).ready(function() { Link Here
136
                <td align="center">[% loop_budge.budget_owner %]</td>
136
                <td align="center">[% loop_budge.budget_owner %]</td>
137
                <td align="center">[% loop_budge.budget_branchname %]</td>
137
                <td align="center">[% loop_budge.budget_branchname %]</td>
138
                <td align="right" >[% loop_budge.budget_amount %]</td>
138
                <td align="right" >[% loop_budge.budget_amount %]</td>
139
                <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]">[% loop_budge.budget_ordered %]</a></td>
139
                <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td>
140
                <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]">[% loop_budge.budget_spent %]</a></td>
140
                <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td>
141
                <td align="right" >[% loop_budge.budget_avail %]</td>
141
                <td align="right" >[% loop_budge.budget_avail %]</td>
142
            [% END %]
142
            [% END %]
143
        [% END %]
143
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt (-5 / +5 lines)
Lines 7-13 Link Here
7
[% INCLUDE 'header.inc' %]
7
[% INCLUDE 'header.inc' %]
8
[% INCLUDE 'acquisitions-search.inc' %]
8
[% INCLUDE 'acquisitions-search.inc' %]
9
9
10
<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>
10
<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>
11
11
12
<div id="doc3" class="yui-t2">
12
<div id="doc3" class="yui-t2">
13
13
Lines 15-22 Link Here
15
    <div id="yui-main">
15
    <div id="yui-main">
16
        <div class="yui-b">
16
        <div class="yui-b">
17
17
18
<h1>Bookfunds</h1>
18
<h1>Fund: [% fund_code %]</h1>
19
<h2>Ordered - [% fund %]</h2>
19
<h2>Ordered</h2>
20
20
21
<table cellspacing="0" cellpadding="0" border="0" id="spent" class="collapse">
21
<table cellspacing="0" cellpadding="0" border="0" id="spent" class="collapse">
22
    <thead>
22
    <thead>
Lines 54-62 Link Here
54
	    [% order.left %]	
54
	    [% order.left %]	
55
	</td>
55
	</td>
56
	<td class="cell" align="right">
56
	<td class="cell" align="right">
57
	    [% order.ecost %]	
57
	    [% order.ecost %]
58
	</td>
58
	</td>
59
	<td class="cell">
59
	<td class="cell" align="right">
60
	    [% order.entrydate | $KohaDates %]
60
	    [% order.entrydate | $KohaDates %]
61
	</td>
61
	</td>
62
	<td class="cell" align="right">
62
	<td class="cell" align="right">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt (-7 / +6 lines)
Lines 7-13 Link Here
7
[% INCLUDE 'header.inc' %]
7
[% INCLUDE 'header.inc' %]
8
[% INCLUDE 'acquisitions-search.inc' %]
8
[% INCLUDE 'acquisitions-search.inc' %]
9
9
10
<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>
10
<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>
11
11
12
<div id="doc3" class="yui-t2">
12
<div id="doc3" class="yui-t2">
13
13
Lines 15-21 Link Here
15
    <div id="yui-main">
15
    <div id="yui-main">
16
        <div class="yui-b">
16
        <div class="yui-b">
17
17
18
<h1>Bookfund [% fund %]</h1>
18
<h1>Fund: [% fund_code %]</h1>
19
<h2>Spent</h2>
19
<h2>Spent</h2>
20
20
21
21
Lines 65-77 Link Here
65
	    [% order.unitprice %]		
65
	    [% order.unitprice %]		
66
	</td>
66
	</td>
67
	<td class="cell" align="right">
67
	<td class="cell" align="right">
68
	    [% order.freight %]		
68
	    [% order.freight %]
69
	</td>
69
	</td>
70
	<td class="cell">
70
	<td class="cell" align="right">
71
	    [% order.entrydate | $KohaDates %]
71
	    [% order.entrydate | $KohaDates %]
72
	</td>
72
	</td>
73
	<td class="cell">
73
	<td class="cell" align="right">
74
	    [% order.datereceived | $KohaDates %]		
74
	    [% order.datereceived | $KohaDates %]
75
	</td>
75
	</td>
76
	<td class="cell" align="right">
76
	<td class="cell" align="right">
77
	    [% order.subtotal %]		
77
	    [% order.subtotal %]		
78
- 

Return to bug 929