https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26536 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |victor@tuxayo.net --- Comment #22 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Got a conflict when backporting from 20.05.x to 19.11.x Tried to fix by selecting the 3rd section (Bug 26536: Assignment fix) <<<<<<< HEAD $payment_id = $account->pay( ||||||| parent of 6d302b741c (Bug 26536: Assignment fix) $pay_result = $payment_id = $account->pay( ======= $pay_result = $account->pay(
> 6d302b741c (Bug 26536: Assignment fix) { amount => $total_paid, library_id => $library_id, note => $note, payment_type => $payment_type, interface => C4::Context->interface, payment_type => $payment_type, cash_register => $registerid } ); $payment_id = $pay_result->{payment_id}; }
print $input->redirect("/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber&payment_id=$payment_id&change_given=$change_given"); } } But when writing off, I got this error: Could not compile /kohadevbox/koha/members/paycollect.pl: Global symbol "$pay_result" requires explicit package name It's not clear either if 19.11.x is affected. I'm not sure I did the test plan right to confirm the issue. Does anyone have hints? -- You are receiving this mail because: You are watching all bug changes.