We appear to be missing the db changes to make these patches work .. Paul do you know where they are?
Created attachment 3369 [details] [review] Proposed patch
Created attachment 3370 [details] [review] Follow up patch
Created attachment 3409 [details] broken css The css for buttons doesn't work in FF4 on Mac OSX
Created attachment 3410 [details] correct css The CSS works on other tabs in the fines area, but not that first one.
When I add a fine through a manual invoice I get the following: Software error: Can't use an undefined value as a HASH reference at /home/nengard/kohaclone/C4/Accounts.pm line 382. For help, please send mail to the webmaster (webmaster@debian), giving this error message and the time and date of the error.
Created attachment 3411 [details] n degree? What is this column for? n degree doesn't mean anything that I know of in the US.
All the above tests were before applying the follow up - after the follow up I get the following on the fines page: Software error: syntax error at /home/nengard/kohaclone/C4/Accounts.pm line 200, near ") # FIXME - The second argument to &UpdateStats is supposed to be the # branch code. # UpdateStats is now being passed $accountno too. MTJ UpdateStats" Compilation failed in require at /home/nengard/kohaclone/C4/Reserves.pm line 31. BEGIN failed--compilation aborted at /home/nengard/kohaclone/C4/Reserves.pm line 31. Compilation failed in require at /home/nengard/kohaclone/C4/Circulation.pm line 26. BEGIN failed--compilation aborted at /home/nengard/kohaclone/C4/Circulation.pm line 26. Compilation failed in require at /home/nengard/kohaclone/C4/Overdues.pm line 26. BEGIN failed--compilation aborted at /home/nengard/kohaclone/C4/Overdues.pm line 26. Compilation failed in require at /home/nengard/kohaclone/C4/Members.pm line 29. BEGIN failed--compilation aborted at /home/nengard/kohaclone/C4/Members.pm line 29. Compilation failed in require at /home/nengard/kohaclone/C4/Auth.pm line 30. BEGIN failed--compilation aborted at /home/nengard/kohaclone/C4/Auth.pm line 30. Compilation failed in require at /home/nengard/kohaclone/members/boraccount.pl line 26. BEGIN failed--compilation aborted at /home/nengard/kohaclone/members/boraccount.pl line 26. For help, please send mail to the webmaster (webmaster@debian), giving this error message and the time and date of the error.
Created attachment 3518 [details] [review] Completed and rebased patch Initial patch was incomplete. This is the full patch from BibLibre, rebased on master.
Created attachment 3519 [details] [review] Follow up patch Follow up fixing sql to use placeholders. Adding a missing ';' from previous follow up patch.
Created attachment 3520 [details] [review] Follow up patch Change 'n°' to 'no.' which is the correct abbreviation for number.
Depends on bug 5728 for `note` and `manager_id` fields in accountlines table.
Created attachment 3773 [details] [review] Rebased patch Previous rebased patch does not apply. Rebased again.
Patches must be applied in this order : attachment 3773 [details] [review] attachment 3519 [details] [review] attachment 3520 [details] [review]
I tried to apply the first patch (in the order you listed) and got this: -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Bug 5905: lot of updates for borrower's fines fatal: sha1 information is lacking or useless (installer/data/mysql/kohastructure.sql). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 5905: lot of updates for borrower's fines 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". nengard@debian:~/kohaclone$ I obviously did not try the others after it.