[Koha-bugs] [Bug 22393] Remove last remaining manualinvoice use

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=22393

--- Comment #17 from Victor Grousset/tuxayo <victor at tuxayo.net> ---
Conflict part:
(if that helps: with a third section thanks to git option merge.conflictStyle
set to diff3)

<<<<<<< HEAD
        if ($add eq 'save and pay') {
            print $input->redirect(
                "/cgi-bin/koha/members/pay.pl?borrowernumber=$borrowernumber"
            );
        } else {
            print $input->redirect(
               
"/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber"
            );
        }

        exit;
    }
}
else {
||||||| constructed merge base
        print $input->redirect(
           
"/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber"
        );
        exit;
    }
}
else {
=======
            if ( C4::Context->preference('AccountAutoReconcile') ) {
                $patron->account->reconcile_balance;
            }
>>>>>>> Bug 22393: Remove last remaining use of C4::Accounts::manualinvoice

-- 
You are receiving this mail because:
You are watching all bug changes.