@@ -, +, @@
etc
---
acqui/moddeliverydate.pl | 4 +-
.../prog/en/modules/acqui/basket.tt | 54 ++++++++++++++++++-
.../prog/en/modules/acqui/lateorders.tt | 6 +--
.../prog/en/modules/acqui/moddeliverydate.tt | 8 +--
.../prog/en/modules/acqui/neworderempty.tt | 4 +-
5 files changed, 59 insertions(+), 17 deletions(-)
--- a/acqui/moddeliverydate.pl
+++ a/acqui/moddeliverydate.pl
@@ -33,10 +33,10 @@ use Modern::Perl;
use CGI qw ( -utf8 );
use C4::Auth qw( get_template_and_user );
use C4::Output qw( output_html_with_http_headers );
-use C4::Acquisition qw( GetOrder GetBasket );
+use C4::Acquisition qw( GetOrder GetBasket ModOrder );
use Koha::Acquisition::Booksellers;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
my $input = CGI->new;
my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -596,7 +596,14 @@
[% IF Koha.Preference('EDIFACT') && ediaccount %]
[% books_loo.suppliers_report | html %] |
[% END %]
- [% books_loo.estimated_delivery_date | $KohaDates %] |
+
+ [% books_loo.estimated_delivery_date | $KohaDates %]
+ [% IF CAN_user_acquisition_order_manage %]
+
+ Edit
+
+ |
+ [% END %]
[% IF ( active ) %]
[% UNLESS ( closedate ) %]
@@ -839,12 +846,37 @@
+
+
+
[% MACRO jsinclude BLOCK %]
[% Asset.js("js/acquisitions-menu.js") | $raw %]
[% INCLUDE 'datatables.inc' %]
[% INCLUDE 'columns_settings.inc' %]
[% Asset.js("lib/hc-sticky.js") | $raw %]
[% Asset.js("js/acq.js") | $raw %]
+ [% INCLUDE 'calendar.inc' %]
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -483,7 +483,7 @@
-
+
[% INCLUDE 'date-format.inc' %]
The 2 following fields are available for your own usage. They can be useful for statistical purposes
@@ -685,8 +685,6 @@
getAuthValueDropbox( 'sort2', sort2_authcat, destination_sort2, sort2 );
});
$("#budget_id").change();
-
- $("#estimated_delivery_date").datepicker();
});
function UserSearchPopup(f) {
--
|