* manager_id contains the librarian that created the line
* note is a field that can be entered by the librarian
Created attachment 3379 [details] [review]
Patch from BibLibre
*** Bug 5752 has been marked as a duplicate of this bug. ***
Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: Bug 5728: adding note and manager_id fields to accountlines
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 5728: adding note and manager_id fields to accountlines
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".
Created attachment 3412 [details] [review]
Created attachment 3748 [details] [review]
correcting previous patch
Created attachment 3749 [details] [review]
Fix KohaVersion and database error
With two last patches testing is ok. Note and id_manager are well managed.
Pushed, please test
There have been no further reports of problems so I am marking this bug resolved.