@@ -, +, @@ be displayed on the suggestion page. --- C4/Serials.pm | 8 +++++--- .../prog/en/modules/serials/subscription-renew.tt | 14 ++++++++++++++ .../intranet-tmpl/prog/en/modules/suggestion/suggestion.tt | 6 +++++- serials/subscription-renew.pl | 6 +++++- suggestion/suggestion.pl | 1 - 5 files changed, 29 insertions(+), 6 deletions(-) --- a/C4/Serials.pm +++ a/C4/Serials.pm @@ -1476,7 +1476,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| @@ -1496,8 +1497,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/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt @@ -40,6 +40,20 @@
+ +
  • + (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 @@ -474,6 +474,7 @@   Suggestion Suggested by - on + Suggestion note Managed by - on Library Fund @@ -493,7 +494,7 @@
    [% 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 ) | html %] [% 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 ) | html %] [% END %]
    [% suggestions_loo.surnamesuggestedby | html %][% IF ( suggestions_loo.firstnamesuggestedby ) %], [% suggestions_loo.firstnamesuggestedby | html %][% END %] [% IF (suggestions_loo.cardnumbersuggestedby ) %]([% suggestions_loo.cardnumbersuggestedby | html %])[% END %] @@ -501,6 +502,9 @@ [% suggestions_loo.surnamemanagedby | html %][% IF ( suggestions_loo.firstnamemanagedby ) %], [% suggestions_loo.firstnamemanagedby | html %][% END %] + + [% IF ( suggestions_loo.note ) %]
    [% suggestions_loo.note | html %]
    [% END %] + [% IF ( suggestions_loo.manageddate ) %] - [% suggestions_loo.manageddate | $KohaDates %][% END %] --- a/serials/subscription-renew.pl +++ a/serials/subscription-renew.pl @@ -61,6 +61,7 @@ my $dbh = C4::Context->dbh; my $mode = $query->param('mode') || q{}; my $op = $query->param('op') || 'display'; my @subscriptionids = $query->multi_param('subscriptionid'); +my $branchcode = $query->param('branchcode'); my $done = 0; # for after form has been submitted my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { @@ -83,7 +84,7 @@ if ( $op eq "renew" ) { $subscriptionid, $loggedinuser, $startdate, scalar $query->param('numberlength'), scalar $query->param('weeklength'), scalar $query->param('monthlength'), - scalar $query->param('note') + scalar $query->param('note'), $branchcode ); } elsif ( $op eq 'multi_renew' ) { for my $subscriptionid ( @subscriptionids ) { @@ -113,8 +114,11 @@ if ( $op eq "renew" ) { ); } +my $libraries = Koha::Libraries->search( {}, { order_by => ['branchcode'] }, ); + $template->param( op => $op, + libraries => $libraries, ); output_html_with_http_headers $query, $cookie, $template->output; --- a/suggestion/suggestion.pl +++ a/suggestion/suggestion.pl @@ -28,7 +28,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; --