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

(-)a/C4/Circulation.pm (-11 / +7 lines)
Lines 1442-1448 sub AddIssue { Link Here
1442
                SendCirculationAlert(
1442
                SendCirculationAlert(
1443
                    {
1443
                    {
1444
                        type     => 'CHECKOUT',
1444
                        type     => 'CHECKOUT',
1445
                        item     => $item,
1445
                        item     => $item->unblessed,
1446
                        borrower => $borrower,
1446
                        borrower => $borrower,
1447
                        branch   => $branch,
1447
                        branch   => $branch,
1448
                    }
1448
                    }
Lines 1812-1825 sub AddReturn { Link Here
1812
    my $itemnumber = $item->itemnumber;
1812
    my $itemnumber = $item->itemnumber;
1813
    my $itemtype = $item->effective_itemtype;
1813
    my $itemtype = $item->effective_itemtype;
1814
1814
1815
    my $issue  = Koha::Checkouts->find( { itemnumber => $itemnumber } );
1815
    my $issue  = $item->checkout;
1816
    if ( $issue ) {
1816
    if ( $issue ) {
1817
        $patron = Koha::Patrons->find( $issue->borrowernumber )
1817
        $patron = $issue->patron
1818
            or die "Data inconsistency: barcode $barcode (itemnumber:$itemnumber) claims to be issued to non-existent borrowernumber '" . $issue->borrowernumber . "'\n"
1818
            or die "Data inconsistency: barcode $barcode (itemnumber:$itemnumber) claims to be issued to non-existent borrowernumber '" . $issue->borrowernumber . "'\n"
1819
                . Dumper($issue->unblessed) . "\n";
1819
                . Dumper($issue->unblessed) . "\n";
1820
    } else {
1820
    } else {
1821
        $messages->{'NotIssued'} = $barcode;
1821
        $messages->{'NotIssued'} = $barcode;
1822
        ModItem({ onloan => undef }, $item->{biblionumber}, $item->{itemnumber}) if defined $item->{onloan};
1822
        ModItem({ onloan => undef }, $item->biblionumber, $item->itemnumber) if defined $item->onloan;
1823
        # even though item is not on loan, it may still be transferred;  therefore, get current branch info
1823
        # even though item is not on loan, it may still be transferred;  therefore, get current branch info
1824
        $doreturn = 0;
1824
        $doreturn = 0;
1825
        # No issue, no borrowernumber.  ONLY if $doreturn, *might* you have a $borrower later.
1825
        # No issue, no borrowernumber.  ONLY if $doreturn, *might* you have a $borrower later.
Lines 2616-2629 sub CanBookBeRenewed { Link Here
2616
    my $renews = 1;
2616
    my $renews = 1;
2617
2617
2618
    my $item      = Koha::Items->find($itemnumber)      or return ( 0, 'no_item' );
2618
    my $item      = Koha::Items->find($itemnumber)      or return ( 0, 'no_item' );
2619
    my $issue = Koha::Checkouts->find( { itemnumber => $itemnumber } ) or return ( 0, 'no_checkout' );
2619
    my $issue = $item->checkout or return ( 0, 'no_checkout' );
2620
    return ( 0, 'onsite_checkout' ) if $issue->onsite_checkout;
2620
    return ( 0, 'onsite_checkout' ) if $issue->onsite_checkout;
2621
    return ( 0, 'item_denied_renewal') if _item_denied_renewal({ item => $item });
2621
    return ( 0, 'item_denied_renewal') if _item_denied_renewal({ item => $item });
2622
2622
2623
2623
    my $patron = $issue->patron or return;
2624
    $borrowernumber ||= $issue->borrowernumber;
2625
    my $patron = Koha::Patrons->find( $borrowernumber )
2626
      or return;
2627
2624
2628
    my ( $resfound, $resrec, undef ) = C4::Reserves::CheckReserves($itemnumber);
2625
    my ( $resfound, $resrec, undef ) = C4::Reserves::CheckReserves($itemnumber);
2629
2626
Lines 4135-4141 sub _item_denied_renewal { Link Here
4135
    my $denyingrules = Koha::Config::SysPrefs->find('ItemsDeniedRenewal')->get_yaml_pref_hash();
4132
    my $denyingrules = Koha::Config::SysPrefs->find('ItemsDeniedRenewal')->get_yaml_pref_hash();
4136
    return unless $denyingrules;
4133
    return unless $denyingrules;
4137
    foreach my $field (keys %$denyingrules) {
4134
    foreach my $field (keys %$denyingrules) {
4138
        my $val = $item->{$field};
4135
        my $val = $item->$field;
4139
        if( !defined $val) {
4136
        if( !defined $val) {
4140
            if ( any { !defined $_ }  @{$denyingrules->{$field}} ){
4137
            if ( any { !defined $_ }  @{$denyingrules->{$field}} ){
4141
                return 1;
4138
                return 1;
4142
- 

Return to bug 21206