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

(-)a/C4/Circulation.pm (-2 / +6 lines)
Lines 339-346 sub transferbook { Link Here
339
339
340
    # check if it is still issued to someone, return it...
340
    # check if it is still issued to someone, return it...
341
    if ($issue->{borrowernumber}) {
341
    if ($issue->{borrowernumber}) {
342
        AddReturn( $barcode, $fbr );
342
        if ( C4::Context->preference('ReturnItemWhenTransferred') ) {
343
        $messages->{'WasReturned'} = $issue->{borrowernumber};
343
            AddReturn( $barcode, $fbr );
344
            $messages->{'WasReturned'} = $issue->{borrowernumber};
345
        } else {
346
            $messages->{'NotReturned'} = $issue->{borrowernumber};
347
        }
344
    }
348
    }
345
349
346
    # find reserves.....
350
    # 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 427-429 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' Link Here
427
INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('UseCourseReserves', '0', 'Enable the course reserves feature.', NULL, 'YesNo');
427
INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('UseCourseReserves', '0', 'Enable the course reserves feature.', NULL, 'YesNo');
428
INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowHoldNotes',0,'Show hold notes on OPAC','','YesNo');
428
INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowHoldNotes',0,'Show hold notes on OPAC','','YesNo');
429
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('CalculateFinesOnReturn','1','Switch to control if overdue fines are calculated on return or not', '', 'YesNo');
429
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('CalculateFinesOnReturn','1','Switch to control if overdue fines are calculated on return or not', '', 'YesNo');
430
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 6983-6988 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( Link Here
6983
    SetVersion($DBversion);
6983
    SetVersion($DBversion);
6984
}
6984
}
6985
6985
6986
$DBversion = "3.13.00.XXX";
6987
if(CheckVersion($DBversion)) {
6988
    $dbh->do(
6989
        q{
6990
            INSERT INTO systempreferences (
6991
                variable,
6992
                value,
6993
                options,
6994
                explanation,
6995
                type
6996
            ) VALUES (
6997
                'ReturnItemWhenTransferred',
6998
                '1',
6999
                NULL ,
7000
                '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.',
7001
                'YesNo'
7002
            )
7003
        }
7004
    );
7005
    print "Upgrade to $DBversion done (Bug 10378 - Enable checked out items to be transferred without returning them)\n";
7006
    SetVersion($DBversion);
7007
}
6986
7008
6987
=head1 FUNCTIONS
7009
=head1 FUNCTIONS
6988
7010
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (+7 lines)
Lines 557-559 Circulation: Link Here
557
                  yes: Use
557
                  yes: Use
558
                  no: "Don't use"
558
                  no: "Don't use"
559
            - course reserves
559
            - course reserves
560
    Transfers Policy:
561
        -
562
            - pref: ReturnItemWhenTransferred
563
              choices:
564
                  yes: "Do"
565
                  no: "Don't"
566
            - 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