[Koha-bugs] [Bug 23817] Normalize phone number when searching patrons

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

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

solene.ngamga at inlibro.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |solene.ngamga at inlibro.com
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #19 from solene.ngamga at inlibro.com ---
Bug 23817 - Normalize phone number when searching patrons

140610 - Bug 23817: Normalize phone number when storing and when searching in
Patrons module
140648 - Bug 23817: [Alternative patch] Normalize phone number only when
searching

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 23817: Normalize phone number when storing and when searching in
Patrons module
Applying: Bug 23817: [Alternative patch] Normalize phone number only when
searching
Using index info to reconstruct a base tree...
M       Koha/REST/Plugin/Objects.pm
M       koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
Auto-merging Koha/REST/Plugin/Objects.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 23817: [Alternative patch] Normalize phone number only
when searching
hint: Use 'git am --show-current-patch=diff' to see the failed 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-23817-Alternative-patch-Normalize-phone-number-wqS2eF.patch

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