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

(-)a/acqui/parcel.pl (-2 / +2 lines)
Lines 283-289 $template->param( Link Here
283
    invoiceid             => $invoice->{invoiceid},
283
    invoiceid             => $invoice->{invoiceid},
284
    invoice               => $invoice->{invoicenumber},
284
    invoice               => $invoice->{invoicenumber},
285
    invoiceclosedate      => $invoice->{closedate},
285
    invoiceclosedate      => $invoice->{closedate},
286
    datereceived          => dt_from_string,
286
    shipmentdate         => $invoice->{shipmentdate},
287
    name                  => $bookseller->name,
287
    name                  => $bookseller->name,
288
    booksellerid          => $bookseller->id,
288
    booksellerid          => $bookseller->id,
289
    loop_received         => \@loop_received,
289
    loop_received         => \@loop_received,
Lines 293-298 $template->param( Link Here
293
    total_tax_excluded    => $total_tax_excluded,
293
    total_tax_excluded    => $total_tax_excluded,
294
    total_tax_included    => $total_tax_included,
294
    total_tax_included    => $total_tax_included,
295
    subtotal_for_funds    => $subtotal_for_funds,
295
    subtotal_for_funds    => $subtotal_for_funds,
296
    sticky_filters       => $sticky_filters,
296
    sticky_filters        => $sticky_filters,
297
);
297
);
298
output_html_with_http_headers $input, $cookie, $template->output;
298
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-8 / +12 lines)
Lines 7-14 Link Here
7
[% PROCESS 'i18n.inc' %]
7
[% PROCESS 'i18n.inc' %]
8
[% SET footerjs = 1 %]
8
[% SET footerjs = 1 %]
9
[% INCLUDE 'doc-head-open.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
10
<title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( date ) %]
10
<title>
11
            Receipt summary for [% name | html %] [% IF ( invoice ) %]invoice [% invoice | html %][% END %] on [% datereceived | $KohaDates %][% ELSE %]Receive orders from [% name | html %][% END %]</title>
11
    Koha &rsaquo; Acquisitions &rsaquo;
12
    [% IF ( invoiceclosedate ) %]
13
        Receipt summary for [% name | html %] [% IF ( invoice ) %]invoice [% invoice | html %][% END %]
14
    [% ELSE %]
15
        Receive orders from [% name | html %]
16
    [% END %]
17
</title>
12
[% INCLUDE 'doc-head-close.inc' %]
18
[% INCLUDE 'doc-head-close.inc' %]
13
</head>
19
</head>
14
20
Lines 17-28 Link Here
17
[% INCLUDE 'acquisitions-search.inc' %]
23
[% INCLUDE 'acquisitions-search.inc' %]
18
24
19
<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;
25
<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;
20
    [% IF datereceived %]
26
    [% IF invoiceclosedate %]
21
        Receipt summary for <em>[% name | html %]</em>
27
        Receipt summary for <em>[% name | html %]</em>
22
        [% IF ( invoice ) %]
28
        [% IF ( invoice ) %]
23
            <em>[ [% invoice | html %] ]</em>
29
            <em>[ [% invoice | html %] ]</em>
24
        [% END %]
30
        [% END %]
25
        on <em>[% datereceived | $KohaDates %]</em>
26
    [% ELSE %]
31
    [% ELSE %]
27
        Receive orders from [% name | html %]
32
        Receive orders from [% name | html %]
28
    [% END %]
33
    [% END %]
Lines 45-52 Link Here
45
	</div>
50
	</div>
46
	[% END %]
51
	[% END %]
47
    <h1>
52
    <h1>
48
        [% IF datereceived %]
53
        [% IF ( invoiceclosedate ) %]
49
            Receipt summary for <em>[% name | html %]</em> [% IF ( invoice ) %] <em> [ [% invoice | html %] ] </em>[% END %] on <em>[% datereceived | $KohaDates %]</em>
54
        Receipt summary for <em>[% name | html %]</em> [% IF ( invoice ) %] <em> [ [% invoice | html %] ] </em>[% END %]
50
        [% ELSE %]
55
        [% ELSE %]
51
            Receive orders from [% name | html %]
56
            Receive orders from [% name | html %]
52
        [% END %]
57
        [% END %]
Lines 89-95 Link Here
89
94
90
[% UNLESS no_orders_to_display %]
95
[% UNLESS no_orders_to_display %]
91
<div id="acqui_receive_summary">
96
<div id="acqui_receive_summary">
92
<p><strong>Invoice number:</strong> [% invoice | html %] <strong>Received by:</strong> [% logged_in_user.userid | html %] <strong>On:</strong> [% datereceived | $KohaDates %]</p>
97
<p><strong>Invoice number:</strong> [% invoice | html %] <strong>Shipment date:</strong> [% shipmentdate | $KohaDates %]</p>
93
</div>
98
</div>
94
[% UNLESS (invoiceclosedate) %]
99
[% UNLESS (invoiceclosedate) %]
95
  <div id="acqui_receive_search">
100
  <div id="acqui_receive_search">
96
- 

Return to bug 17458