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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-2 / +2 lines)
Lines 398-404 Link Here
398
                        <th>File name</th>
398
                        <th>File name</th>
399
                        <th>Comments</th>
399
                        <th>Comments</th>
400
                        <th>Status</th>
400
                        <th>Status</th>
401
                        <th class="title-string">Staged</th>
401
                        <th>Staged</th>
402
                        <th># Bibliographic records</th>
402
                        <th># Bibliographic records</th>
403
                        <th class="NoSort">&nbsp;</th>
403
                        <th class="NoSort">&nbsp;</th>
404
                      </tr>
404
                      </tr>
Lines 425-431 Link Here
425
                            [% batch_lis.import_status | html %]
425
                            [% batch_lis.import_status | html %]
426
                          [% END %]
426
                          [% END %]
427
                        </td>
427
                        </td>
428
                        <td><span title="[% batch_lis.staged_date | html %]">[% batch_lis.staged_date | $KohaDates  with_hours => 1 %]</span></td>
428
                        <td data-order="[% batch_lis.staged_date | html %]">[% batch_lis.staged_date | $KohaDates  with_hours => 1 %]</td>
429
                        <td>[% batch_lis.num_records | html %]</td>
429
                        <td>[% batch_lis.num_records | html %]</td>
430
                        <td class="actions">
430
                        <td class="actions">
431
                            <a href="[% batch_lis.scriptname | url %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add orders</a>
431
                            <a href="[% batch_lis.scriptname | url %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add orders</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt (-25 / +17 lines)
Lines 85-97 Link Here
85
                                <tr>
85
                                <tr>
86
                                    <th>No.</th>
86
                                    <th>No.</th>
87
                                    <th>Name</th>
87
                                    <th>Name</th>
88
                                    <th class="title-numeric">Item count</th>
88
                                    <th>Item count</th>
89
                                    <th class="title-numeric">Bibliographic record count</th>
89
                                    <th>Bibliographic record count</th>
90
                                    <th>Items expected</th>
90
                                    <th>Items expected</th>
91
                                    <th>[% tp('basket created by', 'Created by') | html %]</th>
91
                                    <th>[% tp('basket created by', 'Created by') | html %]</th>
92
                                    <th class="title-string">Date</th>
92
                                    <th>Date</th>
93
                                    <th>Basket group</th>
93
                                    <th>Basket group</th>
94
                                    <th class="title-string">Closed</th>
94
                                    <th>Closed</th>
95
                                    <th class="noExport">Actions</th>
95
                                    <th class="noExport">Actions</th>
96
                                </tr>
96
                                </tr>
97
                            </thead>
97
                            </thead>
Lines 104-122 Link Here
104
                                    [% END %]
104
                                    [% END %]
105
                                        <td>[% basket.basketno | html %]</td>
105
                                        <td>[% basket.basketno | html %]</td>
106
                                        <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]">[% basket.basketname | html %]</a></td>
106
                                        <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]">[% basket.basketname | html %]</a></td>
107
                                        <td>
107
                                        <td data-order="[% basket.total_items | html %]">
108
                                            <span title="[% basket.total_items | html %]">[% basket.total_items | html %]
108
                                            [% basket.total_items | html %]
109
                                                [% IF basket.total_items_cancelled %]
109
                                            [% IF basket.total_items_cancelled %]
110
                                                    ([% basket.total_items_cancelled | html %] cancelled)
110
                                                ([% basket.total_items_cancelled | html %] cancelled)
111
                                                [% END %]
111
                                            [% END %]
112
                                            </span>
113
                                        </td>
112
                                        </td>
114
                                        <td>
113
                                        <td data-order="[% basket.total_biblios | html %]">
115
                                            <span title="[% basket.total_biblios | html %]">[% basket.total_biblios | html %]
114
                                            [% basket.total_biblios | html %]
116
                                                [% IF basket.total_biblios_cancelled %]
115
                                            [% IF basket.total_biblios_cancelled %]
117
                                                    ([% basket.total_biblios_cancelled | html %] cancelled)
116
                                                ([% basket.total_biblios_cancelled | html %] cancelled)
118
                                                [% END %]
117
                                            [% END %]
119
                                            </span>
120
                                        </td>
118
                                        </td>
121
                                        <td>[% basket.expected_items | html %]</td>
119
                                        <td>[% basket.expected_items | html %]</td>
122
                                        <td>
120
                                        <td>
Lines 125-131 Link Here
125
                                                [% basket.authorisedby.surname | html %]
123
                                                [% basket.authorisedby.surname | html %]
126
                                            [% END %]
124
                                            [% END %]
127
                                        </td>
125
                                        </td>
128
                                        <td><span title="[% basket.creationdate | html %]">[% basket.creationdate | $KohaDates %]</span></td>
126
                                        <td data-order="[% basket.creationdate | html %]">[% basket.creationdate | $KohaDates %]</td>
129
                                        <td>
127
                                        <td>
130
                                          [% IF basket.basketgroup %]
128
                                          [% IF basket.basketgroup %]
131
                                            [% basketgroup = basket.basketgroup %]
129
                                            [% basketgroup = basket.basketgroup %]
Lines 136-147 Link Here
136
                                            [% END %]
134
                                            [% END %]
137
                                          [% END %]
135
                                          [% END %]
138
                                        </td>
136
                                        </td>
139
                                        <td>
137
                                        <td data-order="[% basket.closedate | html %]">
140
                                            [% IF ( basket.closedate ) %]
138
                                            [% basket.closedate | $KohaDates %]
141
                                                <span title="[% basket.closedate | html %]">[% basket.closedate | $KohaDates %]</span>
142
                                            [% ELSE %]
143
                                                <span title="9999-99-99"></span>
144
                                            [% END %]
145
                                        </td>
139
                                        </td>
146
                                        <td class="actions">
140
                                        <td class="actions">
147
                                        [% IF not basket.closedate and supplier.active %]
141
                                        [% IF not basket.closedate and supplier.active %]
Lines 215-222 Link Here
215
                'bInfo': false,
209
                'bInfo': false,
216
                "aaSorting": [[ 1, "asc" ]],
210
                "aaSorting": [[ 1, "asc" ]],
217
                "aoColumnDefs": [
211
                "aoColumnDefs": [
218
                    { "sType": "title-string", "aTargets" : [ "title-string" ] },
219
                    { "sType": "title-numeric", "aTargets" : [ "title-numeric" ] },
220
                    { 'aTargets': [-1], 'bSortable': false }
212
                    { 'aTargets': [-1], 'bSortable': false }
221
                ]
213
                ]
222
            }));
214
            }));
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt (-11 / +7 lines)
Lines 110-122 Basket [% basket.basketno | html %] &rsaquo; Duplicate existing orders Link Here
110
            <br />[% order.author | html %] <br /> [% order.isbn | html %]
110
            <br />[% order.author | html %] <br /> [% order.isbn | html %]
111
        </td>
111
        </td>
112
        <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.id | uri %]">[% order.name | html %]</a></td>
112
        <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.id | uri %]">[% order.name | html %]</a></td>
113
        <td><span title="[% order.creationdate | html %]">[% order.creationdate | $KohaDates %]</span></td>
113
        <td data-order="[% order.creationdate | html %]">[% order.creationdate | $KohaDates %]</td>
114
        <td>
114
        <td data-order="[% order.datereceived | html %]">
115
            [% IF order.datereceived %]
115
            [% order.datereceived | $KohaDates %]
116
                <span title="[% order.datereceived | html %]">[% order.datereceived | $KohaDates %]</span>
117
            [% ELSE %]
118
                <span title="0000-00-00"></span>
119
            [% END %]
120
        </td>
116
        </td>
121
        <td>[% order.quantityreceived | html %]</td>
117
        <td>[% order.quantityreceived | html %]</td>
122
        <td>[% order.quantity | html %]</td>
118
        <td>[% order.quantity | html %]</td>
Lines 145-152 Basket [% basket.basketno | html %] &rsaquo; Duplicate existing orders Link Here
145
                    <th>Invoice number</th>
141
                    <th>Invoice number</th>
146
                    <th class="anti-the">Summary</th>
142
                    <th class="anti-the">Summary</th>
147
                    <th>Vendor</th>
143
                    <th>Vendor</th>
148
                    <th class="title-string">Placed on</th>
144
                    <th>Placed on</th>
149
                    <th class="title-string">Received on</th>
145
                    <th>Received on</th>
150
                    <th>Quantity received</th>
146
                    <th>Quantity received</th>
151
                    <th>Quantity ordered</th>
147
                    <th>Quantity ordered</th>
152
                    <th>Unit cost</th>
148
                    <th>Unit cost</th>
Lines 266-273 Basket [% basket.basketno | html %] &rsaquo; Duplicate existing orders Link Here
266
                    <th>Invoice number</th>
262
                    <th>Invoice number</th>
267
                    <th class="anti-the">Summary</th>
263
                    <th class="anti-the">Summary</th>
268
                    <th>Vendor</th>
264
                    <th>Vendor</th>
269
                    <th class="title-string">Placed on</th>
265
                    <th>Placed on</th>
270
                    <th class="title-string">Received on</th>
266
                    <th>Received on</th>
271
                    <th>Quantity received</th>
267
                    <th>Quantity received</th>
272
                    <th>Quantity ordered</th>
268
                    <th>Quantity ordered</th>
273
                    <th>Unit cost</th>
269
                    <th>Unit cost</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt (-4 / +3 lines)
Lines 33-39 Link Here
33
<thead>
33
<thead>
34
<tr>
34
<tr>
35
<th>Type</th>
35
<th>Type</th>
36
<th class="title-string">Transferred</th>
36
<th>Transferred</th>
37
<th>Status</th>
37
<th>Status</th>
38
<th>Vendor</th>
38
<th>Vendor</th>
39
<th>Details</th>
39
<th>Details</th>
Lines 45-51 Link Here
45
[% FOREACH msg IN messages %]
45
[% FOREACH msg IN messages %]
46
<tr>
46
<tr>
47
<td>[% msg.message_type | html %]</td>
47
<td>[% msg.message_type | html %]</td>
48
<td><span title="[% msg.transfer_date | html %]">[% msg.transfer_date | $KohaDates %]</span></td>
48
<td data-order="[% msg.transfer_date | html %]">[% msg.transfer_date | $KohaDates %]</td>
49
<td>[% msg.status | html %]</td>
49
<td>[% msg.status | html %]</td>
50
<td>
50
<td>
51
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% msg.vendor_id | uri %]">
51
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% msg.vendor_id | uri %]">
Lines 124-131 Link Here
124
                'aaSorting': [[1, "desc" ]],
124
                'aaSorting': [[1, "desc" ]],
125
                'sPaginationType': "full",
125
                'sPaginationType': "full",
126
                "aoColumnDefs": [
126
                "aoColumnDefs": [
127
                    { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
127
                    { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false }
128
                    { "sType": "title-string", "aTargets" : [ "title-string" ] }
129
                ]
128
                ]
130
            }));
129
            }));
131
130
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (-9 / +5 lines)
Lines 44-51 Link Here
44
                <th>Invoice number</th>
44
                <th>Invoice number</th>
45
                <th class="anti-the">Summary</th>
45
                <th class="anti-the">Summary</th>
46
				<th>Vendor</th>
46
				<th>Vendor</th>
47
                <th class="title-string">Placed on</th>
47
                <th>Placed on</th>
48
                <th class="title-string">Received on</th>
48
                <th>Received on</th>
49
                <th>Quantity received</th>
49
                <th>Quantity received</th>
50
                <th>Quantity ordered</th>
50
                <th>Quantity ordered</th>
51
				<th>Unit cost</th>
51
				<th>Unit cost</th>
Lines 90-102 Link Here
90
                        <br />[% order.author | html %] <br /> [% order.isbn | html %]
90
                        <br />[% order.author | html %] <br /> [% order.isbn | html %]
91
                    </td>
91
                    </td>
92
                    <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.id | uri %]">[% order.name | html %]</a></td>
92
                    <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.id | uri %]">[% order.name | html %]</a></td>
93
                    <td><span title="[% order.creationdate | html %]">[% order.creationdate | $KohaDates %]</span></td>
93
                    <td data-order="[% order.creationdate | html %]">[% order.creationdate | $KohaDates %]</td>
94
                    <td>
94
                    <td data-order="[% order.datereceived | html %]">
95
                        [% IF order.datereceived %]
95
                        [% order.datereceived | $KohaDates %]
96
                            <span title="[% order.datereceived | html %]">[% order.datereceived | $KohaDates %]</span>
97
                        [% ELSE %]
98
                            <span title="0000-00-00"></span>
99
                        [% END %]
100
                    </td>
96
                    </td>
101
                    <td>[% order.quantityreceived | html %]</td>
97
                    <td>[% order.quantityreceived | html %]</td>
102
                    <td>[% order.quantity | html %]</td>
98
                    <td>[% order.quantity | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt (-4 / +3 lines)
Lines 47-54 Link Here
47
                      <td><a href="?invoiceid=[% invoiceid | uri %]&amp;op=download&amp;view=1&amp;file_id=[% f.file_id | uri %]">[% f.file_name | html %]</a></td>
47
                      <td><a href="?invoiceid=[% invoiceid | uri %]&amp;op=download&amp;view=1&amp;file_id=[% f.file_id | uri %]">[% f.file_name | html %]</a></td>
48
                      <td>[% f.file_type | html %]</td>
48
                      <td>[% f.file_type | html %]</td>
49
                      <td>[% f.file_description | html %]</td>
49
                      <td>[% f.file_description | html %]</td>
50
                      <td class="title-string">
50
                      <td data-order="[% f.date_uploaded | html %]">
51
                        <span title="[% f.date_uploaded | html %]">[% f.date_uploaded | $KohaDates %]</span>
51
                        [% f.date_uploaded | $KohaDates %]
52
                      </td>
52
                      </td>
53
                      <td>[% f.file_size | html %]</td>
53
                      <td>[% f.file_size | html %]</td>
54
                      <td><a class="delete_file" href="?invoiceid=[% invoiceid | html %]&amp;op=delete&amp;file_id=[% f.file_id | html %]">Delete</a></td>
54
                      <td><a class="delete_file" href="?invoiceid=[% invoiceid | html %]&amp;op=delete&amp;file_id=[% f.file_id | html %]">Delete</a></td>
Lines 95-102 Link Here
95
        $(document).ready(function() {
95
        $(document).ready(function() {
96
            $("#invoice_files_details_table").dataTable($.extend(true, {}, dataTablesDefaults, {
96
            $("#invoice_files_details_table").dataTable($.extend(true, {}, dataTablesDefaults, {
97
                "aoColumnDefs": [
97
                "aoColumnDefs": [
98
                    { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
98
                    { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false }
99
                    { "aTargets": [ "title-string" ], "sType": "title-string" }
100
                ],
99
                ],
101
                bInfo: false,
100
                bInfo: false,
102
                bPaginate: false,
101
                bPaginate: false,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-2 / +2 lines)
Lines 435-442 Link Here
435
                         <td><a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid | uri %]&amp;op=download&amp;view=1&amp;file_id=[% f.file_id | uri %]">[% f.file_name | html %]</a></td>
435
                         <td><a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid | uri %]&amp;op=download&amp;view=1&amp;file_id=[% f.file_id | uri %]">[% f.file_name | html %]</a></td>
436
                         <td>[% f.file_type | html %]</td>
436
                         <td>[% f.file_type | html %]</td>
437
                         <td>[% f.file_description | html %]</td>
437
                         <td>[% f.file_description | html %]</td>
438
                         <td class="title-string">
438
                         <td data-order="[% f.date_uploaded | html %]">
439
                           <span title="[% f.date_uploaded | html %]">[% f.date_uploaded | $KohaDates %]</span>
439
                            [% f.date_uploaded | $KohaDates %]
440
                         </td>
440
                         </td>
441
                    </tr>
441
                    </tr>
442
                [% END %]
442
                [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt (-15 / +6 lines)
Lines 38-45 Link Here
38
                <th>&nbsp;</th>
38
                <th>&nbsp;</th>
39
                <th>Invoice no.</th>
39
                <th>Invoice no.</th>
40
                <th>Vendor</th>
40
                <th>Vendor</th>
41
                <th class="title-string">Shipment date</th>
41
                <th>Shipment date</th>
42
                <th class="title-string">Billing date</th>
42
                <th>Billing date</th>
43
                <th>Received bibliographic records</th>
43
                <th>Received bibliographic records</th>
44
                <th>Received items</th>
44
                <th>Received items</th>
45
                <th>Status</th>
45
                <th>Status</th>
Lines 55-73 Link Here
55
                  <td><input type="checkbox" class="select-invoice" value="[% invoice.invoiceid | html %]" /></td>
55
                  <td><input type="checkbox" class="select-invoice" value="[% invoice.invoiceid | html %]" /></td>
56
                  <td><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | uri %]">[% invoice.invoicenumber | html %]</a></td>
56
                  <td><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | uri %]">[% invoice.invoicenumber | html %]</a></td>
57
                  <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% invoice.booksellerid | uri %]">[% invoice.suppliername | html %]</a></td>
57
                  <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% invoice.booksellerid | uri %]">[% invoice.suppliername | html %]</a></td>
58
                  <td>
58
                  <td data-order="[% invoice.shipmentdate | html %]">
59
                    [% IF invoice.shipmentdate %]
59
                      [% invoice.shipmentdate | $KohaDates %]
60
                      <span title="[% invoice.shipmentdate | html %]">[% invoice.shipmentdate | $KohaDates %]</span>
61
                    [% ELSE %]
62
                      <span title="0000-00-00"></span>
63
                    [% END %]
64
                  </td>
60
                  </td>
65
                  <td>
61
                  <td data-order="[% invoice.billingdate | html %]">
66
                    [% IF invoice.billingdate %]
62
                      [% invoice.billingdate | $KohaDates %]
67
                      <span title="[% invoice.billingdate | html %]">[% invoice.billingdate | $KohaDates %]</span>
68
                    [% ELSE %]
69
                      <span title="0000-00-00"></span>
70
                    [% END %]
71
                  </td>
63
                  </td>
72
                  <td>[% invoice.receivedbiblios | html %]</td>
64
                  <td>[% invoice.receivedbiblios | html %]</td>
73
                  <td>[% invoice.receiveditems | html %]</td>
65
                  <td>[% invoice.receiveditems | html %]</td>
74
- 

Return to bug 27982