View | Details | Raw Unified | Return to bug 7047
Collapse All | Expand All

(-)a/C4/Serials.pm (-3 / +5 lines)
Lines 1476-1482 this function renew a subscription with values given on input args. Link Here
1476
=cut
1476
=cut
1477
1477
1478
sub ReNewSubscription {
1478
sub ReNewSubscription {
1479
    my ( $subscriptionid, $user, $startdate, $numberlength, $weeklength, $monthlength, $note ) = @_;
1479
    my ( $subscriptionid, $user, $startdate, $numberlength, $weeklength, $monthlength, $note, $branchcode ) = @_;
1480
    warn $note;
1480
    my $dbh          = C4::Context->dbh;
1481
    my $dbh          = C4::Context->dbh;
1481
    my $subscription = GetSubscription($subscriptionid);
1482
    my $subscription = GetSubscription($subscriptionid);
1482
    my $query        = qq|
1483
    my $query        = qq|
Lines 1496-1503 sub ReNewSubscription { Link Here
1496
                'title'         => $subscription->{bibliotitle},
1497
                'title'         => $subscription->{bibliotitle},
1497
                'author'        => $biblio->{author},
1498
                'author'        => $biblio->{author},
1498
                'publishercode' => $biblio->{publishercode},
1499
                'publishercode' => $biblio->{publishercode},
1499
                'note'          => $biblio->{note},
1500
                'note'          => $note,
1500
                'biblionumber'  => $subscription->{biblionumber}
1501
                'biblionumber'  => $subscription->{biblionumber},
1502
                'branchcode'    => $branchcode,
1501
            }
1503
            }
1502
        );
1504
        );
1503
    }
1505
    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt (+14 lines)
Lines 40-45 Link Here
40
		<ol><li><label for="numberlength">Number of num:</label><input type="text" id="numberlength" name="numberlength" value="[% subscription.numberlength | html %]" /></li>
40
		<ol><li><label for="numberlength">Number of num:</label><input type="text" id="numberlength" name="numberlength" value="[% subscription.numberlength | html %]" /></li>
41
		<li><label for="weeklength">Number of weeks: </label><input type="text" id="weeklength" name="weeklength" value="[% subscription.weeklength | html %]" /></li>
41
		<li><label for="weeklength">Number of weeks: </label><input type="text" id="weeklength" name="weeklength" value="[% subscription.weeklength | html %]" /></li>
42
		<li><label for="monthlength">Number of months: </label><input type="text" id="monthlength" name="monthlength" value="[% subscription.monthlength | html %]" /></li></ol></fieldset></li>
42
		<li><label for="monthlength">Number of months: </label><input type="text" id="monthlength" name="monthlength" value="[% subscription.monthlength | html %]" /></li></ol></fieldset></li>
43
44
<li><label for="branchcode">Library:</label>
45
 <select name="branchcode" id="branchcode" style="width: 20em;">
46
     [% UNLESS ( Independentbranches ) %]
47
        <option value="">None</option>
48
     [% END %]
49
     [% IF CAN_user_serials_superserials %]
50
        [% FOREACH library IN libraries %]
51
             <option value="[% library.branchcode %]"> [% library.branchname %] </option>
52
        [% END %]
53
     [% END %]
54
</select> (select a library)
55
</li>
56
43
		<li><label for="note">Note for the librarian that will manage your renewal request: </label>
57
		<li><label for="note">Note for the librarian that will manage your renewal request: </label>
44
		<textarea name="note" id="note" rows="5" cols="50"></textarea></li></ol></fieldset>
58
		<textarea name="note" id="note" rows="5" cols="50"></textarea></li></ol></fieldset>
45
		<fieldset class="action"><input type="submit" value="Submit" class="button" /></fieldset>
59
		<fieldset class="action"><input type="submit" value="Submit" class="button" /></fieldset>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (-1 / +5 lines)
Lines 474-479 Link Here
474
                <th class="NoSort">&nbsp;</th>
474
                <th class="NoSort">&nbsp;</th>
475
                <th class="anti-the">Suggestion</th>
475
                <th class="anti-the">Suggestion</th>
476
                <th>Suggested by - on</th>
476
                <th>Suggested by - on</th>
477
                <th>Suggestion note</th>
477
                <th>Managed by - on</th>
478
                <th>Managed by - on</th>
478
                <th>Library</th>
479
                <th>Library</th>
479
                <th>Fund</th>
480
                <th>Fund</th>
Lines 493-499 Link Here
493
                    <br />
494
                    <br />
494
                    [% IF ( suggestions_loo.copyrightdate ) %]&copy; [% suggestions_loo.copyrightdate | html %] [% END %]
495
                    [% IF ( suggestions_loo.copyrightdate ) %]&copy; [% suggestions_loo.copyrightdate | html %] [% END %]
495
                        [% IF ( suggestions_loo.volumedesc ) %]; Volume:<i>[% suggestions_loo.volumedesc | html %]</i> [% END %]
496
                        [% IF ( suggestions_loo.volumedesc ) %]; Volume:<i>[% suggestions_loo.volumedesc | html %]</i> [% END %]
496
                        [% IF ( suggestions_loo.isbn ) %]; ISBN:<i>[% suggestions_loo.isbn | html %]</i> [% END %][% IF ( suggestions_loo.publishercode ) %]; Published by [% suggestions_loo.publishercode | html %] [% END %][% IF ( suggestions_loo.publicationyear ) %] in <i>[% suggestions_loo.publicationyear | html %]</i> [% END %][% IF ( suggestions_loo.place ) %] in <i>[% suggestions_loo.place | html %]</i> [% END %][% IF ( suggestions_loo.collectiontitle ) %]; [% suggestions_loo.collectiontitle | html %] [% END %][% IF ( suggestions_loo.itemtype ) %]; [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestions_loo.itemtype, 0 ) | html %] [% END %]<br />[% IF ( suggestions_loo.note ) %]<div class="note"><i class="fa fa-comment"></i> [% suggestions_loo.note | html %]</div>[% END %]
497
                        [% IF ( suggestions_loo.isbn ) %]; ISBN:<i>[% suggestions_loo.isbn | html %]</i> [% END %][% IF ( suggestions_loo.publishercode ) %]; Published by [% suggestions_loo.publishercode | html %] [% END %][% IF ( suggestions_loo.publicationyear ) %] in <i>[% suggestions_loo.publicationyear | html %]</i> [% END %][% IF ( suggestions_loo.place ) %] in <i>[% suggestions_loo.place | html %]</i> [% END %][% IF ( suggestions_loo.collectiontitle ) %]; [% suggestions_loo.collectiontitle | html %] [% END %][% IF ( suggestions_loo.itemtype ) %]; [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestions_loo.itemtype, 0 ) | html %] [% END %]<br />
497
                </td>
498
                </td>
498
                <td>
499
                <td>
499
                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.suggestedby | uri %]">[% suggestions_loo.surnamesuggestedby | html %][% IF ( suggestions_loo.firstnamesuggestedby ) %], [% suggestions_loo.firstnamesuggestedby | html %][% END %] [% IF (suggestions_loo.cardnumbersuggestedby ) %]([% suggestions_loo.cardnumbersuggestedby | html %])[% END %]</a>
500
                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.suggestedby | uri %]">[% suggestions_loo.surnamesuggestedby | html %][% IF ( suggestions_loo.firstnamesuggestedby ) %], [% suggestions_loo.firstnamesuggestedby | html %][% END %] [% IF (suggestions_loo.cardnumbersuggestedby ) %]([% suggestions_loo.cardnumbersuggestedby | html %])[% END %]</a>
Lines 501-506 Link Here
501
                </td>
502
                </td>
502
                <td>
503
                <td>
503
                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.suggestedby | uri %]">[% suggestions_loo.surnamemanagedby | html %][% IF ( suggestions_loo.firstnamemanagedby ) %], [% suggestions_loo.firstnamemanagedby | html %][% END %]</a>
504
                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.suggestedby | uri %]">[% suggestions_loo.surnamemanagedby | html %][% IF ( suggestions_loo.firstnamemanagedby ) %], [% suggestions_loo.firstnamemanagedby | html %][% END %]</a>
505
                <td>
506
                    [% IF ( suggestions_loo.note ) %]<div class="note"><i class="fa fa-comment"></i> [% suggestions_loo.note | html %]</div>[% END %]
507
                </td>
504
                    [% IF ( suggestions_loo.manageddate ) %] - [% suggestions_loo.manageddate | $KohaDates %][% END %]
508
                    [% IF ( suggestions_loo.manageddate ) %] - [% suggestions_loo.manageddate | $KohaDates %][% END %]
505
                </td>
509
                </td>
506
                <td>
510
                <td>
(-)a/serials/subscription-renew.pl (-1 / +5 lines)
Lines 61-66 my $dbh = C4::Context->dbh; Link Here
61
my $mode           = $query->param('mode') || q{};
61
my $mode           = $query->param('mode') || q{};
62
my $op             = $query->param('op') || 'display';
62
my $op             = $query->param('op') || 'display';
63
my @subscriptionids = $query->multi_param('subscriptionid');
63
my @subscriptionids = $query->multi_param('subscriptionid');
64
my $branchcode     = $query->param('branchcode');
64
my $done = 0;    # for after form has been submitted
65
my $done = 0;    # for after form has been submitted
65
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
66
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
66
    {
67
    {
Lines 83-89 if ( $op eq "renew" ) { Link Here
83
        $subscriptionid, $loggedinuser,
84
        $subscriptionid, $loggedinuser,
84
        $startdate, scalar $query->param('numberlength'),
85
        $startdate, scalar $query->param('numberlength'),
85
        scalar $query->param('weeklength'), scalar $query->param('monthlength'),
86
        scalar $query->param('weeklength'), scalar $query->param('monthlength'),
86
        scalar $query->param('note')
87
        scalar $query->param('note'), $branchcode
87
    );
88
    );
88
} elsif ( $op eq 'multi_renew' ) {
89
} elsif ( $op eq 'multi_renew' ) {
89
    for my $subscriptionid ( @subscriptionids ) {
90
    for my $subscriptionid ( @subscriptionids ) {
Lines 113-120 if ( $op eq "renew" ) { Link Here
113
    );
114
    );
114
}
115
}
115
116
117
my $libraries = Koha::Libraries->search( {}, { order_by => ['branchcode'] }, );
118
116
$template->param(
119
$template->param(
117
    op => $op,
120
    op => $op,
121
    libraries      => $libraries,
118
);
122
);
119
123
120
output_html_with_http_headers $query, $cookie, $template->output;
124
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/suggestion/suggestion.pl (-2 lines)
Lines 28-34 use C4::Budgets; Link Here
28
use C4::Search;
28
use C4::Search;
29
use C4::Members;
29
use C4::Members;
30
use C4::Debug;
30
use C4::Debug;
31
32
use Koha::DateUtils qw( dt_from_string );
31
use Koha::DateUtils qw( dt_from_string );
33
use Koha::AuthorisedValues;
32
use Koha::AuthorisedValues;
34
use Koha::Acquisition::Currencies;
33
use Koha::Acquisition::Currencies;
35
- 

Return to bug 7047