|
Lines 16-21
use C4::Debug;
Link Here
|
| 16 |
use C4::Items qw( ModItemTransfer ); |
16 |
use C4::Items qw( ModItemTransfer ); |
| 17 |
use C4::Reserves qw( ModReserveAffect ); |
17 |
use C4::Reserves qw( ModReserveAffect ); |
| 18 |
use Koha::DateUtils qw( dt_from_string ); |
18 |
use Koha::DateUtils qw( dt_from_string ); |
|
|
19 |
use Koha::Items; |
| 19 |
|
20 |
|
| 20 |
use parent qw(C4::SIP::ILS::Transaction); |
21 |
use parent qw(C4::SIP::ILS::Transaction); |
| 21 |
|
22 |
|
|
Lines 71-78
sub do_checkin {
Link Here
|
| 71 |
$return_date = dt_from_string($return_date); |
72 |
$return_date = dt_from_string($return_date); |
| 72 |
} |
73 |
} |
| 73 |
|
74 |
|
|
|
75 |
my ( $return, $messages, $issue, $borrower ); |
| 76 |
my $item = Koha::Items->find( { barcode => $barcode } ); |
| 77 |
my $human_required = 0; |
| 78 |
if ( C4::Context->preference("CircConfirmItemParts") |
| 79 |
&& defined($item) |
| 80 |
&& $item->materials ) |
| 81 |
{ |
| 82 |
$human_required = 1; |
| 83 |
$messages->{additional_materials} = 1; |
| 84 |
} |
| 85 |
|
| 74 |
$debug and warn "do_checkin() calling AddReturn($barcode, $branch)"; |
86 |
$debug and warn "do_checkin() calling AddReturn($barcode, $branch)"; |
| 75 |
my ($return, $messages, $issue, $borrower) = AddReturn($barcode, $branch, undef, $return_date); |
87 |
( $return, $messages, $issue, $borrower ) = |
|
|
88 |
AddReturn( $barcode, $branch, undef, $return_date ) |
| 89 |
unless $human_required; |
| 76 |
|
90 |
|
| 77 |
if ( $checked_in_ok ) { |
91 |
if ( $checked_in_ok ) { |
| 78 |
delete $messages->{ItemLocationUpdated}; |
92 |
delete $messages->{ItemLocationUpdated}; |
|
Lines 84-89
sub do_checkin {
Link Here
|
| 84 |
# biblionumber, biblioitemnumber, itemnumber |
98 |
# biblionumber, biblioitemnumber, itemnumber |
| 85 |
# borrowernumber, reservedate, branchcode |
99 |
# borrowernumber, reservedate, branchcode |
| 86 |
# cancellationdate, found, reservenotes, priority, timestamp |
100 |
# cancellationdate, found, reservenotes, priority, timestamp |
|
|
101 |
if ($messages->{additional_materials}) { |
| 102 |
$self->alert_type('99'); |
| 103 |
} |
| 87 |
if( $messages->{DataCorrupted} ) { |
104 |
if( $messages->{DataCorrupted} ) { |
| 88 |
$self->alert_type('98'); |
105 |
$self->alert_type('98'); |
| 89 |
} |
106 |
} |
| 90 |
- |
|
|