@@ -, +, @@
- Acquisitions -> Late orders (linked date fields in the sidebar)
- Acquisitions -> Invoices (linked date fields in the sidebar)
- Acquisitions -> Invoices -> Invoice details (shipment date and
billing date)
- Acquisitions -> Vendor -> Receive shipment (shipment date)
- Acquisitions -> Vendor -> Receive shipment -> Receive (on order line)
-> Date received field under "Accounting details
- Acquisitions -> Orders search tab in the header -> Advanced search:
Linked date fields in the search form."
---
.../prog/en/includes/filter-orders.inc | 8 ++--
.../prog/en/modules/acqui/invoice.tt | 6 ++-
.../prog/en/modules/acqui/invoices.tt | 48 +++++++++++++++----
.../prog/en/modules/acqui/lateorders.tt | 4 +-
.../prog/en/modules/acqui/orderreceive.tt | 3 +-
.../prog/en/modules/acqui/parcels.tt | 14 ++++--
6 files changed, 63 insertions(+), 20 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/filter-orders.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/filter-orders.inc
@@ -103,11 +103,11 @@
-
- [% INCLUDE 'date-format.inc' %]
+
+ [% INCLUDE 'date-format.inc' %]
-
- [% INCLUDE 'date-format.inc' %]
+
+ [% INCLUDE 'date-format.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
@@ -69,7 +69,8 @@
[% IF readonly %]
[% shipmentdate | $KohaDates %]
[% ELSE %]
-
+
+ [% INCLUDE 'date-format.inc' %]
[% END %]
@@ -78,7 +79,8 @@
[% IF readonly %]
[% billingdate | $KohaDates %]
[% ELSE %]
-
+
+ [% INCLUDE 'date-format.inc' %]
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
@@ -168,11 +168,17 @@
Required
-
-
+
+
+
+ [% INCLUDE 'date-format.inc' %]
+
-
-
+
+
+
+ [% INCLUDE 'date-format.inc' %]
+
@@ -291,11 +297,13 @@
-
-
+
+
[% INCLUDE 'date-format.inc' %]
-
-
+
+
[% INCLUDE 'date-format.inc' %]
@@ -306,11 +314,13 @@
-
-
+
+
[% INCLUDE 'date-format.inc' %]
-
-
+
+
[% INCLUDE 'date-format.inc' %]
@@ -449,6 +459,28 @@
$('#merge_invoices').show();
}
});
+ var shipmentdatefrom = $("#shipmentdatefrom").flatpickr({
+ onClose: function( selectedDates, dateText, instance) {
+ validate_date( selectedDates, instance );
+ shipmentdateto.set('minDate', selectedDates[0]);
+ }
+ });
+ var shipmentdateto = $("#shipmentdateto").flatpickr({
+ onClose: function( selectedDates, dateText, instance) {
+ validate_date( selectedDates, instance );
+ },
+ });
+ var billingdatefrom = $("#billingdatefrom").flatpickr({
+ onClose: function( selectedDates, dateText, instance) {
+ validate_date( selectedDates, instance );
+ billingdateto.set('minDate', selectedDates[0]);
+ }
+ });
+ var billingdateto = $("#billingdateto").flatpickr({
+ onClose: function( selectedDates, dateText, instance) {
+ validate_date( selectedDates, instance );
+ },
+ });
});
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -232,11 +232,11 @@
- days ago
-
-
+
[% INCLUDE 'date-format.inc' %]
-
-
+
[% INCLUDE 'date-format.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
@@ -277,7 +277,8 @@
-
-
+
+
[% INCLUDE 'date-format.inc' %]
-->
-
-
+
[% INCLUDE 'date-format.inc' %]
-
@@ -203,8 +203,16 @@
-
-
-
+ -
+
+
+
[% INCLUDE 'date-format.inc' %]
+
+ -
+
+
+
[% INCLUDE 'date-format.inc' %]
+