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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-2 / +2 lines)
Lines 125-131 Link Here
125
[% INCLUDE 'header.inc' %]
125
[% INCLUDE 'header.inc' %]
126
[% INCLUDE 'acquisitions-search.inc' %]
126
[% INCLUDE 'acquisitions-search.inc' %]
127
127
128
<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; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> &rsaquo; Receive items from : [% name %] [% IF ( invoice ) %][[% invoice %]][% END %] (order #[% ordernumber %])</div>
128
<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; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> &rsaquo; Receive items from : [% name %] [% IF ( invoice ) %][[% invoice |html %]][% END %] (order #[% ordernumber %])</div>
129
129
130
<div id="doc3" class="yui-t2">
130
<div id="doc3" class="yui-t2">
131
   
131
   
Lines 133-139 Link Here
133
	<div id="yui-main">
133
	<div id="yui-main">
134
	<div class="yui-b">
134
	<div class="yui-b">
135
135
136
<h1>Receive items from : [% name %] [% IF ( invoice ) %][[% invoice %]] [% END %] (order #[% ordernumber %])</h1>
136
<h1>Receive items from : [% name %] [% IF ( invoice ) %][[% invoice |html %]] [% END %] (order #[% ordernumber %])</h1>
137
137
138
[% IF ( count ) %]
138
[% IF ( count ) %]
139
    <form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post" onsubmit="return Check(this);">
139
    <form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post" onsubmit="return Check(this);">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-3 / +3 lines)
Lines 150-156 Link Here
150
    [% IF datereceived %]
150
    [% IF datereceived %]
151
        Receipt summary for <i>[% name %]</i>
151
        Receipt summary for <i>[% name %]</i>
152
        [% IF ( invoice ) %]
152
        [% IF ( invoice ) %]
153
            <i>[ [% invoice %] ]</i>
153
            <i>[ [% invoice |html %] ]</i>
154
        [% END %]
154
        [% END %]
155
        on <i>[% datereceived | $KohaDates %]</i>
155
        on <i>[% datereceived | $KohaDates %]</i>
156
    [% ELSE %]
156
    [% ELSE %]
Lines 175-181 Link Here
175
	[% END %]
175
	[% END %]
176
    <h1>
176
    <h1>
177
        [% IF datereceived %]
177
        [% IF datereceived %]
178
            Receipt summary for <i>[% name %]</i> [% IF ( invoice ) %] <i> [ [% invoice %] ] </i>[% END %] on <i>[% datereceived | $KohaDates %]</i>
178
            Receipt summary for <i>[% name %]</i> [% IF ( invoice ) %] <i> [ [% invoice |html %] ] </i>[% END %] on <i>[% datereceived | $KohaDates %]</i>
179
        [% ELSE %]
179
        [% ELSE %]
180
            Receive orders from [% name %]
180
            Receive orders from [% name %]
181
        [% END %]
181
        [% END %]
Lines 218-224 Link Here
218
218
219
[% UNLESS no_orders_to_display %]
219
[% UNLESS no_orders_to_display %]
220
<div id="acqui_receive_summary">
220
<div id="acqui_receive_summary">
221
<p><strong>Invoice number:</strong> [% invoice %] <strong>Received by:</strong> [% loggedinusername %] <strong>On:</strong> [% datereceived | $KohaDates %]</p>
221
<p><strong>Invoice number:</strong> [% invoice |html %] <strong>Received by:</strong> [% loggedinusername %] <strong>On:</strong> [% datereceived | $KohaDates %]</p>
222
</div>
222
</div>
223
[% UNLESS (invoiceclosedate) %]
223
[% UNLESS (invoiceclosedate) %]
224
  <div id="acqui_receive_search">
224
  <div id="acqui_receive_search">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt (-2 / +1 lines)
Lines 107-113 Link Here
107
            </td>
107
            </td>
108
            <td>
108
            <td>
109
                [% IF ( searchresult.code ) %]
109
                [% IF ( searchresult.code ) %]
110
                    <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% searchresult.invoiceid %]">[% searchresult.code %]</a>
110
                    <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% searchresult.invoiceid %]">[% searchresult.code |html %]</a>
111
                [% ELSE %]
111
                [% ELSE %]
112
                    <abbr title="not available">n/a</abbr>
112
                    <abbr title="not available">n/a</abbr>
113
                [% END %]
113
                [% END %]
114
- 

Return to bug 19114