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

(-)a/C4/Circulation.pm (-2 / +6 lines)
Lines 338-345 sub transferbook { Link Here
338
338
339
    # check if it is still issued to someone, return it...
339
    # check if it is still issued to someone, return it...
340
    if ($issue->{borrowernumber}) {
340
    if ($issue->{borrowernumber}) {
341
        AddReturn( $barcode, $fbr );
341
        if ( C4::Context->preference('ReturnItemWhenTransferred') ) {
342
        $messages->{'WasReturned'} = $issue->{borrowernumber};
342
            AddReturn( $barcode, $fbr );
343
            $messages->{'WasReturned'} = $issue->{borrowernumber};
344
        } else {
345
            $messages->{'NotReturned'} = $issue->{borrowernumber};
346
        }
343
    }
347
    }
344
348
345
    # find reserves.....
349
    # find reserves.....
(-)a/circ/branchtransfers.pl (+9 lines)
Lines 221-226 foreach my $code ( keys %$messages ) { Link Here
221
            $err{surname}    = $borrower->{'surname'};
221
            $err{surname}    = $borrower->{'surname'};
222
            $err{cardnumber} = $borrower->{'cardnumber'};
222
            $err{cardnumber} = $borrower->{'cardnumber'};
223
        }
223
        }
224
        elsif ( $code eq 'NotReturned' ) {
225
            $err{NotReturned} = 1;
226
            $err{borrowernumber} = $messages->{'NotReturned'};
227
            my $borrower = GetMember('borrowernumber'=>$messages->{'NotReturned'});
228
            $err{title}      = $borrower->{'title'};
229
            $err{firstname}  = $borrower->{'firstname'};
230
            $err{surname}    = $borrower->{'surname'};
231
            $err{cardnumber} = $borrower->{'cardnumber'};
232
        }
224
        $err{errdesteqholding} = ( $code eq 'DestinationEqualsHolding' );
233
        $err{errdesteqholding} = ( $code eq 'DestinationEqualsHolding' );
225
        push( @errmsgloop, \%err );
234
        push( @errmsgloop, \%err );
226
    }
235
    }
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 390-392 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' Link Here
390
INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('OPACNumbersPreferPhrase','0', NULL, 'Control the use of phr operator in callnumber and standard number OPAC searches', 'YesNo');
390
INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('OPACNumbersPreferPhrase','0', NULL, 'Control the use of phr operator in callnumber and standard number OPAC searches', 'YesNo');
391
INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('IntranetNumbersPreferPhrase','0', NULL, 'Control the use of phr operator in callnumber and standard number staff client searches', 'YesNo');
391
INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('IntranetNumbersPreferPhrase','0', NULL, 'Control the use of phr operator in callnumber and standard number staff client searches', 'YesNo');
392
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('UNIMARCAuthorsFacetsSeparator',', ', 'UNIMARC authors facets separator', NULL, 'short');
392
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('UNIMARCAuthorsFacetsSeparator',', ', 'UNIMARC authors facets separator', NULL, 'short');
393
INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('ReturnItemWhenTransferred','1',NULL,'If enabled, items will be automatically returned when transferred. If disabled, items will not be returned when transferred, and if the item is checked out to a patron, it will remain checked out.','YesNo');
(-)a/installer/data/mysql/updatedatabase.pl (+22 lines)
Lines 6214-6219 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
6214
    SetVersion($DBversion);
6214
    SetVersion($DBversion);
6215
}
6215
}
6216
6216
6217
$DBversion = "3.13.00.XXX";
6218
if(CheckVersion($DBversion)) {
6219
    $dbh->do(
6220
        q{
6221
            INSERT INTO systempreferences (
6222
                variable,
6223
                value,
6224
                options,
6225
                explanation,
6226
                type
6227
            ) VALUES (
6228
                'ReturnItemWhenTransferred',
6229
                '1',
6230
                NULL ,
6231
                'If enabled, items will be automatically returned when transferred. If disabled, items will not be returned when transferred, and if the item is checked out to a patron, it will remain checked out.',
6232
                'YesNo'
6233
            )
6234
        }
6235
    );
6236
    print "Upgrade to $DBversion done (Bug 10378 - Enable checked out items to be transferred without returning them)\n";
6237
    SetVersion($DBversion);
6238
}
6217
6239
6218
=head1 FUNCTIONS
6240
=head1 FUNCTIONS
6219
6241
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (+7 lines)
Lines 497-499 Circulation: Link Here
497
            - and this password
497
            - and this password
498
            - pref: AutoSelfCheckPass
498
            - pref: AutoSelfCheckPass
499
            - .
499
            - .
500
    Transfers Policy:
501
        -
502
            - pref: ReturnItemWhenTransferred
503
              choices:
504
                  yes: "Do"
505
                  no: "Don't"
506
            - automatically check in items when they are transferred.
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt (-1 / +5 lines)
Lines 120-125 Link Here
120
                                  [% errmsgloo.firstname %] [% errmsgloo.surname %]
120
                                  [% errmsgloo.firstname %] [% errmsgloo.surname %]
121
                                  ([% errmsgloo.cardnumber %])</a> and has been returned.</li>
121
                                  ([% errmsgloo.cardnumber %])</a> and has been returned.</li>
122
                              [% END %]
122
                              [% END %]
123
                              [% IF ( errmsgloo.NotReturned ) %]
124
                                  <li>Item is on loan to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% errmsgloo.borrowernumber %]">
125
                                  [% errmsgloo.firstname %] [% errmsgloo.surname %]
126
                                  ([% errmsgloo.cardnumber %])</a> but has been <i>not</i> been returned.</li>
127
                              [% END %]
123
                          [% END %]
128
                          [% END %]
124
                          </ul>
129
                          </ul>
125
                            </div>
130
                            </div>
126
- 

Return to bug 10378