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

(-)a/acqui/addorder.pl (-1 / +1 lines)
Lines 137-143 use Koha::Acquisition::Currencies qw( get_active ); Link Here
137
use Koha::Acquisition::Orders;
137
use Koha::Acquisition::Orders;
138
use Koha::Acquisition::Baskets;
138
use Koha::Acquisition::Baskets;
139
use C4::Barcodes;
139
use C4::Barcodes;
140
use Koha::DateUtils;
140
use Koha::DateUtils q( dt_from_string );
141
141
142
### "-------------------- addorder.pl ----------"
142
### "-------------------- addorder.pl ----------"
143
143
(-)a/acqui/moddeliverydate.pl (-1 / +1 lines)
Lines 43-49 my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( { Link Here
43
    template_name   => 'acqui/moddeliverydate.tt',
43
    template_name   => 'acqui/moddeliverydate.tt',
44
    query           => $input,
44
    query           => $input,
45
    type            => 'intranet',
45
    type            => 'intranet',
46
    flagsrequired   => { 'acquisition' => '*' },
46
    flagsrequired   => { 'acquisition' => 'order_manage' },
47
    debug           => 1,
47
    debug           => 1,
48
} );
48
} );
49
49
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt (-4 / +6 lines)
Lines 110-118 Link Here
110
            <td data-order="[% estimated_delivery_date | html %]">
110
            <td data-order="[% estimated_delivery_date | html %]">
111
                <p class="delivery_date">
111
                <p class="delivery_date">
112
                    <span id="delivery_date_[% estimated_delivery_date | html %]">[% estimated_delivery_date | $KohaDates %]</span>
112
                    <span id="delivery_date_[% estimated_delivery_date | html %]">[% estimated_delivery_date | $KohaDates %]</span>
113
                    <a class="edit_delivery_date noExport" data-ordernumber="[% lateorder.ordernumber | html %]" href="/cgi-bin/koha/acqui/moddeliverydate.pl?ordernumber=[% lateorder.ordernumber | html %]" title="Edit delivery date">
113
                    [% IF CAN_user_acquisition_order_manage %]
114
                        <i class="fa fa-pencil"></i> Edit
114
                        <a class="edit_delivery_date noExport" data-ordernumber="[% lateorder.ordernumber | html %]" href="/cgi-bin/koha/acqui/moddeliverydate.pl?ordernumber=[% lateorder.ordernumber | html %]" title="Edit delivery date">
115
                    </a>
115
                            <i class="fa fa-pencil"></i> Edit
116
                        </a>
117
                    [% END %]
116
                </p>
118
                </p>
117
            </td>
119
            </td>
118
            <td>
120
            <td>
Lines 199-205 Link Here
199
      </tbody>
201
      </tbody>
200
      <tfoot>
202
      <tfoot>
201
        <tr>
203
        <tr>
202
            <th colspan="7">Total</th>
204
            <th colspan="6">Total</th>
203
            <th>[% total_quantity | html %]</th>
205
            <th>[% total_quantity | html %]</th>
204
            <th>[% total | $Price %]</th>
206
            <th>[% total | $Price %]</th>
205
            <th colspan="10">&nbsp;</th>
207
            <th colspan="10">&nbsp;</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt (-5 / +20 lines)
Lines 1-15 Link Here
1
[% SET footerjs = 1 %]
1
[% SET footerjs = 1 %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
<title>Koha &rsaquo; Acquisition &rsaquo;
3
<title>Change estimated delivery date &rsaquo; Acquisitions &rsaquo; Koha</title>
4
    Change estimated delivery date
5
</title>
6
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
7
</head>
5
</head>
8
6
9
<body id="acq_moddeliverydate" class="acq">
7
<body id="acq_moddeliverydate" class="acq">
10
[% INCLUDE 'header.inc' %]
8
[% INCLUDE 'header.inc' %]
11
9
12
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Basket [% basketname | html %] ([% basketno | html %])</a> &rsaquo; Change estimated delivery date</div>
10
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
11
    <ol>
12
        <li>
13
            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
14
        </li>
15
        <li>
16
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a>
17
        </li>
18
        <li>
19
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a>
20
        </li>
21
        <li>
22
            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Basket [% basketname | html %] ([% basketno | html %])</a>
23
        </li>
24
        <li>
25
            <a href="#" aria-current="page">Change estimated delivery date</a>
26
        </li>
27
    </ol>
28
</nav>
13
29
14
<div class="main container-fluid">
30
<div class="main container-fluid">
15
    <div class="row">
31
    <div class="row">
16
- 

Return to bug 15348