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

(-)a/circ/circulation.pl (+13 lines)
Lines 495-500 if ( $patron ) { Link Here
495
        );
495
        );
496
    }
496
    }
497
497
498
    # Check the debt of this patrons guarantors *and* the guarantees of those guarantors
499
    my $no_issues_charge_guarantors = C4::Context->preference("NoIssuesChargeGuarantorsWithGuarantees");
500
    if ( $no_issues_charge_guarantors ) {
501
        my $guarantors_non_issues_charges += $patron->relationships_debt({ include_guarantors => 1, only_this_guaranor => 0, include_this_patron => 1 });
502
503
        if ( $guarantors_non_issues_charges > $no_issues_charge_guarantors ) {
504
            $template->param(
505
                charges_guarantors_guarantees => $guarantors_non_issues_charges
506
            );
507
            $noissues = 1 unless C4::Context->preference("allowfineoverride");
508
        }
509
    }
510
498
    my $no_issues_charge_guarantees = C4::Context->preference("NoIssuesChargeGuarantees");
511
    my $no_issues_charge_guarantees = C4::Context->preference("NoIssuesChargeGuarantees");
499
    $no_issues_charge_guarantees = undef unless looks_like_number( $no_issues_charge_guarantees );
512
    $no_issues_charge_guarantees = undef unless looks_like_number( $no_issues_charge_guarantees );
500
    if ( defined $no_issues_charge_guarantees ) {
513
    if ( defined $no_issues_charge_guarantees ) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-3 / +11 lines)
Lines 764-777 Link Here
764
                                        <li><span class="circ-hlt return-claims">Return claims: Patron has [% return_claims.count | html %] RETURN CLAIMS.</span>
764
                                        <li><span class="circ-hlt return-claims">Return claims: Patron has [% return_claims.count | html %] RETURN CLAIMS.</span>
765
                                    [% END %]
765
                                    [% END %]
766
766
767
                                    [% IF ( charges ) %]
768
                                        [% INCLUDE 'blocked-fines.inc' fines = chargesamount %]
769
                                    [% END %]
770
767
771
                                    [% IF age_limitations %]
768
                                    [% IF age_limitations %]
772
                                        [% INCLUDE 'category-out-of-age-limit.inc' %]
769
                                        [% INCLUDE 'category-out-of-age-limit.inc' %]
773
                                    [% END %]
770
                                    [% END %]
774
771
772
                                    [% IF ( charges ) %]
773
                                        [% INCLUDE 'blocked-fines.inc' fines = chargesamount %]
774
                                    [% END %]
775
                                    [% IF ( charges_guarantors_guarantees ) %]
776
                                        <li>
777
                                            <span class="circ-hlt">Charges:</span> Patron's guarantors and their other guarantees collectively owe [% charges_guarantors_guarantees | $Price %].
778
                                            [% IF noissues %]
779
                                                <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
780
                                            [% END %]
781
                                        </li>
782
                                    [% END %]
775
                                    [% IF ( charges_guarantees ) %]
783
                                    [% IF ( charges_guarantees ) %]
776
                                        <li>
784
                                        <li>
777
                                            <span class="circ-hlt">Charges:</span> Patron's guarantees collectively owe [% chargesamount_guarantees | $Price %].
785
                                            <span class="circ-hlt">Charges:</span> Patron's guarantees collectively owe [% chargesamount_guarantees | $Price %].
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt (-12 / +20 lines)
Lines 46-63 Link Here
46
  <div class="dialog alert">You are not allowed to use batch checkout for this patron</div>
46
  <div class="dialog alert">You are not allowed to use batch checkout for this patron</div>
47
[% ELSIF patron and noissues and not checkout_infos %]
47
[% ELSIF patron and noissues and not checkout_infos %]
48
  <div class="dialog alert">
48
  <div class="dialog alert">
49
    Cannot check out!
49
      Cannot check out!
50
    [% IF charges %]
50
      [% IF ( charges ) %]
51
      <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
51
          [% INCLUDE 'blocked-fines.inc' fines = chargesamount %]
52
    [% END %]
52
      [% END %]
53
    [% IF charges_guarantees %]
53
      [% IF ( charges_guarantors_guarantees ) %]
54
        <li>
54
          <li>
55
            <span class="circ-hlt">Charges:</span> Patron's guarantees collectively owe [% chargesamount_guarantees | $Price %].
55
              <span class="circ-hlt">Charges:</span> Patron's guarantors and their other guarantees collectively owe [% charges_guarantors_guarantees | $Price %].
56
        </li>
56
              [% IF noissues %]
57
        <li>
57
                  <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
58
            <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
58
              [% END %]
59
        </li>
59
          </li>
60
    [% END %]
60
      [% END %]
61
      [% IF ( charges_guarantees ) %]
62
          <li>
63
              <span class="circ-hlt">Charges:</span> Patron's guarantees collectively owe [% chargesamount_guarantees | $Price %].
64
              [% IF noissues %]
65
                  <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
66
              [% END %]
67
          </li>
68
      [% END %]
61
  </div>
69
  </div>
62
[% ELSIF patron and not checkout_infos %]
70
[% ELSIF patron and not checkout_infos %]
63
  <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/circ/circulation.pl">
71
  <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/circ/circulation.pl">
(-)a/t/db_dependent/Koha/Patron.t (-2 / +1 lines)
Lines 19-25 Link Here
19
19
20
use Modern::Perl;
20
use Modern::Perl;
21
21
22
use Test::More tests => 4;
22
use Test::More tests => 5;
23
use Test::Exception;
23
use Test::Exception;
24
24
25
use Koha::Database;
25
use Koha::Database;
26
- 

Return to bug 19382