http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7671
--- Comment #6 from Marc VĂ©ron <ve...@veron.ch> --- Hi Chris and Stephane, Sorry, I was not sure about signing off, and then I missed the Email notification of Chris' comment. :( In the meantime I already deleted the branch bug_7671bug. Now I created a new branch bug_7671 and tried to apply the patch again, resultin in a "Does not apply" with: ---------- Applying: Bug 7671 : add a real primary key accountlinesid in accountlines /usr/share/kohaclone/.git/rebase-apply/patch:321: trailing whitespace. $usth->execute($data->{'accountlinesid'}); # We might be adjusting an a ccount for some OTHER borrowernumber now. Not the one we passed in. error: patch failed: installer/data/mysql/updatedatabase.pl:4765 error: installer/data/mysql/updatedatabase.pl: patch does not apply error: patch failed: members/pay.pl:86 error: members/pay.pl: patch does not apply Patch failed at 0001 Bug 7671 : add a real primary key accountlinesid in account lines When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Patch left in /tmp/proposed-patch-UvbvKO.patch ---------- I tried to resolve it, first I did: git am --abort git am -iu3 /tmp/proposed-patch-UvbvKO.patch Then I followed the steps in http://wiki.koha-community.org/wiki/Resolve_Merge_Issues to resolve ...but I think I messed something up, because I get Errors doing a payment: -------- Global symbol "$writeoff_sth" requires explicit package name at /usr/share/kohaclone/members/pay.pl line 117. Global symbol "$add_writeoff_sth" requires explicit package name at /usr/share/kohaclone/members/pay.pl line 120. Global symbol "$writeoff_sth" requires explicit package name at /usr/share/kohaclone/members/pay.pl line 276. Global symbol "$writeoff_sth" requires explicit package name at /usr/share/kohaclone/members/pay.pl line 284. Global symbol "$add_writeoff_sth" requires explicit package name at /usr/share/kohaclone/members/pay.pl line 288. -------- Marc -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/