[Koha-bugs] [Bug 23916] Issuer should be recorded and visible in patron circulation history

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

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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #62 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
There is a conflict in the unit test file I am not sure about - probably not
too bad, but more than fixing the number of tests, so I'd like not to mess with
it:

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 23916: Add issues.issuer column and FK
Applying: Bug 23916: Add "RecordIssuer" syspref
Using index info to reconstruct a base tree...
A       installer/data/mysql/sysprefs.sql
M      
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
Auto-merging installer/data/mysql/mandatory/sysprefs.sql
Applying: Bug 23916: Record and display item issuer
Applying: Bug 23916: Anonymise 'issuer' when required
Applying: Bug 23916: Add unit tests
Using index info to reconstruct a base tree...
M       t/db_dependent/Circulation.t
M       t/db_dependent/Koha/Patrons.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Koha/Patrons.t
Auto-merging t/db_dependent/Circulation.t
CONFLICT (content): Merge conflict in t/db_dependent/Circulation.t
error: Failed to merge in the changes.
Patch failed at 0001 Bug 23916: Add unit tests
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in /tmp/Bug-23916-Add-unit-tests-yabswJ.patch

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