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

(-)a/circ/circulation.pl (+2 lines)
Lines 47-52 use Koha::AuthorisedValues; Link Here
47
use Koha::CsvProfiles;
47
use Koha::CsvProfiles;
48
use Koha::Patrons;
48
use Koha::Patrons;
49
use Koha::Patron::Debarments qw(GetDebarments);
49
use Koha::Patron::Debarments qw(GetDebarments);
50
use Koha::RestrictionTypes;
50
use Koha::DateUtils;
51
use Koha::DateUtils;
51
use Koha::Database;
52
use Koha::Database;
52
use Koha::BiblioFrameworks;
53
use Koha::BiblioFrameworks;
Lines 638-643 $template->param( Link Here
638
    SpecifyDueDate            => $duedatespec_allow,
639
    SpecifyDueDate            => $duedatespec_allow,
639
    CircAutocompl             => C4::Context->preference("CircAutocompl"),
640
    CircAutocompl             => C4::Context->preference("CircAutocompl"),
640
    debarments                => scalar GetDebarments({ borrowernumber => $borrowernumber }),
641
    debarments                => scalar GetDebarments({ borrowernumber => $borrowernumber }),
642
    restriction_types         => scalar Koha::RestrictionTypes->keyed_on_code(),
641
    todaysdate                => output_pref( { dt => dt_from_string()->set(hour => 23)->set(minute => 59), dateformat => 'sql' } ),
643
    todaysdate                => output_pref( { dt => dt_from_string()->set(hour => 23)->set(minute => 59), dateformat => 'sql' } ),
642
    has_modifications         => $has_modifications,
644
    has_modifications         => $has_modifications,
643
    override_high_holds       => $override_high_holds,
645
    override_high_holds       => $override_high_holds,
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc (-10 / +2 lines)
Lines 17-34 Link Here
17
            </thead>
17
            </thead>
18
            <tbody>
18
            <tbody>
19
                [% FOREACH d IN debarments %]
19
                [% FOREACH d IN debarments %]
20
                    [% dtype = d.type %]
20
                    <tr>
21
                    <tr>
21
                        <td>
22
                        <td>
22
                            [% SWITCH d.type %]
23
                            [% restriction_types.$dtype.display_text | html %]
23
                                [% CASE 'MANUAL' %]
24
                                    Manual
25
                                [% CASE 'OVERDUES' %]
26
                                    Overdues
27
                                [% CASE 'SUSPENSION' %]
28
                                    Suspension
29
                                [% CASE 'DISCHARGE' %]
30
                                    Discharge
31
                            [% END %]
32
                        </td>
24
                        </td>
33
                        <td>
25
                        <td>
34
			    [% IF d.comment.search('OVERDUES_PROCESS') %]
26
			    [% IF d.comment.search('OVERDUES_PROCESS') %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-1 / +2 lines)
Lines 1013-1020 Link Here
1013
1013
1014
                        <tbody>
1014
                        <tbody>
1015
                            [% FOREACH d IN debarments %]
1015
                            [% FOREACH d IN debarments %]
1016
                                [% dtype = d.type %]
1016
                                <tr>
1017
                                <tr>
1017
                                    <td>[% d.type | html %]</td>
1018
                                    <td>[% restriction_types.$dtype.display_text | html %]</td>
1018
                                    <td>
1019
                                    <td>
1019
                                    [% IF d.comment.search('OVERDUES_PROCESS') %]
1020
                                    [% IF d.comment.search('OVERDUES_PROCESS') %]
1020
                                        Restriction added by overdues process [% d.comment.remove('OVERDUES_PROCESS ') | $raw %]
1021
                                        Restriction added by overdues process [% d.comment.remove('OVERDUES_PROCESS ') | $raw %]
(-)a/members/memberentry.pl (-1 / +4 lines)
Lines 39-44 use C4::Form::MessagingPreferences; Link Here
39
use Koha::AuthUtils;
39
use Koha::AuthUtils;
40
use Koha::AuthorisedValues;
40
use Koha::AuthorisedValues;
41
use Koha::Patron::Debarments;
41
use Koha::Patron::Debarments;
42
use Koha::RestrictionTypes;
42
use Koha::Cities;
43
use Koha::Cities;
43
use Koha::DateUtils;
44
use Koha::DateUtils;
44
use Koha::Libraries;
45
use Koha::Libraries;
Lines 120-126 foreach my $id ( @delete_guarantor ) { Link Here
120
121
121
## Deal with debarments
122
## Deal with debarments
122
$template->param(
123
$template->param(
123
    debarments => scalar GetDebarments( { borrowernumber => $borrowernumber } ) );
124
    debarments => scalar GetDebarments( { borrowernumber => $borrowernumber } ),
125
    restriction_types => scalar Koha::RestrictionTypes->keyed_on_code()
126
);
124
my @debarments_to_remove = $input->multi_param('remove_debarment');
127
my @debarments_to_remove = $input->multi_param('remove_debarment');
125
foreach my $d ( @debarments_to_remove ) {
128
foreach my $d ( @debarments_to_remove ) {
126
    DelDebarment( $d );
129
    DelDebarment( $d );
(-)a/members/moremember.pl (-1 / +2 lines)
Lines 37-42 use C4::Form::MessagingPreferences; Link Here
37
use List::MoreUtils qw/uniq/;
37
use List::MoreUtils qw/uniq/;
38
use C4::Members::Attributes qw(GetBorrowerAttributes);
38
use C4::Members::Attributes qw(GetBorrowerAttributes);
39
use Koha::Patron::Debarments qw(GetDebarments);
39
use Koha::Patron::Debarments qw(GetDebarments);
40
use Koha::RestrictionTypes;
40
use Koha::Patron::Messages;
41
use Koha::Patron::Messages;
41
use Koha::DateUtils;
42
use Koha::DateUtils;
42
use Koha::CsvProfiles;
43
use Koha::CsvProfiles;
Lines 91-96 for (qw(gonenoaddress lost borrowernotes is_debarred)) { Link Here
91
if ( $patron->is_debarred ) {
92
if ( $patron->is_debarred ) {
92
    $template->param(
93
    $template->param(
93
        debarments => scalar GetDebarments({ borrowernumber => $borrowernumber }),
94
        debarments => scalar GetDebarments({ borrowernumber => $borrowernumber }),
95
        restriction_types => scalar Koha::RestrictionTypes->keyed_on_code()
94
    );
96
    );
95
    if ( $patron->debarred ne "9999-12-31" ) {
97
    if ( $patron->debarred ne "9999-12-31" ) {
96
        $template->param( 'userdebarreddate' => $patron->debarred );
98
        $template->param( 'userdebarreddate' => $patron->debarred );
97
- 

Return to bug 23681