diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
index 765b46cc06..79cbc6a6a3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
@@ -1,89 +1,11 @@
[% USE KohaDates %]
[% USE Branches %]
-
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Acquisitions › Invoices
[% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'datatables.inc' %]
-[% INCLUDE 'calendar.inc' %]
-
@@ -367,4 +289,85 @@ $(document).ready(function() {
[% INCLUDE 'acquisitions-menu.inc' %]
+
+[% MACRO jsinclude BLOCK %]
+
+ [% INCLUDE 'datatables.inc' %]
+ [% INCLUDE 'calendar.inc' %]
+
+[% END %]
+
[% INCLUDE 'intranet-bottom.inc' %]
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 97797ada52..4c142a15cf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -1,73 +1,13 @@
[% USE KohaDates %]
[% USE Branches %]
[% USE ColumnsSettings %]
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Acquisitions › Late orders
[% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'datatables.inc' %]
-[% INCLUDE 'columns_settings.inc' %]
-
-[% INCLUDE 'calendar.inc' %]
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'acquisitions-search.inc' %]
@@ -249,4 +189,68 @@ $(document).ready(function() {
[% INCLUDE 'acquisitions-menu.inc' %]
+
+[% MACRO jsinclude BLOCK %]
+
+ [% INCLUDE 'datatables.inc' %]
+ [% INCLUDE 'columns_settings.inc' %]
+
+ [% INCLUDE 'calendar.inc' %]
+
+[% END %]
+
[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt
index 3f96abc76a..5d9a0ac331 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt
@@ -1,34 +1,10 @@
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Acquisitions › Search existing records
[% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'datatables.inc' %]
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'acquisitions-search.inc' %]
@@ -129,4 +105,33 @@
[% INCLUDE 'acquisitions-menu.inc' %]
+
+[% MACRO jsinclude BLOCK %]
+
+ [% INCLUDE 'datatables.inc' %]
+
+[% END %]
+
[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index 3bad339e0b..f9b4a15dcb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -1,203 +1,11 @@
-[% USE KohaDates %]
-[% INCLUDE 'doc-head-open.inc' %]
[% USE Koha %]
+[% USE KohaDates %]
+[% SET footerjs = 1 %]
+[% INCLUDE 'doc-head-open.inc' %]
Koha › Acquisitions › Basket [% basketno %] › [% IF ( ordernumber ) %]Modify order details (line #[% ordernumber %])[% ELSE %]New order[% END %]
[% INCLUDE 'doc-head-close.inc' %]
-
-
-[% INCLUDE 'additem.js.inc' %]
-
-
-
-
+
[% INCLUDE 'header.inc' %]
@@ -679,4 +487,195 @@ $(document).ready(function()
[% INCLUDE 'acquisitions-menu.inc' %]
+
+[% MACRO jsinclude BLOCK %]
+
+
+ [% INCLUDE 'additem.js.inc' %]
+
+
+
+
+[% END %]
+
[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
index 8af7639f2d..38491d8bbf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
@@ -1,42 +1,13 @@
[% USE KohaDates %]
[% USE Branches %]
[% USE Koha %]
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Serials [% biblionumber %]
[% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'datatables.inc' %]
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'acquisitions-search.inc' %]
@@ -123,4 +94,38 @@
[% INCLUDE 'acquisitions-menu.inc' %]
+
+[% MACRO jsinclude BLOCK %]
+
+ [% INCLUDE 'datatables.inc' %]
+
+[% END %]
+
[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt
index 1274b47140..a8f9c41a24 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt
@@ -1,30 +1,10 @@
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Acquisitions › Add order from a suggestion
[% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'datatables.inc' %]
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'suggestions-add-search.inc' %]
@@ -92,4 +72,29 @@
[% INCLUDE 'acquisitions-menu.inc' %]
+
+[% MACRO jsinclude BLOCK %]
+
+ [% INCLUDE 'datatables.inc' %]
+
+[% END %]
+
[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
index 1007e5c07e..e7c3040350 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
@@ -1,24 +1,12 @@
[% USE KohaDates %]
[% USE ItemTypes %]
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Acquisitions › Ordered
[% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'datatables.inc' %]
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'acquisitions-search.inc' %]
@@ -106,4 +94,21 @@
[% INCLUDE 'acquisitions-menu.inc' %]
+
+[% MACRO jsinclude BLOCK %]
+
+ [% INCLUDE 'datatables.inc' %]
+
+[% END %]
+
[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
index cd52267324..8ec42ad3a5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
@@ -1,126 +1,12 @@
[% USE KohaDates %]
[% USE Branches %]
[% USE Price %]
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Acquisitions › Receipt summary for : [% name %] [% IF ( invoice ) %]invoice, [% invoice %][% END %]
[% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'calendar.inc' %]
-[% INCLUDE 'additem.js.inc' %]
-
-
-
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'acquisitions-search.inc' %]
@@ -374,4 +260,123 @@
[% INCLUDE 'acquisitions-menu.inc' %]
+
+[% MACRO jsinclude BLOCK %]
+
+[% INCLUDE 'calendar.inc' %]
+ [% INCLUDE 'additem.js.inc' %]
+
+
+
+
+[% END %]
+
[% INCLUDE 'intranet-bottom.inc' %]