Lines 1385-1390
sub AddIssue {
Link Here
|
1385 |
} |
1385 |
} |
1386 |
); |
1386 |
); |
1387 |
|
1387 |
|
|
|
1388 |
if ( $item->{'location'} eq 'CART' && $item->{'permanent_location'} ne 'CART' ) { |
1389 |
## Item was moved to cart via UpdateItemLocationOnCheckin, anything issued should be taken off the cart. |
1390 |
CartToShelf( $item->{'itemnumber'} ); |
1391 |
} |
1392 |
$item->{'issues'}++; |
1393 |
if ( C4::Context->preference('UpdateTotalIssuesOnCirc') ) { |
1394 |
UpdateTotalIssues($item->{'biblionumber'}, 1); |
1395 |
} |
1396 |
|
1388 |
if ( C4::Context->preference('ReturnToShelvingCart') ) { |
1397 |
if ( C4::Context->preference('ReturnToShelvingCart') ) { |
1389 |
# ReturnToShelvingCart is on, anything issued should be taken off the cart. |
1398 |
# ReturnToShelvingCart is on, anything issued should be taken off the cart. |
1390 |
CartToShelf( $item->{'itemnumber'} ); |
1399 |
CartToShelf( $item->{'itemnumber'} ); |
Lines 1854-1869
sub AddReturn {
Link Here
|
1854 |
} |
1863 |
} |
1855 |
} |
1864 |
} |
1856 |
|
1865 |
|
1857 |
if ( $item->{'location'} eq 'PROC' ) { |
1866 |
my $item = GetItem($itemnumber) or die "GetItem($itemnumber) failed"; |
1858 |
if ( C4::Context->preference("InProcessingToShelvingCart") ) { |
|
|
1859 |
$item->{'location'} = 'CART'; |
1860 |
} |
1861 |
else { |
1862 |
$item->{location} = $item->{permanent_location}; |
1863 |
} |
1864 |
|
1865 |
ModItem( $item, $item->{'biblionumber'}, $item->{'itemnumber'} ); |
1866 |
} |
1867 |
|
1867 |
|
1868 |
# full item data, but no borrowernumber or checkout info (no issue) |
1868 |
# full item data, but no borrowernumber or checkout info (no issue) |
1869 |
# we know GetItem should work because GetItemnumberFromBarcode worked |
1869 |
# we know GetItem should work because GetItemnumberFromBarcode worked |
Lines 1874-1879
sub AddReturn {
Link Here
|
1874 |
|
1874 |
|
1875 |
my $borrowernumber = $borrower->{'borrowernumber'} || undef; # we don't know if we had a borrower or not |
1875 |
my $borrowernumber = $borrower->{'borrowernumber'} || undef; # we don't know if we had a borrower or not |
1876 |
|
1876 |
|
|
|
1877 |
my $yaml = C4::Context->preference('UpdateItemLocationOnCheckin'); |
1878 |
if ($yaml) { |
1879 |
$yaml = "$yaml\n\n"; # YAML is strict on ending \n. Surplus does not hurt |
1880 |
my $rules; |
1881 |
eval { $rules = YAML::Load($yaml); }; |
1882 |
if ($@) { |
1883 |
warn "Unable to parse UpdateItemLocationOnCheckin syspref : $@"; |
1884 |
} |
1885 |
else { |
1886 |
if (defined $rules->{_ALL_}) { |
1887 |
if ($rules->{_ALL_} eq '_PERM_') { $rules->{_ALL_} = $item->{permanent_location}; } |
1888 |
if ($rules->{_ALL_} eq '_BLANK_') { $rules->{_ALL_} = ''; } |
1889 |
if ( $item->{location} ne $rules->{_ALL_}) { |
1890 |
$messages->{'ItemLocationUpdated'} = { from => $item->{location}, to => $rules->{_ALL_} }; |
1891 |
ModItem( { location => $rules->{_ALL_} }, undef, $itemnumber ); |
1892 |
} |
1893 |
} |
1894 |
else { |
1895 |
foreach my $key ( keys %$rules ) { |
1896 |
if ( $rules->{$key} eq '_PERM_' ) { $rules->{$key} = $item->{permanent_location}; } |
1897 |
if ( $rules->{$key} eq '_BLANK_') { $rules->{$key} = '' ;} |
1898 |
if ( ($item->{location} eq $key && $item->{location} ne $rules->{$key}) || ($key eq '_BLANK_' && $item->{location} eq '' && $rules->{$key} ne '') ) { |
1899 |
$messages->{'ItemLocationUpdated'} = { from => $item->{location}, to => $rules->{$key} }; |
1900 |
ModItem( { location => $rules->{$key} }, undef, $itemnumber ); |
1901 |
last; |
1902 |
} |
1903 |
} |
1904 |
} |
1905 |
} |
1906 |
} |
1907 |
|
1877 |
my $yaml = C4::Context->preference('UpdateNotForLoanStatusOnCheckin'); |
1908 |
my $yaml = C4::Context->preference('UpdateNotForLoanStatusOnCheckin'); |
1878 |
if ($yaml) { |
1909 |
if ($yaml) { |
1879 |
$yaml = "$yaml\n\n"; # YAML is anal on ending \n. Surplus does not hurt |
1910 |
$yaml = "$yaml\n\n"; # YAML is anal on ending \n. Surplus does not hurt |
Lines 1982-1996
sub AddReturn {
Link Here
|
1982 |
); |
2013 |
); |
1983 |
$sth->execute( $item->{'itemnumber'} ); |
2014 |
$sth->execute( $item->{'itemnumber'} ); |
1984 |
# if we have a reservation with valid transfer, we can set it's status to 'W' |
2015 |
# if we have a reservation with valid transfer, we can set it's status to 'W' |
1985 |
ShelfToCart( $item->{'itemnumber'} ) if ( C4::Context->preference("ReturnToShelvingCart") ); |
|
|
1986 |
C4::Reserves::ModReserveStatus($item->{'itemnumber'}, 'W'); |
2016 |
C4::Reserves::ModReserveStatus($item->{'itemnumber'}, 'W'); |
1987 |
} else { |
2017 |
} else { |
1988 |
$messages->{'WrongTransfer'} = $tobranch; |
2018 |
$messages->{'WrongTransfer'} = $tobranch; |
1989 |
$messages->{'WrongTransferItem'} = $item->{'itemnumber'}; |
2019 |
$messages->{'WrongTransferItem'} = $item->{'itemnumber'}; |
1990 |
} |
2020 |
} |
1991 |
$validTransfert = 1; |
2021 |
$validTransfert = 1; |
1992 |
} else { |
|
|
1993 |
ShelfToCart( $item->{'itemnumber'} ) if ( C4::Context->preference("ReturnToShelvingCart") ); |
1994 |
} |
2022 |
} |
1995 |
|
2023 |
|
1996 |
# fix up the accounts..... |
2024 |
# fix up the accounts..... |