[Koha-bugs] [Bug 11879] Add a new field to patron record: main contact method

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

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

Hayley Mapley <hayleymapley at catalyst.net.nz> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |hayleymapley at catalyst.net.n
                   |                            |z

--- Comment #138 from Hayley Mapley <hayleymapley at catalyst.net.nz> ---
Patch doesn't apply. If this can be sorted I am keen to test this patch

Applying: Bug 11879: Add the "Main contact method" field in borrower
informations.
Using index info to reconstruct a base tree...
M       installer/data/mysql/kohastructure.sql
M       installer/data/mysql/updatedatabase.pl
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
M       members/memberentry.pl
M       members/moremember.pl
M       opac/opac-memberentry.pl
Falling back to patching base and 3-way merge...
Auto-merging opac/opac-memberentry.pl
Auto-merging members/moremember.pl
Auto-merging members/memberentry.pl
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
Auto-merging installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/kohastructure.sql
Applying: Bug 11879: (follow-up) Streamline markup and make label corrections
Applying: Bug 11879: (QA follow-up) Fix problems found in code review
error: sha1 information is lacking or useless
(koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt).
error: could not build fake ancestor
Patch failed at 0001 Bug 11879: (QA follow-up) Fix problems found in code
review

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