[Koha-bugs] [Bug 12133] Guarantor requirements when registering a patron

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

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

solene.ngamga at inlibro.com changed:

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

--- Comment #24 from solene.ngamga at inlibro.com ---
Bug 12133 - Guarantor requirements when registering a patron

134013 - Bug 12133: Add requirements for guarantor and guarantee
134014 - Bug 12133: Fix issues with modifying child patron and adding
guarantors
134015 - Bug 12133: Enforce guarantor restrictions on Koha::Patron->store()

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 12133: Add requirements for guarantor and guarantee
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
M       members/memberentry.pl
Falling back to patching base and 3-way merge...
Auto-merging members/memberentry.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
error: Failed to merge in the changes.
Patch failed at 0001 Bug 12133: Add requirements for guarantor and guarantee
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-12133-Add-requirements-for-guarantor-and-guara-ofLCAA.patch

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