From b7f6714544e85a994089a57441b15a2e29638448 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 17 Feb 2012 15:57:57 +0100 Subject: [PATCH 1/5] Bug 5345: DataTables integration in acquisition module [9] newordersuggestion.tt Signed-off-by: Owen Leonard --- .../en/modules/acqui/newordersuggestion.tt | 28 +++++++++++++++++-- 1 file changed, 25 insertions(+), 3 deletions(-) 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 2843ee2082..54e9c7a0f1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt @@ -1,6 +1,22 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › Add order from a suggestion + [% INCLUDE 'doc-head-close.inc' %] + +[% INCLUDE 'datatables-strings.inc' %] + + [% INCLUDE 'header.inc' %] @@ -16,14 +32,16 @@

Suggestions

[% IF ( suggestions_loop ) %] - +
+ - + + [% FOREACH suggestions_loo IN suggestions_loop %] [% END %] -
Suggestion Suggested by Accepted by  
@@ -53,7 +71,11 @@
[% ELSE %]There are no outstanding (accepted) suggestions.[% END %] + + + [% ELSE %] + There are no outstanding (accepted) suggestions. + [% END %]
From 8db20c6abd92e0b520c114372dc1fd929d5a4426 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 17 Feb 2012 16:01:28 +0100 Subject: [PATCH 2/5] Bug 5345: DataTables integration in acquisition module [15] uncertainprice.tt Signed-off-by: Katrin Fischer --- .../prog/en/modules/acqui/uncertainprice.tt | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt index 5717034cc6..0902d07f2c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt @@ -1,6 +1,22 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Orders with uncertain prices for Vendor [% booksellername %] + [% INCLUDE 'doc-head-close.inc' %] + +[% INCLUDE 'datatables-strings.inc' %] + + +[% INCLUDE 'datatables-strings.inc' %] + + [% INCLUDE 'header.inc' %] From d89396d3d7fff103c4d44d2b199207afd12d8a58 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 17 Feb 2012 15:58:20 +0100 Subject: [PATCH 4/5] Bug 5345: DataTables integration in acquisition module [10] ordered.tt Signed-off-by: Katrin Fischer --- .../prog/en/modules/acqui/ordered.tt | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) 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 5a2af78ccc..fbfa57a0d1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt @@ -1,7 +1,20 @@ [% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › Ordered + [% INCLUDE 'doc-head-close.inc' %] + +[% INCLUDE 'datatables-strings.inc' %] + + [% INCLUDE 'header.inc' %] @@ -31,7 +44,7 @@ Subtotal - + [% FOREACH order IN ordered %] [% IF loop.odd %] @@ -68,7 +81,7 @@ [% END %] - + Total From 4df6ccacf1aa78721f097b49f4f8849ef16e8436 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 17 Feb 2012 15:56:51 +0100 Subject: [PATCH 5/5] Bug 5345: DataTables integration in acquisition module [6] histsearch.tt Signed-off-by: Katrin Fischer Signed-off-by: Paul Poulain --- .../prog/en/modules/acqui/histsearch.tt | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) 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 80eb827b3f..5efc63669d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -1,7 +1,20 @@ [% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › [% IF ( suggestions_loop ) %]Orders search › Search results[% ELSE %]Order search[% END %] + [% INCLUDE 'doc-head-close.inc' %] + +[% INCLUDE 'datatables-strings.inc' %] + + [% INCLUDE 'calendar.inc' %] @@ -62,7 +75,8 @@ [% END %] [% IF ( suggestions_loop ) %]

Search results

- +
+ @@ -74,7 +88,8 @@ - + + [% FOREACH suggestions_loo IN suggestions_loop %] @@ -94,6 +109,7 @@ [% END %] +
Basket Basket groupQuantity ordered Unit cost
[% suggestions_loo.basketname %] ([% suggestions_loo.basketno %])[% suggestions_loo.ecost %]
[% ELSE %][% END %]