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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/filter-orders.inc (-4 / +4 lines)
Lines 103-113 Link Here
103
    </li>
103
    </li>
104
104
105
    <li><label for="from">From: </label>
105
    <li><label for="from">From: </label>
106
    <input type="text" size="10" id="from" name="from" value="[% filters.from_placed_on | $KohaDates %]" class="datepickerfrom" />
106
        <input type="text" size="10" id="from" name="from" value="[% filters.from_placed_on | $KohaDates %]" class="flatpickrfrom" />
107
            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
107
        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
108
    </li>
108
    </li>
109
    <li><label for="to">To: </label>
109
    <li><label for="to">To: </label>
110
    <input type="text" size="10" id="to" name="to" value="[% filters.to_placed_on | $KohaDates %]" class="datepickerto" />
110
        <input type="text" size="10" id="to" name="to" value="[% filters.to_placed_on | $KohaDates %]" class="flatpickrto" />
111
            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
111
        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
112
    </li>
112
    </li>
113
</ol>
113
</ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-2 / +4 lines)
Lines 69-75 Link Here
69
                [% IF readonly %]
69
                [% IF readonly %]
70
                    [% shipmentdate | $KohaDates %]
70
                    [% shipmentdate | $KohaDates %]
71
                [% ELSE %]
71
                [% ELSE %]
72
                    <input type="text" size="10" id="shipmentdate" name="shipmentdate" value="[% shipmentdate | $KohaDates %]" class="datepicker" />
72
                    <input type="text" size="10" id="shipmentdate" name="shipmentdate" value="[% shipmentdate | $KohaDates %]" class="flatpickr" />
73
                    <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
73
                [% END %]
74
                [% END %]
74
            </li>
75
            </li>
75
76
Lines 78-84 Link Here
78
                [% IF readonly %]
79
                [% IF readonly %]
79
                    [% billingdate | $KohaDates %]
80
                    [% billingdate | $KohaDates %]
80
                [% ELSE %]
81
                [% ELSE %]
81
                    <input type="text" size="10" id="billingdate" name="billingdate" value="[% billingdate | $KohaDates %]" class="datepicker" />
82
                    <input type="text" size="10" id="billingdate" name="billingdate" value="[% billingdate | $KohaDates %]" class="flatpickr" />
83
                    <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
82
                [% END %]
84
                [% END %]
83
            </li>
85
            </li>
84
86
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt (-8 / +40 lines)
Lines 168-178 Link Here
168
                                <input type="text" size="10" id="merge_invoicenumber" name="invoicenumber" value="" class="required" required="required" />
168
                                <input type="text" size="10" id="merge_invoicenumber" name="invoicenumber" value="" class="required" required="required" />
169
                                <span class="required">Required</span>
169
                                <span class="required">Required</span>
170
                                </li>
170
                                </li>
171
                        <li><label for="merge_shipmentdate">Shipment date:</label>
171
                        <li>
172
                                <input type="text" size="10" id="merge_shipmentdate" name="shipmentdate" value="" class="datepicker" /></li>
172
                            <label for="merge_shipmentdate">Shipment date:</label>
173
                            <input type="text" size="10" id="merge_shipmentdate" name="shipmentdate" value="" class="flatpickr" />
174
                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
175
                        </li>
173
176
174
                      <li><label for="merge_billingdate">Billing date:</label>
177
                        <li>
175
                              <input type="text" size="10" id="merge_billingdate" name="billingdate" value="" class="datepicker" /></li>
178
                            <label for="merge_billingdate">Billing date:</label>
179
                            <input type="text" size="10" id="merge_billingdate" name="billingdate" value="" class="flatpickr" />
180
                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
181
                        </li>
176
182
177
                      <li><label for="merge_shipmentcost">Shipment cost:</label>
183
                      <li><label for="merge_shipmentcost">Shipment cost:</label>
178
                              <input type="text" size="10" id="merge_shipmentcost" name="shipmentcost" value="" /></li>
184
                              <input type="text" size="10" id="merge_shipmentcost" name="shipmentcost" value="" /></li>
Lines 291-301 Link Here
291
              <ol>
297
              <ol>
292
                <li>
298
                <li>
293
                  <label for="shipmentdatefrom">From:</label>
299
                  <label for="shipmentdatefrom">From:</label>
294
                  <input type="text" id="shipmentdatefrom" name="shipmentdatefrom" size="10" value="[% shipmentdatefrom | $KohaDates %]" class="datepicker" />
300
                  <input type="text" id="shipmentdatefrom" name="shipmentdatefrom" size="10" value="[% shipmentdatefrom | $KohaDates %]" />
301
                  <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
295
                </li>
302
                </li>
296
                <li>
303
                <li>
297
                  <label for="shipmentdateto">To:</label>
304
                  <label for="shipmentdateto">To:</label>
298
                  <input type="text" id="shipmentdateto" name="shipmentdateto" size="10" value="[% shipmentdateto | $KohaDates %]" class="datepicker" />
305
                  <input type="text" id="shipmentdateto" name="shipmentdateto" size="10" value="[% shipmentdateto | $KohaDates %]" />
306
                  <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
299
                </li>
307
                </li>
300
              </ol>
308
              </ol>
301
            </fieldset>
309
            </fieldset>
Lines 306-316 Link Here
306
              <ol>
314
              <ol>
307
                <li>
315
                <li>
308
                  <label for="billingdatefrom">From:</label>
316
                  <label for="billingdatefrom">From:</label>
309
                  <input type="text" id="billingdatefrom" name="billingdatefrom" size="10" value="[% billingdatefrom | $KohaDates %]" class="datepicker" />
317
                  <input type="text" id="billingdatefrom" name="billingdatefrom" size="10" value="[% billingdatefrom | $KohaDates %]" />
318
                  <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
310
                </li>
319
                </li>
311
                <li>
320
                <li>
312
                  <label for="billingdateto">To:</label>
321
                  <label for="billingdateto">To:</label>
313
                  <input type="text" id="billingdateto" name="billingdateto" size="10" value="[% billingdateto | $KohaDates %]" class="datepicker" />
322
                  <input type="text" id="billingdateto" name="billingdateto" size="10" value="[% billingdateto | $KohaDates %]" />
323
                  <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
314
                </li>
324
                </li>
315
              </ol>
325
              </ol>
316
            </fieldset>
326
            </fieldset>
Lines 449-454 Link Here
449
                    $('#merge_invoices').show();
459
                    $('#merge_invoices').show();
450
                }
460
                }
451
            });
461
            });
462
            var shipmentdatefrom = $("#shipmentdatefrom").flatpickr({
463
                onClose: function( selectedDates, dateText, instance) {
464
                    validate_date( selectedDates, instance );
465
                    shipmentdateto.set('minDate', selectedDates[0]);
466
                }
467
            });
468
            var shipmentdateto = $("#shipmentdateto").flatpickr({
469
                onClose: function( selectedDates, dateText, instance) {
470
                    validate_date( selectedDates, instance );
471
                },
472
            });
473
            var billingdatefrom = $("#billingdatefrom").flatpickr({
474
                onClose: function( selectedDates, dateText, instance) {
475
                    validate_date( selectedDates, instance );
476
                    billingdateto.set('minDate', selectedDates[0]);
477
                }
478
            });
479
            var billingdateto = $("#billingdateto").flatpickr({
480
                onClose: function( selectedDates, dateText, instance) {
481
                    validate_date( selectedDates, instance );
482
                },
483
            });
452
        });
484
        });
453
    </script>
485
    </script>
454
[% END %]
486
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt (-2 / +2 lines)
Lines 232-242 Link Here
232
<ol>
232
<ol>
233
    <li><label for="delay">Order date:</label><input size="3" maxlength="3" id="delay" type="text" name="delay" value="[% delay | html %]" /> days ago</li>
233
    <li><label for="delay">Order date:</label><input size="3" maxlength="3" id="delay" type="text" name="delay" value="[% delay | html %]" /> days ago</li>
234
    <li><label for="from">Estimated delivery date from: </label>
234
    <li><label for="from">Estimated delivery date from: </label>
235
        <input type="text" size="10" id="from" name="estimateddeliverydatefrom" value="[% estimateddeliverydatefrom | html %]" class="datepickerfrom" />
235
        <input type="text" size="10" id="from" name="estimateddeliverydatefrom" value="[% estimateddeliverydatefrom | html %]" class="flatpickrfrom" />
236
        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
236
        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
237
    </li>
237
    </li>
238
    <li><label for="to">To: </label>
238
    <li><label for="to">To: </label>
239
        <input type="text" size="10" id="to" name="estimateddeliverydateto" value="[% estimateddeliverydateto | html %]" class="datepickerto" />
239
        <input type="text" size="10" id="to" name="estimateddeliverydateto" value="[% estimateddeliverydateto | html %]" class="flatpickrto" />
240
        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
240
        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
241
    </li>
241
    </li>
242
242
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-1 / +2 lines)
Lines 277-283 Link Here
277
        <ol>
277
        <ol>
278
            <li>
278
            <li>
279
                <label for="datereceived">Date received: </label>
279
                <label for="datereceived">Date received: </label>
280
                <input type="text" size="10" id="datereceived" name="datereceived" value="[% datereceived | $KohaDates %]" class="datepicker" />
280
                <input type="text" size="10" id="datereceived" name="datereceived" value="[% datereceived | $KohaDates %]" class="flatpickr" />
281
                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
281
            </li>
282
            </li>
282
       <li><label for="bookfund">Fund: </label><select id="bookfund" name="bookfund">
283
       <li><label for="bookfund">Fund: </label><select id="bookfund" name="bookfund">
283
            <option value="">Keep current ([% budget_period_description | html %] - [% order.fund.budget_name | html %])</option>
284
            <option value="">Keep current ([% budget_period_description | html %] - [% order.fund.budget_name | html %])</option>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt (-4 / +11 lines)
Lines 163-169 Link Here
163
        </li> -->
163
        </li> -->
164
         <li>
164
         <li>
165
            <label for="shipmentdate">Shipment date: </label>
165
            <label for="shipmentdate">Shipment date: </label>
166
            <input type="text" id="shipmentdate" name="shipmentdate" maxlength="10" size="10" value="[% shipmentdate_today | $KohaDates %]" class="datepicker" />
166
            <input type="text" id="shipmentdate" name="shipmentdate" maxlength="10" size="10" value="[% shipmentdate_today | $KohaDates %]" class="flatpickr" />
167
            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
167
            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
168
        </li>
168
        </li>
169
        <li>
169
        <li>
Lines 203-210 Link Here
203
        <ol>
203
        <ol>
204
            <li> <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /></li>
204
            <li> <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /></li>
205
            <li><label for="filter">Invoice number:</label><input type="text" size="20" name="filter" value="[% filter | html %]" id="filter" /></li>
205
            <li><label for="filter">Invoice number:</label><input type="text" size="20" name="filter" value="[% filter | html %]" id="filter" /></li>
206
            <li><label for="datefrom">From:</label><input type="text" size="9" id="datefrom" name="datefrom" value="[% datefrom | html %]" class="datepicker" /><br />
206
            <li>
207
                <label for="dateto">To:</label><input type="text" size="9" id="dateto" name="dateto" value="[% dateto | html %]" class="datepicker" /></li>
207
                <label for="datefrom">From:</label>
208
                <input type="text" size="9" id="datefrom" name="datefrom" value="[% datefrom | html %]" class="flatpickr" />
209
                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
210
            </li>
211
            <li>
212
                <label for="dateto">To:</label>
213
                <input type="text" size="9" id="dateto" name="dateto" value="[% dateto | html %]" class="flatpickr" />
214
                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
215
            </li>
208
            <li><label for="orderby">Sort by :</label><select name="orderby" id="orderby">
216
            <li><label for="orderby">Sort by :</label><select name="orderby" id="orderby">
209
                <option value="invoicenumber">Invoice number</option>
217
                <option value="invoicenumber">Invoice number</option>
210
                <option value="shipmentdate">Shipment date</option>
218
                <option value="shipmentdate">Shipment date</option>
211
- 

Return to bug 28942