From f4b9f72b51d5a7bbc40716dda5af86343830df7c Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Fri, 7 May 2021 15:02:42 +1200 Subject: [PATCH] Bug 15348: (follow-up) Fix breadcrumbs, title, JS error, permissions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian Stelzenmüller Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize --- acqui/addorder.pl | 2 +- acqui/moddeliverydate.pl | 2 +- .../prog/en/modules/acqui/lateorders.tt | 10 ++++---- .../prog/en/modules/acqui/moddeliverydate.tt | 24 +++++++++++++++---- 4 files changed, 28 insertions(+), 10 deletions(-) diff --git a/acqui/addorder.pl b/acqui/addorder.pl index dbdd237f6e..7d5b7c30f3 100755 --- a/acqui/addorder.pl +++ b/acqui/addorder.pl @@ -137,7 +137,7 @@ use Koha::Acquisition::Currencies qw( get_active ); use Koha::Acquisition::Orders; use Koha::Acquisition::Baskets; use C4::Barcodes; -use Koha::DateUtils; +use Koha::DateUtils q( dt_from_string ); ### "-------------------- addorder.pl ----------" diff --git a/acqui/moddeliverydate.pl b/acqui/moddeliverydate.pl index 48d5b5bbb8..239a0fc43e 100755 --- a/acqui/moddeliverydate.pl +++ b/acqui/moddeliverydate.pl @@ -43,7 +43,7 @@ my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( { template_name => 'acqui/moddeliverydate.tt', query => $input, type => 'intranet', - flagsrequired => { 'acquisition' => '*' }, + flagsrequired => { 'acquisition' => 'order_manage' }, debug => 1, } ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt index 6e2c17c1a1..7f40b20f21 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -110,9 +110,11 @@

[% estimated_delivery_date | $KohaDates %] - - Edit - + [% IF CAN_user_acquisition_order_manage %] + + Edit + + [% END %]

@@ -199,7 +201,7 @@ - Total + Total [% total_quantity | html %] [% total | $Price %]   diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt index 5d50976119..c8075b119c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt @@ -1,15 +1,31 @@ [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Acquisition › - Change estimated delivery date - +Change estimated delivery date › Acquisitions › Koha [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'header.inc' %] - +
-- 2.20.1