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

(-)a/installer/data/mysql/atomicupdate/bug_37344.pl (-2 / +2 lines)
Lines 27-34 return { Link Here
27
            $dbh->do(
27
            $dbh->do(
28
                q{
28
                q{
29
                    INSERT IGNORE INTO authorised_values (category, authorised_value, lib) VALUES
29
                    INSERT IGNORE INTO authorised_values (category, authorised_value, lib) VALUES
30
                    ('DISCHARGE_CANCELLATION','PATRON_MISTAKE', 'Patron asked a discharge by mistake'),
30
                    ('DISCHARGE_CANCELLATION','PATRON_MISTAKE', 'The patron asked for a discharge by mistake.'),
31
                    ('DISCHARGE_CANCELLATION','PATRON_STILL_NEEDS_ACCOUNT','Administration required a discharge however the patron still needs to use their account')
31
                    ('DISCHARGE_CANCELLATION','PATRON_STILL_NEEDS_ACCOUNT','A discharge was required, however the patron still needs to use their account.')
32
                }
32
                }
33
            );
33
            );
34
34
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt (-1 / +1 lines)
Lines 517-523 Link Here
517
    [% CASE 'AR_CANCELLATION' %]
517
    [% CASE 'AR_CANCELLATION' %]
518
        <p>Reasons why an article request might have been cancelled</p>
518
        <p>Reasons why an article request might have been cancelled</p>
519
    [% CASE 'DISCHARGE_CANCELLATION' %]
519
    [% CASE 'DISCHARGE_CANCELLATION' %]
520
        <p>Reasons why a discharge can be cancelled</p>
520
        <p>Reasons for cancelling a discharge</p>
521
    [% CASE 'HSBND_FREQ' %]
521
    [% CASE 'HSBND_FREQ' %]
522
        <p>Frequencies used by the housebound module. They are displayed on the housebound tab in the patron account in staff.</p>
522
        <p>Frequencies used by the housebound module. They are displayed on the housebound tab in the patron account in staff.</p>
523
    [% CASE 'ITEMTYPECAT' %]
523
    [% CASE 'ITEMTYPECAT' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt (-4 / +3 lines)
Lines 87-93 Link Here
87
                        <th>Requested</th>
87
                        <th>Requested</th>
88
                        <th>Validated</th>
88
                        <th>Validated</th>
89
                        <th>Cancelled</th>
89
                        <th>Cancelled</th>
90
                        <th>Reason of cancellation</th>
90
                        <th>Reason cancelled</th>
91
                        <th>Cancel</th>
91
                        <th>Cancel</th>
92
                    </tr>
92
                    </tr>
93
                </thead>
93
                </thead>
Lines 126-132 Link Here
126
    <div class="modal-dialog modal-lg">
126
    <div class="modal-dialog modal-lg">
127
        <div class="modal-content">
127
        <div class="modal-content">
128
            <div class="modal-header">
128
            <div class="modal-header">
129
                <h1 class="modal-title" id="cancelModalLabel">Confirm deletion</h1>
129
                <h1 class="modal-title" id="cancelModalLabel">Confirm cancellation</h1>
130
                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
130
                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
131
            </div>
131
            </div>
132
            <form id="cancel_modal_form" method="post" action="discharge.pl">
132
            <form id="cancel_modal_form" method="post" action="discharge.pl">
Lines 135-141 Link Here
135
                    <input name="op" type="hidden" value="cud-cancel-discharge" />
135
                    <input name="op" type="hidden" value="cud-cancel-discharge" />
136
                    <div id="cancel_discharge_alert" class="alert alert-danger" style="display:none;"></div>
136
                    <div id="cancel_discharge_alert" class="alert alert-danger" style="display:none;"></div>
137
                    <fieldset class="action">
137
                    <fieldset class="action">
138
                        <p>Are you sure you want to cancel this discharge ? Borrower will again have right to check out books after this.</p>
138
                        <p>Are you sure you want to cancel this discharge? The patron will be able to check out items again.</p>
139
                        [% SET discharge_cancellation_reasons = AuthorisedValues.GetAuthValueDropbox('DISCHARGE_CANCELLATION') %]
139
                        [% SET discharge_cancellation_reasons = AuthorisedValues.GetAuthValueDropbox('DISCHARGE_CANCELLATION') %]
140
                        [% IF discharge_cancellation_reasons.count %]
140
                        [% IF discharge_cancellation_reasons.count %]
141
                            <label for="cancellation-reason">Cancellation reason: </label>
141
                            <label for="cancellation-reason">Cancellation reason: </label>
142
- 

Return to bug 37344