@@ -, +, @@
be displayed on the suggestion page.
---
C4/Serials.pm | 8 +++++---
C4/Suggestions.pm | 2 ++
.../prog/en/modules/serials/subscription-renew.tt | 13 +++++++++++++
.../intranet-tmpl/prog/en/modules/suggestion/suggestion.tt | 6 +++++-
serials/subscription-renew.pl | 6 +++++-
suggestion/suggestion.pl | 1 -
6 files changed, 30 insertions(+), 6 deletions(-)
--- a/C4/Serials.pm
+++ a/C4/Serials.pm
@@ -1504,7 +1504,8 @@ this function renew a subscription with values given on input args.
=cut
sub ReNewSubscription {
- my ( $subscriptionid, $user, $startdate, $numberlength, $weeklength, $monthlength, $note ) = @_;
+ my ( $subscriptionid, $user, $startdate, $numberlength, $weeklength, $monthlength, $note, $branchcode ) = @_;
+ warn $note;
my $dbh = C4::Context->dbh;
my $subscription = GetSubscription($subscriptionid);
my $query = qq|
@@ -1524,8 +1525,9 @@ sub ReNewSubscription {
'title' => $subscription->{bibliotitle},
'author' => $biblio->{author},
'publishercode' => $biblio->{publishercode},
- 'note' => $biblio->{note},
- 'biblionumber' => $subscription->{biblionumber}
+ 'note' => $note,
+ 'biblionumber' => $subscription->{biblionumber},
+ 'branchcode' => $branchcode,
}
);
}
--- a/C4/Suggestions.pm
+++ a/C4/Suggestions.pm
@@ -443,7 +443,9 @@ sub NewSuggestion {
accepteddate
rejectedby
rejecteddate
+ note
budgetid
+ branchcode
) ) {
# Set the fields to NULL if not given.
$suggestion->{$field} ||= undef;
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt
@@ -36,6 +36,19 @@
+
+ (select a library)
+
+
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -460,6 +460,7 @@
|
Suggestion |
Suggested by - on |
+ Suggestion note |
Managed by - on |
Library |
Fund |
@@ -479,13 +480,16 @@
[% IF ( suggestions_loo.copyrightdate ) %]© [% suggestions_loo.copyrightdate |html %] [% END %]
[% IF ( suggestions_loo.volumedesc ) %]; Volume:[% suggestions_loo.volumedesc |html %] [% END %]
- [% IF ( suggestions_loo.isbn ) %]; ISBN:[% suggestions_loo.isbn |html %] [% END %][% IF ( suggestions_loo.publishercode ) %]; Published by [% suggestions_loo.publishercode |html %] [% END %][% IF ( suggestions_loo.publicationyear ) %] in [% suggestions_loo.publicationyear |html %] [% END %][% IF ( suggestions_loo.place ) %] in [% suggestions_loo.place |html %] [% END %][% IF ( suggestions_loo.collectiontitle ) %]; [% suggestions_loo.collectiontitle |html %] [% END %][% IF ( suggestions_loo.itemtype ) %]; [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestions_loo.itemtype, 0 ) %] [% END %]
[% IF ( suggestions_loo.note ) %][% suggestions_loo.note |html%][% END %]
+ [% IF ( suggestions_loo.isbn ) %]; ISBN:[% suggestions_loo.isbn |html %] [% END %][% IF ( suggestions_loo.publishercode ) %]; Published by [% suggestions_loo.publishercode |html %] [% END %][% IF ( suggestions_loo.publicationyear ) %] in [% suggestions_loo.publicationyear |html %] [% END %][% IF ( suggestions_loo.place ) %] in [% suggestions_loo.place |html %] [% END %][% IF ( suggestions_loo.collectiontitle ) %]; [% suggestions_loo.collectiontitle |html %] [% END %][% IF ( suggestions_loo.itemtype ) %]; [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestions_loo.itemtype, 0 ) %] [% END %]
[% suggestions_loo.surnamesuggestedby %][% IF ( suggestions_loo.firstnamesuggestedby ) %], [% suggestions_loo.firstnamesuggestedby %][% END %] [% IF (suggestions_loo.cardnumbersuggestedby ) %]([% suggestions_loo.cardnumbersuggestedby %])[% END %]
[% IF ( suggestions_loo.suggesteddate ) %] - [% suggestions_loo.suggesteddate | $KohaDates %][% END %]
|
+ [% suggestions_loo.note | html %]
+ |
+
[% suggestions_loo.surnamemanagedby %][% IF ( suggestions_loo.firstnamemanagedby ) %], [% suggestions_loo.firstnamemanagedby %][% END %]
[% IF ( suggestions_loo.manageddate ) %] - [% suggestions_loo.manageddate | $KohaDates %][% END %]
|
--- a/serials/subscription-renew.pl
+++ a/serials/subscription-renew.pl
@@ -62,6 +62,7 @@ my $dbh = C4::Context->dbh;
my $mode = $query->param('mode') || q{};
my $op = $query->param('op') || 'display';
my $subscriptionid = $query->param('subscriptionid');
+my $branchcode = $query->param('branchcode');
my $done = 0; # for after form has been submitted
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
@@ -79,7 +80,7 @@ if ( $op eq "renew" ) {
$subscriptionid, $loggedinuser,
$startdate, $query->param('numberlength'),
$query->param('weeklength'), $query->param('monthlength'),
- $query->param('note')
+ $query->param('note'), $branchcode
);
}
@@ -92,11 +93,14 @@ if ($subscription->{'cannotedit'}){
my $newstartdate = output_pref( { str => $subscription->{enddate}, dateonly => 1 } )
or output_pref( { dt => dt_from_string, dateonly => 1 } );
+my $libraries = Koha::Libraries->search( {}, { order_by => ['branchcode'] }, );
+
$template->param(
startdate => $newstartdate,
numberlength => $subscription->{numberlength},
weeklength => $subscription->{weeklength},
monthlength => $subscription->{monthlength},
+ libraries => $libraries,
subscriptionid => $subscriptionid,
bibliotitle => $subscription->{bibliotitle},
$op => 1,
--- a/suggestion/suggestion.pl
+++ a/suggestion/suggestion.pl
@@ -29,7 +29,6 @@ use C4::Budgets;
use C4::Search;
use C4::Members;
use C4::Debug;
-
use Koha::DateUtils qw( dt_from_string );
use Koha::AuthorisedValues;
use Koha::Acquisition::Currencies;
--