@@ -, +, @@
Acquisitions, part 3
- Acquisitions -> Vendor -> Vendor details
- Contracts datatable
- Edit vendor
- Add contacts, form validation
- Acquisitions -> Vendor -> Invoices -> Invoice -> "Go to receipt"
- Datatables, MARC and Card previews
- Transfer
- Confirmation of transfer, window closes
- Acquisitions -> Vendor -> Receive shipments
- Datatables, date pickers
- Acquisitions -> Available funds table -> Spent report
- Datatables
- Acquisitions -> Vendor -> Uncertain prices
- Datatables, form validation
- Acquisitions -> Vendor -> Basket -> Add to basket from external source
- Select and clear all on search form
- Search results
- Datatables, MARC and Card previews, in-table pop-up controls
(click any table cell)
---
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 267 ++++++++++-----------
.../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 61 ++---
.../intranet-tmpl/prog/en/modules/acqui/spent.tt | 33 +--
.../prog/en/modules/acqui/supplier.tt | 154 ++++++------
.../prog/en/modules/acqui/transferorder.tt | 47 ++--
.../prog/en/modules/acqui/uncertainprice.tt | 45 ++--
.../prog/en/modules/acqui/z3950_search.tt | 78 +++---
7 files changed, 350 insertions(+), 335 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -2,146 +2,14 @@
[% USE KohaDates %]
[% USE Price %]
[% USE currency = format('%.2f') -%]
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Acquisitions › [% IF ( date ) %]
Receipt summary for [% name %] [% IF ( invoice ) %]invoice [% invoice %][% END %] on [% datereceived | $KohaDates %][% ELSE %]Receive orders from [% name %][% END %]
[% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'datatables.inc' %]
-
-
-
-
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'acquisitions-search.inc' %]
@@ -546,4 +414,135 @@
[% INCLUDE 'acquisitions-menu.inc' %]
+
+[% MACRO jsinclude BLOCK %]
+
+ [% INCLUDE 'datatables.inc' %]
+
+
+
+
+[% END %]
+
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
@@ -1,37 +1,11 @@
[% USE KohaDates %]
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Acquisitions › Receive shipment from vendor [% name %]
[% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'calendar.inc' %]
-[% INCLUDE 'datatables.inc' %]
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'acquisitions-search.inc' %]
@@ -225,4 +199,35 @@
[% END %]
+
+[% MACRO jsinclude BLOCK %]
+
+ [% INCLUDE 'calendar.inc' %]
+ [% INCLUDE 'datatables.inc' %]
+
+[% END %]
+
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
@@ -1,24 +1,12 @@
[% USE KohaDates %]
[% USE ItemTypes %]
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Acquisitions › Spent
[% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'datatables.inc' %]
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'acquisitions-search.inc' %]
@@ -114,4 +102,21 @@
[% INCLUDE 'acquisitions-menu.inc' %]
+
+[% MACRO jsinclude BLOCK %]
+
+ [% INCLUDE 'datatables.inc' %]
+
+[% END %]
+
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
@@ -85,86 +85,13 @@
[% END %]
[% END %]
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Vendor [% name %]
[% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'datatables.inc' %]
-
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'acquisitions-search.inc' %]
@@ -422,4 +349,81 @@ function delete_contact(ev) {
[% INCLUDE 'vendor-menu.inc' %]
+
+[% MACRO jsinclude BLOCK %]
+
+ [% INCLUDE 'datatables.inc' %]
+
+[% END %]
+
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
@@ -1,3 +1,4 @@
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Acquisitions › Transfer order
[%- USE KohaDates -%]
@@ -5,29 +6,8 @@
-[% IF transferred %]
-
-[% END %]
-
-[% IF ( bookselleridfrom ) %]
-
-[% END %]
-
-
+
-
-