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

(-)a/C4/Circulation.pm (-11 / +7 lines)
Lines 1453-1459 sub AddIssue { Link Here
1453
                SendCirculationAlert(
1453
                SendCirculationAlert(
1454
                    {
1454
                    {
1455
                        type     => 'CHECKOUT',
1455
                        type     => 'CHECKOUT',
1456
                        item     => $item,
1456
                        item     => $item->unblessed,
1457
                        borrower => $borrower,
1457
                        borrower => $borrower,
1458
                        branch   => $branch,
1458
                        branch   => $branch,
1459
                    }
1459
                    }
Lines 1823-1836 sub AddReturn { Link Here
1823
    my $itemnumber = $item->itemnumber;
1823
    my $itemnumber = $item->itemnumber;
1824
    my $itemtype = $item->effective_itemtype;
1824
    my $itemtype = $item->effective_itemtype;
1825
1825
1826
    my $issue  = Koha::Checkouts->find( { itemnumber => $itemnumber } );
1826
    my $issue  = $item->checkout;
1827
    if ( $issue ) {
1827
    if ( $issue ) {
1828
        $patron = Koha::Patrons->find( $issue->borrowernumber )
1828
        $patron = $issue->patron
1829
            or die "Data inconsistency: barcode $barcode (itemnumber:$itemnumber) claims to be issued to non-existent borrowernumber '" . $issue->borrowernumber . "'\n"
1829
            or die "Data inconsistency: barcode $barcode (itemnumber:$itemnumber) claims to be issued to non-existent borrowernumber '" . $issue->borrowernumber . "'\n"
1830
                . Dumper($issue->unblessed) . "\n";
1830
                . Dumper($issue->unblessed) . "\n";
1831
    } else {
1831
    } else {
1832
        $messages->{'NotIssued'} = $barcode;
1832
        $messages->{'NotIssued'} = $barcode;
1833
        ModItem({ onloan => undef }, $item->{biblionumber}, $item->{itemnumber}) if defined $item->{onloan};
1833
        ModItem({ onloan => undef }, $item->biblionumber, $item->itemnumber) if defined $item->onloan;
1834
        # even though item is not on loan, it may still be transferred;  therefore, get current branch info
1834
        # even though item is not on loan, it may still be transferred;  therefore, get current branch info
1835
        $doreturn = 0;
1835
        $doreturn = 0;
1836
        # No issue, no borrowernumber.  ONLY if $doreturn, *might* you have a $borrower later.
1836
        # No issue, no borrowernumber.  ONLY if $doreturn, *might* you have a $borrower later.
Lines 2635-2648 sub CanBookBeRenewed { Link Here
2635
    my $renews = 1;
2635
    my $renews = 1;
2636
2636
2637
    my $item      = Koha::Items->find($itemnumber)      or return ( 0, 'no_item' );
2637
    my $item      = Koha::Items->find($itemnumber)      or return ( 0, 'no_item' );
2638
    my $issue = Koha::Checkouts->find( { itemnumber => $itemnumber } ) or return ( 0, 'no_checkout' );
2638
    my $issue = $item->checkout or return ( 0, 'no_checkout' );
2639
    return ( 0, 'onsite_checkout' ) if $issue->onsite_checkout;
2639
    return ( 0, 'onsite_checkout' ) if $issue->onsite_checkout;
2640
    return ( 0, 'item_denied_renewal') if _item_denied_renewal({ item => $item });
2640
    return ( 0, 'item_denied_renewal') if _item_denied_renewal({ item => $item });
2641
2641
2642
2642
    my $patron = $issue->patron or return;
2643
    $borrowernumber ||= $issue->borrowernumber;
2644
    my $patron = Koha::Patrons->find( $borrowernumber )
2645
      or return;
2646
2643
2647
    my ( $resfound, $resrec, undef ) = C4::Reserves::CheckReserves($itemnumber);
2644
    my ( $resfound, $resrec, undef ) = C4::Reserves::CheckReserves($itemnumber);
2648
2645
Lines 4165-4171 sub _item_denied_renewal { Link Here
4165
    my $denyingrules = Koha::Config::SysPrefs->find('ItemsDeniedRenewal')->get_yaml_pref_hash();
4162
    my $denyingrules = Koha::Config::SysPrefs->find('ItemsDeniedRenewal')->get_yaml_pref_hash();
4166
    return unless $denyingrules;
4163
    return unless $denyingrules;
4167
    foreach my $field (keys %$denyingrules) {
4164
    foreach my $field (keys %$denyingrules) {
4168
        my $val = $item->{$field};
4165
        my $val = $item->$field;
4169
        if( !defined $val) {
4166
        if( !defined $val) {
4170
            if ( any { !defined $_ }  @{$denyingrules->{$field}} ){
4167
            if ( any { !defined $_ }  @{$denyingrules->{$field}} ){
4171
                return 1;
4168
                return 1;
4172
- 

Return to bug 21206