@@ -, +, @@
---
.../prog/en/modules/acqui/neworderempty.tt | 2 +-
.../prog/en/modules/acqui/orderreceive.tt | 2 +-
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 4 +-
.../prog/en/modules/suggestion/suggestion.tt | 142 ++++++++++++++++++--
suggestion/suggestion.pl | 17 ++-
5 files changed, 149 insertions(+), 18 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -326,7 +326,7 @@ $(document).ready(function()
-
Suggested by:
- [% surnamesuggestedby %][% IF ( firstnamesuggestedby ) %], [% firstnamesuggestedby %][% END %] (suggestion #[% suggestionid %])
+ [% surnamesuggestedby %][% IF ( firstnamesuggestedby ) %], [% firstnamesuggestedby %][% END %] (suggestion #[% suggestionid %])
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
@@ -42,7 +42,7 @@
-
Suggested by:
- [% surnamesuggestedby %][% IF ( firstnamesuggestedby ) %], [% firstnamesuggestedby %][% END %] (suggestion #[% suggestionid %])
+ [% surnamesuggestedby %][% IF ( firstnamesuggestedby ) %], [% firstnamesuggestedby %][% END %] (suggestion #[% suggestionid %])
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -244,7 +244,7 @@
[% IF ( loop_order.suggestionid ) %]
Suggested by: [% loop_order.surnamesuggestedby %][% IF ( loop_order.firstnamesuggestedby ) %], [% loop_order.firstnamesuggestedby %] [% END %]
- (suggestion #[% loop_order.suggestionid %])
+ (suggestion #[% loop_order.suggestionid %])
[% END %]
MARC | Card |
@@ -369,7 +369,7 @@
[% IF ( loop_receive.suggestionid ) %]
Suggested by: [% loop_receive.surnamesuggestedby %][% IF ( loop_receive.firstnamesuggestedby ) %], [% loop_receive.firstnamesuggestedby %] [% END %]
- (suggestion #[% loop_receive.suggestionid %])
+ (suggestion #[% loop_receive.suggestionid %])
[% END %]
MARC | Card |
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -1,5 +1,19 @@
-[% INCLUDE 'doc-head-open.inc' %]Koha › Acquisitions ›
-[% IF ( op_save ) %][% IF ( suttesionid ) %]Edit purchase suggestion #[% suggestionid %][% ELSE %]Enter a new purchase suggestion[% END %][% ELSE %]Suggestions Management[% END %]
+[% INCLUDE 'doc-head-open.inc' %]
+Koha › Acquisitions ›
+ [% IF ( op_save ) %]
+ [% IF ( suggestionid) %]
+ [% IF ( op == 'show' ) %]
+ Show purchase suggestion #[% suggestionid %]
+ [% ELSE %]
+ Edit purchase suggestion #[% suggestionid %]
+ [% END %]
+ [% ELSE %]
+ Enter a new purchase suggestion
+ [% END %]
+ [% ELSE %]
+ Suggestions Management
+ [% END %]
+
[% INCLUDE 'doc-head-close.inc' %]
[% INCLUDE 'calendar.inc' %]
[% IF ( op_else ) %]
@@ -91,7 +105,114 @@ $(document).ready(function() { calcNewsuggTotal(); });
[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]
-Home ›
Acquisitions › [% IF ( op_save ) %]
Suggestions › [% IF ( suggestionid ) %]Suggestion edit #[% suggestionid %][% ELSE %]New purchase suggestion[% END %][% ELSE %]Suggestions Management[% END %]
+
+
Home ›
Acquisitions ›
+ [% IF ( op_save ) %]
+
Suggestions ›
+ [% IF ( op == 'show' ) %]
+ Show suggestion #[% suggestionid %]
+ [% ELSE %]
+ Suggestion edit #[% suggestionid %]
+ [% END %]
+ [% ELSE %]
+ Suggestions Management
+ [% END %]
+
+
+[% IF ( op == 'show' ) %]
+
+
+
+
+
+
+
+
+
+
<<Back to the list
+
+
+
+
+[% ELSE %]
[% IF ( op_save ) %]
[% ELSE %]
[% END %]
@@ -189,7 +310,7 @@ $(document).ready(function() { calcNewsuggTotal(); });
-