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

(-)a/C4/Circulation.pm (-8 / +6 lines)
Lines 2795-2800 sub CanBookBeRenewed { Link Here
2795
            branchcode => $branchcode,
2795
            branchcode => $branchcode,
2796
            issue      => $issue
2796
            issue      => $issue
2797
        });
2797
        });
2798
        return ( 0, $auto_renew  ) if $auto_renew =~ 'too_soon' && $cron;
2799
        # cron wants 'too_soon' over 'on_reserve' for performance and to avoid
2800
        # extra notices being sent. Cron also implies no override
2798
        return ( 0, $auto_renew  ) if $auto_renew =~ 'auto_account_expired';
2801
        return ( 0, $auto_renew  ) if $auto_renew =~ 'auto_account_expired';
2799
        return ( 0, $auto_renew  ) if $auto_renew =~ 'auto_too_late';
2802
        return ( 0, $auto_renew  ) if $auto_renew =~ 'auto_too_late';
2800
        return ( 0, $auto_renew  ) if $auto_renew =~ 'auto_too_much_oweing';
2803
        return ( 0, $auto_renew  ) if $auto_renew =~ 'auto_too_much_oweing';
Lines 2858-2870 sub CanBookBeRenewed { Link Here
2858
            }
2861
            }
2859
        }
2862
        }
2860
    }
2863
    }
2861
    if( $cron ) { #The cron wants to return 'too_soon' over 'on_reserve'
2864
2862
        return ( 0, $auto_renew  ) if $auto_renew =~ 'too_soon';#$auto_renew ne "no" && $auto_renew ne "ok";
2865
    return ( 0, "on_reserve" ) if $resfound;    # '' when no hold was found
2863
        return ( 0, "on_reserve" ) if $resfound;    # '' when no hold was found
2866
    return ( 0, $auto_renew  ) if $auto_renew =~ 'too_soon';#$auto_renew ne "no" && $auto_renew ne "ok";
2864
    } else { # For other purposes we want 'on_reserve' before 'too_soon'
2865
        return ( 0, "on_reserve" ) if $resfound;    # '' when no hold was found
2866
        return ( 0, $auto_renew  ) if $auto_renew =~ 'too_soon';#$auto_renew ne "no" && $auto_renew ne "ok";
2867
    }
2868
2867
2869
    return ( 0, "auto_renew" ) if $auto_renew eq "ok" && !$override_limit; # 0 if auto-renewal should not succeed
2868
    return ( 0, "auto_renew" ) if $auto_renew eq "ok" && !$override_limit; # 0 if auto-renewal should not succeed
2870
2869
2871
- 

Return to bug 29474