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

(-)a/C4/Circulation.pm (-8 / +8 lines)
Lines 2131-2144 sub AddReturn { Link Here
2131
        DelUniqueDebarment({ borrowernumber => $borrowernumber, type => 'OVERDUES' });
2131
        DelUniqueDebarment({ borrowernumber => $borrowernumber, type => 'OVERDUES' });
2132
    }
2132
    }
2133
2133
2134
	# Check if this item belongs to a biblio record that is attached to an
2134
    # Check if this item belongs to a biblio record that is attached to an
2135
	# ILL request, if it is we need to update the ILL request's status
2135
    # ILL request, if it is we need to update the ILL request's status
2136
	if (C4::Context->preference('CirculateILL')) {
2136
    if (C4::Context->preference('CirculateILL')) {
2137
		my $request = Koha::Illrequests->find(
2137
        my $request = Koha::Illrequests->find(
2138
			{ biblio_id => $item->biblio->biblionumber }
2138
            { biblio_id => $item->biblio->biblionumber }
2139
		);
2139
        );
2140
		$request->status('RET') if $request;
2140
        $request->status('RET') if $request;
2141
	}
2141
    }
2142
2142
2143
    # Transfer to returnbranch if Automatic transfer set or append message NeedsTransfer
2143
    # Transfer to returnbranch if Automatic transfer set or append message NeedsTransfer
2144
    if (!$is_in_rotating_collection && ($doreturn or $messages->{'NotIssued'}) and !$resfound and ($branch ne $returnbranch) and not $messages->{'WrongTransfer'}){
2144
    if (!$is_in_rotating_collection && ($doreturn or $messages->{'NotIssued'}) and !$resfound and ($branch ne $returnbranch) and not $messages->{'WrongTransfer'}){
(-)a/Koha/Illrequest.pm (-9 / +9 lines)
Lines 499-513 sub _core_status_graph { Link Here
499
            next_actions   => [ ],
499
            next_actions   => [ ],
500
            ui_method_icon => 'fa-upload',
500
            ui_method_icon => 'fa-upload',
501
        },
501
        },
502
		RET => {
502
        RET => {
503
			prev_actions   => [ 'CHK' ],
503
            prev_actions   => [ 'CHK' ],
504
			id             => 'RET',
504
            id             => 'RET',
505
			name           => 'Returned to library',
505
            name           => 'Returned to library',
506
			ui_method_name => 'Check in',
506
            ui_method_name => 'Check in',
507
			method         => 'check_in',
507
            method         => 'check_in',
508
			next_actions   => [ 'COMP' ],
508
            next_actions   => [ 'COMP' ],
509
			ui_method_icon => 'fa-download',
509
            ui_method_icon => 'fa-download',
510
		}
510
        }
511
    };
511
    };
512
}
512
}
513
513
(-)a/installer/data/mysql/atomicupdate/bug_23112_add_CirculateILL_syspref.perl (+6 lines)
Line 0 Link Here
1
$DBversion = 'XXX'; # will be replaced by the RM
2
if( CheckVersion( $DBversion ) ) {
3
    $dbh->do( q| INSERT IGNORE INTO systempreferences (variable, value, explanation, options, type) VALUES ('CirculateILL', '0', 'If enabled, it is possible to circulate ILL requested items from within ILL', '', 'YesNo'); | );
4
    SetVersion( $DBversion );
5
    print "Upgrade to $DBversion done (Bug 23112  - Add CirculateILL syspref)\n";
6
}
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 120-125 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
120
('CircAutoPrintQuickSlip','qslip',NULL,'Choose what should happen when an empty barcode field is submitted in circulation: Display a print quick slip window, Display a print slip window or Clear the screen.','Choice'),
120
('CircAutoPrintQuickSlip','qslip',NULL,'Choose what should happen when an empty barcode field is submitted in circulation: Display a print quick slip window, Display a print slip window or Clear the screen.','Choice'),
121
('CircControl','ItemHomeLibrary','PickupLibrary|PatronLibrary|ItemHomeLibrary','Specify the agency that controls the circulation and fines policy','Choice'),
121
('CircControl','ItemHomeLibrary','PickupLibrary|PatronLibrary|ItemHomeLibrary','Specify the agency that controls the circulation and fines policy','Choice'),
122
('CircSidebar','0',NULL,'Activate or deactivate the navigation sidebar on all Circulation pages','YesNo'),
122
('CircSidebar','0',NULL,'Activate or deactivate the navigation sidebar on all Circulation pages','YesNo'),
123
('CirculateILL','0','','If enabled, it is possible to circulate ILL items from within ILL','YesNo'),
123
('ClaimsBccCopy','0','','Bcc the ClaimAcquisition and ClaimIssues alerts','YesNo'),
124
('ClaimsBccCopy','0','','Bcc the ClaimAcquisition and ClaimIssues alerts','YesNo'),
124
('ClaimReturnedChargeFee', 'ask', 'ask|charge|no_charge', 'Controls whether or not a lost item fee is charged for return claims', 'Choice'),
125
('ClaimReturnedChargeFee', 'ask', 'ask|charge|no_charge', 'Controls whether or not a lost item fee is charged for return claims', 'Choice'),
125
('ClaimReturnedLostValue', '', '', 'Sets the LOST AV value that represents "Claims returned" as a lost value', 'Free'),
126
('ClaimReturnedLostValue', '', '', 'Sets the LOST AV value that represents "Claims returned" as a lost value', 'Free'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (-7 / +7 lines)
Lines 855-867 Circulation: Link Here
855
                  yes: Enable
855
                  yes: Enable
856
                  no: Disable
856
                  no: Disable
857
            - unmediated Interlibrary loan requests. If enabled and the ILL backend supports it, the newly created requests are immediately requested by backend.
857
            - unmediated Interlibrary loan requests. If enabled and the ILL backend supports it, the newly created requests are immediately requested by backend.
858
		-
858
        -
859
			- pref: CirculateILL
859
            - pref: CirculateILL
860
			  default: 0
860
              default: 0
861
			  choices:
861
              choices:
862
			      yes: Enable
862
                  yes: Enable
863
			      no: Disable
863
                  no: Disable
864
			- the circulation of ILL requested items
864
            - the circulation of ILL requested items
865
    Fines Policy:
865
    Fines Policy:
866
        -
866
        -
867
            - pref: finesCalendar
867
            - pref: finesCalendar
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt (-8 / +7 lines)
Lines 133-139 Link Here
133
                            </div>
133
                            </div>
134
                            [% ELSE %]
134
                            [% ELSE %]
135
                            <div class="alert">
135
                            <div class="alert">
136
                                There was a problem checking this item out, please check for problems with the <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% whole.value.patron.borrowernumber %]">patron's account</a>
136
                                There was a problem checking this item out, please check for problems with the <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% whole.value.patron.borrowernumber | uri %]">patron's account</a>
137
                            </div>
137
                            </div>
138
                            [% END %]
138
                            [% END %]
139
                        [% END %]
139
                        [% END %]
Lines 154-162 Link Here
154
                                                <option value=""></option>
154
                                                <option value=""></option>
155
                                                [% FOREACH stat IN whole.value.statistical %]
155
                                                [% FOREACH stat IN whole.value.statistical %]
156
                                                    [% IF stat.borrowernumber == params.inhouse %]
156
                                                    [% IF stat.borrowernumber == params.inhouse %]
157
                                                        <option value="[% stat.cardnumber %]" selected>[% stat.firstname %] [% stat.surname %]</option>
157
                                                        <option value="[% stat.cardnumber | html %]" selected>[% INCLUDE 'patron-title.inc' patron = stat %]</option>
158
                                                    [% ELSE %]
158
                                                    [% ELSE %]
159
                                                        <option value="[% stat.cardnumber %]">[% stat.firstname %] [% stat.surname %]</option>
159
                                                        <option value="[% stat.cardnumber | html %]">[% INCLUDE 'patron-title.inc' patron = stat %]</option>
160
                                                    [% END %]
160
                                                    [% END %]
161
                                                [% END %]
161
                                                [% END %]
162
                                            </select>
162
                                            </select>
Lines 193-199 Link Here
193
                                        [% IF items.size == 1 %]
193
                                        [% IF items.size == 1 %]
194
                                            <li>
194
                                            <li>
195
                                                <label for="barcode" class="ill_checkout_barcode_label">Item barcode:</label>
195
                                                <label for="barcode" class="ill_checkout_barcode_label">Item barcode:</label>
196
                                                [% items.0.barcode %]
196
                                                [% items.0.barcode | html %]
197
                                            </li>
197
                                            </li>
198
                                        [% END %]
198
                                        [% END %]
199
                                        <li class="ill_checkout_branchcode">
199
                                        <li class="ill_checkout_branchcode">
Lines 206-212 Link Here
206
                                            [% ELSE %]
206
                                            [% ELSE %]
207
                                                [% FOREACH branch IN whole.value.libraries.unblessed %]
207
                                                [% FOREACH branch IN whole.value.libraries.unblessed %]
208
                                                    [% IF branch.branchcode == branchcode %]
208
                                                    [% IF branch.branchcode == branchcode %]
209
                                                        [% branch.branchname %]
209
                                                        [% branch.branchname | html %]
210
                                                    [% END %]
210
                                                    [% END %]
211
                                                [% END %]
211
                                                [% END %]
212
                                            [% END %]
212
                                            [% END %]
Lines 225-232 Link Here
225
                                    <input type="hidden" value="check_out" name="method">
225
                                    <input type="hidden" value="check_out" name="method">
226
                                    <input type="hidden" value="form" name="stage">
226
                                    <input type="hidden" value="form" name="stage">
227
                                    [% IF items.size == 1 %]
227
                                    [% IF items.size == 1 %]
228
                                        <input name="branchcode" type="hidden" value="[% branchcode  %]">
228
                                        <input name="branchcode" type="hidden" value="[% branchcode | html %]">
229
                                        <input name="item_type" type="hidden" value="[% items.0.itype %]">
229
                                        <input name="item_type" type="hidden" value="[% items.0.itype | html %]">
230
                                    [% END %]
230
                                    [% END %]
231
                                    <input type="hidden" value="[% request.illrequest_id | html %]" name="illrequest_id">
231
                                    <input type="hidden" value="[% request.illrequest_id | html %]" name="illrequest_id">
232
                                    <input type="submit" value="Submit">
232
                                    <input type="submit" value="Submit">
233
- 

Return to bug 23112