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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/filter-orders.inc (-1 / +1 lines)
Lines 78-84 Link Here
78
                  [% ELSE %]
78
                  [% ELSE %]
79
                    <option type="text" value="[% h_loo.budget_id | html %]" branchcode="[% h_loo.budget_branchcode | html %]">
79
                    <option type="text" value="[% h_loo.budget_id | html %]" branchcode="[% h_loo.budget_branchcode | html %]">
80
                  [% END %]
80
                  [% END %]
81
                        [% h_loo.budget_display_name %]
81
                        [% h_loo.budget_display_name | html %]
82
                    </option>
82
                    </option>
83
                [% END %]
83
                [% END %]
84
                </optgroup>
84
                </optgroup>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt (-37 / +37 lines)
Lines 1-3 Link Here
1
[% USE raw %]
1
[% USE Asset %]
2
[% USE Asset %]
2
[% USE Koha %]
3
[% USE Koha %]
3
[% USE KohaDates %]
4
[% USE KohaDates %]
Lines 5-15 Link Here
5
[% INCLUDE 'doc-head-open.inc' %]
6
[% INCLUDE 'doc-head-open.inc' %]
6
<title>Koha &rsaquo; Acquisitions &rsaquo;
7
<title>Koha &rsaquo; Acquisitions &rsaquo;
7
[% UNLESS blocking_error %]
8
[% UNLESS blocking_error %]
8
Basket [% basket.basketno %] &rsaquo; Duplicate existing orders
9
Basket [% basket.basketno | html %] &rsaquo; Duplicate existing orders
9
[% END %]
10
[% END %]
10
</title>
11
</title>
11
[% INCLUDE 'doc-head-close.inc' %]
12
[% INCLUDE 'doc-head-close.inc' %]
12
[% Asset.css("css/datatables.css") %]
13
[% Asset.css("css/datatables.css") | $raw %]
13
<style type="text/css">
14
<style type="text/css">
14
    .picked_to_duplicate > td { background-color: #bcdb89 !important; }
15
    .picked_to_duplicate > td { background-color: #bcdb89 !important; }
15
</style>
16
</style>
Lines 24-31 Basket [% basket.basketno %] &rsaquo; Duplicate existing orders Link Here
24
    <a href="/cgi-bin/koha/mainpage.pl">Home</a>
25
    <a href="/cgi-bin/koha/mainpage.pl">Home</a>
25
    &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
26
    &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
26
    [% UNLESS blocking_error %]
27
    [% UNLESS blocking_error %]
27
    &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% vendor.id %]">[% vendor.name %]</a>
28
    &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% vendor.id | uri %]">[% vendor.name | html %]</a>
28
    &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno %]">Basket [% basket.basketno %]</a>
29
    &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]">Basket [% basket.basketno | html %]</a>
29
    &rsaquo; Duplicate existing orders
30
    &rsaquo; Duplicate existing orders
30
    [% END %]
31
    [% END %]
31
</div>
32
</div>
Lines 54-62 Basket [% basket.basketno %] &rsaquo; Duplicate existing orders Link Here
54
        <div id="orders_filters">
55
        <div id="orders_filters">
55
            [% INCLUDE 'filter-orders.inc' %]
56
            [% INCLUDE 'filter-orders.inc' %]
56
            <input type="hidden" name="op" value="select" />
57
            <input type="hidden" name="op" value="select" />
57
            <input type="hidden" name="basketno" value="[% basket.basketno %]" />
58
            <input type="hidden" name="basketno" value="[% basket.basketno | html %]" />
58
59
59
            <input type="hidden" name="ordernumbers" value="[% ordernumbers.join(',') %]" />
60
            <input type="hidden" name="ordernumbers" value="[% ordernumbers.join(',') | html %]" />
60
            <fieldset class="action"><input type="submit" value="Search" /></fieldset>
61
            <fieldset class="action"><input type="submit" value="Search" /></fieldset>
61
        </div>
62
        </div>
62
    </fieldset>
63
    </fieldset>
Lines 65-82 Basket [% basket.basketno %] &rsaquo; Duplicate existing orders Link Here
65
66
66
[% BLOCK display_order_line %]
67
[% BLOCK display_order_line %]
67
    [% IF selected %]
68
    [% IF selected %]
68
    <tr class="picked_to_duplicate" data-ordernumber="[% order.ordernumber %]">
69
    <tr class="picked_to_duplicate" data-ordernumber="[% order.ordernumber | html %]">
69
    [% ELSE %]
70
    [% ELSE %]
70
    <tr data-ordernumber="[% order.ordernumber %]">
71
    <tr data-ordernumber="[% order.ordernumber | html %]">
71
    [% END %]
72
    [% END %]
72
        <td>
73
        <td>
73
            [% IF selected %]
74
            [% IF selected %]
74
                <input type="checkbox" name="ordernumber" value="[% order.ordernumber %]" checked="checked" />
75
                <input type="checkbox" name="ordernumber" value="[% order.ordernumber | html %]" checked="checked" />
75
            [% ELSE %]
76
            [% ELSE %]
76
                <input type="checkbox" name="ordernumber" value="[% order.ordernumber %]" />
77
                <input type="checkbox" name="ordernumber" value="[% order.ordernumber | html %]" />
77
            [% END %]
78
            [% END %]
78
            [% order.ordernumber %]
79
            [% order.ordernumber %]
79
            [% IF order.ordernumber != order.parent_ordernumber %]([% order.parent_ordernumber %])[% END %]
80
            [% IF order.ordernumber != order.parent_ordernumber %]([% order.parent_ordernumber | html %])[% END %]
80
        </td>
81
        </td>
81
        <td>
82
        <td>
82
            [% SWITCH order.orderstatus %]
83
            [% SWITCH order.orderstatus %]
Lines 87-124 Basket [% basket.basketno %] &rsaquo; Duplicate existing orders Link Here
87
                [% CASE 'cancelled' %]Cancelled
88
                [% CASE 'cancelled' %]Cancelled
88
            [% END %]
89
            [% END %]
89
        </td>
90
        </td>
90
        <td>[% order.basketname %] (<a href="basket.pl?basketno=[% order.basketno %]">[% order.basketno %]</a>)</td>
91
        <td>[% order.basketname | html %] (<a href="basket.pl?basketno=[% order.basketno | uri %]">[% order.basketno | html %]</a>)</td>
91
        <td>[% order.authorisedbyname %]</td>
92
        <td>[% order.authorisedbyname | html %]</td>
92
        <td>
93
        <td>
93
            [% IF ( order.basketgroupid ) %]
94
            [% IF ( order.basketgroupid ) %]
94
                [% order.groupname %] (<a href="basketgroup.pl?op=add&booksellerid=[% order.id %]&basketgroupid=[% order.basketgroupid %]">[% order.basketgroupid %]</a>)
95
                [% order.groupname | html %] (<a href="basketgroup.pl?op=add&booksellerid=[% order.id | uri %]&basketgroupid=[% order.basketgroupid %]">[% order.basketgroupid | html %]</a>)
95
            [% ELSE %]
96
            [% ELSE %]
96
                &nbsp;
97
                &nbsp;
97
            [% END %]
98
            [% END %]
98
        </td>
99
        </td>
99
        <td>[% IF ( order.invoicenumber ) %]
100
        <td>[% IF ( order.invoicenumber ) %]
100
                <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% order.invoiceid %]">[% order.invoicenumber %]</a>
101
                <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% order.invoiceid | uri %]">[% order.invoicenumber | html %]</a>
101
            [% ELSE %]
102
            [% ELSE %]
102
                &nbsp;
103
                &nbsp;
103
            [% END %]
104
            [% END %]
104
        </td>
105
        </td>
105
        <td>
106
        <td>
106
            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title |html %]</a>
107
            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]">[% order.title |html %]</a>
107
            <br />[% order.author %] <br /> [% order.isbn %]
108
            <br />[% order.author | html %] <br /> [% order.isbn | html %]
108
        </td>
109
        </td>
109
        <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.id %]">[% order.name %]</a></td>
110
        <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.id | uri %]">[% order.name | html %]</a></td>
110
        <td><span title="[% order.creationdate %]">[% order.creationdate | $KohaDates %]</span></td>
111
        <td><span title="[% order.creationdate %]">[% order.creationdate | $KohaDates %]</span></td>
111
        <td>
112
        <td>
112
            [% IF order.datereceived %]
113
            [% IF order.datereceived %]
113
                <span title="[% order.datereceived %]">[% order.datereceived | $KohaDates %]</span>
114
                <span title="[% order.datereceived | html %]">[% order.datereceived | $KohaDates %]</span>
114
            [% ELSE %]
115
            [% ELSE %]
115
                <span title="0000-00-00"></span>
116
                <span title="0000-00-00"></span>
116
            [% END %]
117
            [% END %]
117
        </td>
118
        </td>
118
        <td>[% order.quantityreceived %]</td>
119
        <td>[% order.quantityreceived | html %]</td>
119
        <td>[% order.quantity %]</td>
120
        <td>[% order.quantity | html %]</td>
120
        <td>[% order.ecost %]</td>
121
        <td>[% order.ecost | html %]</td>
121
        <td>[% order.budget_name %]</td>
122
        <td>[% order.budget_name | html %]</td>
122
    </tr>
123
    </tr>
123
[% END %]
124
[% END %]
124
125
Lines 163-169 Basket [% basket.basketno %] &rsaquo; Duplicate existing orders Link Here
163
        </table>
164
        </table>
164
        <fieldset class="action">
165
        <fieldset class="action">
165
            <input type="hidden" name="op" value="batch_edit" />
166
            <input type="hidden" name="op" value="batch_edit" />
166
            <input type="hidden" name="basketno" value="[% basket.basketno %]" />
167
            <input type="hidden" name="basketno" value="[% basket.basketno | html %]" />
167
            <button type="submit" class="btn btn-default go_to_batch_edit">Next <i class="fa fa-fw fa-arrow-right"></i></button>
168
            <button type="submit" class="btn btn-default go_to_batch_edit">Next <i class="fa fa-fw fa-arrow-right"></i></button>
168
        </fieldset>
169
        </fieldset>
169
        </form>
170
        </form>
Lines 188-196 Basket [% basket.basketno %] &rsaquo; Duplicate existing orders Link Here
188
                          <select name="all_currency" id="all_currency">
189
                          <select name="all_currency" id="all_currency">
189
                          [% FOREACH currency IN currencies %]
190
                          [% FOREACH currency IN currencies %]
190
                              [% IF currency.currency == vendor.listprice %]
191
                              [% IF currency.currency == vendor.listprice %]
191
                                  <option value="[% currency.currency %]" selected="selected">[% currency.currency %]</option>
192
                                  <option value="[% currency.currency | html %]" selected="selected">[% currency.currency | html %]</option>
192
                              [% ELSIF not currency.archived %]
193
                              [% ELSIF not currency.archived %]
193
                                  <option value="[% currency.currency %]">[% currency.currency %]</option>
194
                                  <option value="[% currency.currency | html %]">[% currency.currency | html %]</option>
194
                              [% END %]
195
                              [% END %]
195
                          [% END %]
196
                          [% END %]
196
                          </select>
197
                          </select>
Lines 202-209 Basket [% basket.basketno %] &rsaquo; Duplicate existing orders Link Here
202
                          <select id="all_budget_id" size="1" name="all_budget_id">
203
                          <select id="all_budget_id" size="1" name="all_budget_id">
203
                            <option value="">Select a fund</option>
204
                            <option value="">Select a fund</option>
204
                          [% FOREACH budget_loo IN budget_loop %]
205
                          [% FOREACH budget_loo IN budget_loop %]
205
                              [% IF ( budget_loo.b_active ) %]<option value="[% budget_loo.b_id %]" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]">[% budget_loo.b_txt %]</option>
206
                              [% IF ( budget_loo.b_active ) %]<option value="[% budget_loo.b_id | html %]" data-sort1-authcat="[% budget_loo.b_sort1_authcat | html %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat | html %]">[% budget_loo.b_txt | html %]</option>
206
                              [% ELSE %]<option value="[% budget_loo.b_id %]" class="b_inactive" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]">[% budget_loo.b_txt %] (inactive)</option>
207
                              [% ELSE %]<option value="[% budget_loo.b_id | html %]" class="b_inactive" data-sort1-authcat="[% budget_loo.b_sort1_authcat | html %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat | html %]">[% budget_loo.b_txt | html %] (inactive)</option>
207
                              [% END %]
208
                              [% END %]
208
                          [% END %]
209
                          [% END %]
209
                          </select>
210
                          </select>
Lines 244-253 Basket [% basket.basketno %] &rsaquo; Duplicate existing orders Link Here
244
245
245
    <fieldset class="action">
246
    <fieldset class="action">
246
        [% FOREACH ordernumber IN ordernumbers %]
247
        [% FOREACH ordernumber IN ordernumbers %]
247
            <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
248
            <input type="hidden" name="ordernumber" value="[% ordernumber | html %]" />
248
        [% END %]
249
        [% END %]
249
        <input type="hidden" name="op" value="do_duplicate" />
250
        <input type="hidden" name="op" value="do_duplicate" />
250
        <input type="hidden" name="basketno" value="[% basket.basketno %]" />
251
        <input type="hidden" name="basketno" value="[% basket.basketno | html %]" />
251
        <button type="submit" class="btn btn-default">Duplicate orders</button>
252
        <button type="submit" class="btn btn-default">Duplicate orders</button>
252
        <a class="cancel" href="/cgi-bin/koha/acqui/duplicate_orders.pl?basketno=[% basket.basketno %]">Cancel</a>
253
        <a class="cancel" href="/cgi-bin/koha/acqui/duplicate_orders.pl?basketno=[% basket.basketno %]">Cancel</a>
253
    </fieldset>
254
    </fieldset>
Lines 297-310 Basket [% basket.basketno %] &rsaquo; Duplicate existing orders Link Here
297
</div>
298
</div>
298
299
299
[% MACRO jsinclude BLOCK %]
300
[% MACRO jsinclude BLOCK %]
300
    [% Asset.js("js/acquisitions-menu.js") %]
301
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
301
    [% INCLUDE 'calendar.inc' %]
302
    [% INCLUDE 'calendar.inc' %]
302
    [% INCLUDE 'datatables.inc' %]
303
    [% INCLUDE 'datatables.inc' %]
303
    [% INCLUDE 'columns_settings.inc' %]
304
    [% INCLUDE 'columns_settings.inc' %]
304
    [% Asset.js("js/autocomplete/patrons.js") %]
305
    [% Asset.js("js/autocomplete/patrons.js") | $raw %]
305
    [% Asset.js("js/acq.js") %]
306
    [% Asset.js("js/acq.js") | $raw %]
306
    [% Asset.js("js/funds_sorts.js") %]
307
    [% Asset.js("js/funds_sorts.js") | $raw %]
307
    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %]
308
    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
308
    <script>
309
    <script>
309
        function update_ordernumber_list(){
310
        function update_ordernumber_list(){
310
            var ordernumbers = [];
311
            var ordernumbers = [];
Lines 319-325 Basket [% basket.basketno %] &rsaquo; Duplicate existing orders Link Here
319
        var MSG_NO_FUND_SELECTED = _("No fund selected.");
320
        var MSG_NO_FUND_SELECTED = _("No fund selected.");
320
        $(document).ready(function() {
321
        $(document).ready(function() {
321
            $('.hint').hide();
322
            $('.hint').hide();
322
            var columns_settings;// = [% ColumnsSettings.GetColumns( 'acqui', 'histsearch', 'histsearcht', 'json' ) %];
323
            var columns_settings;// = [% ColumnsSettings.GetColumns( 'acqui', 'histsearch', 'histsearcht', 'json' ) | $raw %];
323
            KohaTable("table_orders", {
324
            KohaTable("table_orders", {
324
                "aoColumnDefs": [
325
                "aoColumnDefs": [
325
                    { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
326
                    { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
326
- 

Return to bug 15184