diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl index 1a8155904c..53cf287786 100755 --- a/acqui/neworderempty.pl +++ b/acqui/neworderempty.pl @@ -359,7 +359,6 @@ if ( $basketobj->effective_create_items eq 'ordering' ) { } $template->param( AcqCreateItemOrdering => 1, - UniqueItemFields => C4::Context->preference('UniqueItemFields'), ); } @@ -502,7 +501,6 @@ $template->param( publishercode => $data->{'publishercode'}, barcode_subfield => $barcode_subfield, import_batch_id => $import_batch_id, - acqcreate => $basketobj->effective_create_items eq "ordering" ? 1 : "", users_ids => join( ':', @order_user_ids ), users => \@order_users, ( uc( C4::Context->preference("marcflavour") ) ) => 1, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt index 89849aa81f..8a7b93ef8c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -207,7 +207,7 @@ [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") | $raw %] [% Asset.js("js/acquisitions-menu.js") | $raw %] [% IF loop_budget %] - [% Asset.js("js/acquisitions-menu.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index 2fc081487d..182d3f4c2e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -1318,26 +1318,48 @@ [% INCLUDE 'datatables.inc' %] [% Asset.js("js/acq.js") | $raw %] [% INCLUDE 'calendar.inc' %] + + [% END # /UNLESS (closedate) %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt index 5e0a2ba828..ad0979d190 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt @@ -314,7 +314,7 @@ [% INCLUDE 'datatables.inc' %] [% Asset.js("js/acq.js") | $raw %] [% Asset.js("js/funds_sorts.js") | $raw %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt index a173111945..d6b7f97aa8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt @@ -47,7 +47,7 @@ [% INCLUDE 'datatables.inc' %] [% Asset.js("js/modals/edifact_interchange.js") | $raw %] [% Asset.js("js/modals/edifact_errors.js") | $raw %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt index fa552e4f2c..bb4f97b25f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -167,7 +167,7 @@ [% Asset.js("js/acquisitions-menu.js") | $raw %] [% INCLUDE 'calendar.inc' %] [% INCLUDE 'datatables.inc' %] - [% Asset.js("js/vue/dist/acquisitions.js") | $raw %]