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

(-)a/C4/Circulation.pm (-2 lines)
Lines 870-876 sub CanBookBeIssued { Link Here
870
870
871
    # Check the debt of this patrons guarantees
871
    # Check the debt of this patrons guarantees
872
    my $no_issues_charge_guarantees = $patron_borrowing_status->{NoIssuesChargeGuarantees}->{limit};
872
    my $no_issues_charge_guarantees = $patron_borrowing_status->{NoIssuesChargeGuarantees}->{limit};
873
    $no_issues_charge_guarantees = undef unless looks_like_number($no_issues_charge_guarantees);
874
    if ( defined $no_issues_charge_guarantees ) {
873
    if ( defined $no_issues_charge_guarantees ) {
875
        if ( $patron_borrowing_status->{NoIssuesChargeGuarantees}->{overlimit} && !$inprocess && !$allowfineoverride ) {
874
        if ( $patron_borrowing_status->{NoIssuesChargeGuarantees}->{overlimit} && !$inprocess && !$allowfineoverride ) {
876
            $issuingimpossible{DEBT_GUARANTEES} = $patron_borrowing_status->{NoIssuesChargeGuarantees}->{charge};
875
            $issuingimpossible{DEBT_GUARANTEES} = $patron_borrowing_status->{NoIssuesChargeGuarantees}->{charge};
Lines 889-895 sub CanBookBeIssued { Link Here
889
888
890
    # Check the debt of this patrons guarantors *and* the guarantees of those guarantors
889
    # Check the debt of this patrons guarantors *and* the guarantees of those guarantors
891
    my $no_issues_charge_guarantors = $patron_borrowing_status->{NoIssuesChargeGuarantorsWithGuarantees}->{limit};
890
    my $no_issues_charge_guarantors = $patron_borrowing_status->{NoIssuesChargeGuarantorsWithGuarantees}->{limit};
892
    $no_issues_charge_guarantors = undef unless looks_like_number($no_issues_charge_guarantors);
893
    if ( defined $no_issues_charge_guarantors ) {
891
    if ( defined $no_issues_charge_guarantors ) {
894
        if (   $patron_borrowing_status->{NoIssuesChargeGuarantorsWithGuarantees}->{overlimit}
892
        if (   $patron_borrowing_status->{NoIssuesChargeGuarantorsWithGuarantees}->{overlimit}
895
            && !$inprocess
893
            && !$inprocess
(-)a/Koha/Patron.pm (-8 / +6 lines)
Lines 2916-2922 If any blockers are found, these are returned in a hash Link Here
2916
=cut
2916
=cut
2917
2917
2918
sub can_borrow {
2918
sub can_borrow {
2919
    my ( $self ) = @_;
2919
    my ($self) = @_;
2920
2920
2921
    my $status = { can_borrow => 1 };
2921
    my $status = { can_borrow => 1 };
2922
2922
Lines 2948-2964 sub is_patron_inside_charge_limits { Link Here
2948
    my ( $self, $args ) = @_;
2948
    my ( $self, $args ) = @_;
2949
2949
2950
    my $borrowernumber       = $args->{borrowernumber};
2950
    my $borrowernumber       = $args->{borrowernumber};
2951
    my $patron               = $args->{patron} || Koha::Patrons->find( { borrowernumber => $borrowernumber } );
2951
    my $patron               = $self || Koha::Patrons->find( { borrowernumber => $borrowernumber } );
2952
    my $patron_category      = $patron->category;
2952
    my $patron_category      = $patron->category;
2953
    my $patron_charge_limits = {};
2953
    my $patron_charge_limits = {};
2954
2954
2955
    my $no_issues_charge = $patron_category->noissuescharge || C4::Context->preference('noissuescharge') || 0;
2955
    my $no_issues_charge = $patron_category->noissuescharge || C4::Context->preference('noissuescharge');
2956
    my $no_issues_charge_guarantees =
2956
    my $no_issues_charge_guarantees =
2957
        $patron_category->noissueschargeguarantees || C4::Context->preference('NoIssuesChargeGuarantees') || 0;
2957
        $patron_category->noissueschargeguarantees || C4::Context->preference('NoIssuesChargeGuarantees');
2958
    my $no_issues_charge_guarantors_with_guarantees =
2958
    my $no_issues_charge_guarantors_with_guarantees = $patron_category->noissueschargeguarantorswithguarantees
2959
           $patron_category->noissueschargeguarantorswithguarantees
2959
        || C4::Context->preference('NoIssuesChargeGuarantorsWithGuarantees');
2960
        || C4::Context->preference('NoIssuesChargeGuarantorsWithGuarantees')
2961
        || 0;
2962
2960
2963
    my $non_issues_charges            = $patron->account->non_issues_charges;
2961
    my $non_issues_charges            = $patron->account->non_issues_charges;
2964
    my $guarantees_non_issues_charges = 0;
2962
    my $guarantees_non_issues_charges = 0;
(-)a/circ/circulation.pl (-3 lines)
Lines 614-620 if ( $patron ) { Link Here
614
    if ($no_issues_charge_guarantors) {
614
    if ($no_issues_charge_guarantors) {
615
        if ( $patron_charge_limits->{NoIssuesChargeGuarantorsWithGuarantees}->{overlimit} ) {
615
        if ( $patron_charge_limits->{NoIssuesChargeGuarantorsWithGuarantees}->{overlimit} ) {
616
            $template->param(
616
            $template->param(
617
                noissues                      => 1,
618
                charges_guarantors_guarantees => $patron_charge_limits->{NoIssuesChargeGuarantorsWithGuarantees}->{charge}
617
                charges_guarantors_guarantees => $patron_charge_limits->{NoIssuesChargeGuarantorsWithGuarantees}->{charge}
619
            );
618
            );
620
            $noissues = 1 unless C4::Context->preference("allowfineoverride");
619
            $noissues = 1 unless C4::Context->preference("allowfineoverride");
Lines 622-628 if ( $patron ) { Link Here
622
    }
621
    }
623
622
624
    my $no_issues_charge_guarantees = $patron_charge_limits->{NoIssuesChargeGuarantees}->{limit};
623
    my $no_issues_charge_guarantees = $patron_charge_limits->{NoIssuesChargeGuarantees}->{limit};
625
    $no_issues_charge_guarantees = undef unless looks_like_number( $no_issues_charge_guarantees );
626
    if ( defined $no_issues_charge_guarantees ) {
624
    if ( defined $no_issues_charge_guarantees ) {
627
        if ( $patron_charge_limits->{NoIssuesChargeGuarantees}->{overlimit} ) {
625
        if ( $patron_charge_limits->{NoIssuesChargeGuarantees}->{overlimit} ) {
628
            $template->param(
626
            $template->param(
629
- 

Return to bug 28924