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

(-)a/circ/circulation.pl (-3 / +3 lines)
Lines 482-488 sub build_issue_data { Link Here
482
        ($it->{'charge'}, $it->{'itemtype_charge'}) = GetIssuingCharges(
482
        ($it->{'charge'}, $it->{'itemtype_charge'}) = GetIssuingCharges(
483
            $it->{'itemnumber'}, $it->{'borrowernumber'}
483
            $it->{'itemnumber'}, $it->{'borrowernumber'}
484
        );
484
        );
485
        $it->{'charge'} = sprintf("%.2f", $it->{'charge'});
485
        $it->{'charge'} = sprintf("%.2f", $it->{'charge'}) if defined $it->{'charge'};
486
        my ($can_renew, $can_renew_error) = CanBookBeRenewed( 
486
        my ($can_renew, $can_renew_error) = CanBookBeRenewed( 
487
            $it->{'borrowernumber'},$it->{'itemnumber'}
487
            $it->{'borrowernumber'},$it->{'itemnumber'}
488
        );
488
        );
Lines 650-656 $amountold =~ s/^.*\$//; # remove upto the $, if any Link Here
650
650
651
my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
651
my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
652
652
653
if ( $borrower->{'category_type'} eq 'C') {
653
if ( $borrower->{'category_type'} && $borrower->{'category_type'} eq 'C') {
654
    my  ( $catcodes, $labels ) =  GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
654
    my  ( $catcodes, $labels ) =  GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
655
    my $cnt = scalar(@$catcodes);
655
    my $cnt = scalar(@$catcodes);
656
    $template->param( 'CATCODE_MULTI' => 1) if $cnt > 1;
656
    $template->param( 'CATCODE_MULTI' => 1) if $cnt > 1;
Lines 748-754 $template->param( Link Here
748
    inprocess         => $inprocess,
748
    inprocess         => $inprocess,
749
    memberofinstution => $member_of_institution,
749
    memberofinstution => $member_of_institution,
750
    CGIorganisations  => $CGIorganisations,
750
    CGIorganisations  => $CGIorganisations,
751
    is_child          => ($borrower->{'category_type'} eq 'C'),
751
    is_child          => ($borrower->{'category_type'} && $borrower->{'category_type'} eq 'C'),
752
    circview => 1,
752
    circview => 1,
753
    soundon           => C4::Context->preference("SoundOn"),
753
    soundon           => C4::Context->preference("SoundOn"),
754
    fast_cataloging   => $fast_cataloging,
754
    fast_cataloging   => $fast_cataloging,
(-)a/circ/returns.pl (-3 / +3 lines)
Lines 75-81 my ( $template, $librarian, $cookie ) = get_template_and_user( Link Here
75
my $branches = GetBranches();
75
my $branches = GetBranches();
76
my $printers = GetPrinters();
76
my $printers = GetPrinters();
77
77
78
my $printer = C4::Context->userenv ? C4::Context->userenv->{'branchprinter'} : "";
78
my $printer = C4::Context->userenv ? C4::Context->userenv->{'branchprinter'} : undef;
79
$printer ||= "";
79
my $overduecharges = (C4::Context->preference('finesMode') && C4::Context->preference('finesMode') ne 'off');
80
my $overduecharges = (C4::Context->preference('finesMode') && C4::Context->preference('finesMode') ne 'off');
80
81
81
my $userenv_branch = C4::Context->userenv->{'branch'} || '';
82
my $userenv_branch = C4::Context->userenv->{'branch'} || '';
Lines 266-272 if ($barcode) { Link Here
266
267
267
        if ( C4::Context->preference("FineNotifyAtCheckin") ) {
268
        if ( C4::Context->preference("FineNotifyAtCheckin") ) {
268
            my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrower->{'borrowernumber'} );
269
            my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrower->{'borrowernumber'} );
269
            if ($fines > 0) {
270
            if ($fines && $fines > 0) {
270
                $template->param( fines => sprintf("%.2f",$fines) );
271
                $template->param( fines => sprintf("%.2f",$fines) );
271
                $template->param( fineborrowernumber => $borrower->{'borrowernumber'} );
272
                $template->param( fineborrowernumber => $borrower->{'borrowernumber'} );
272
            }
273
            }
273
- 

Return to bug 11182