http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6303 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |paul.poulain@biblibre.com Patch Status|Signed Off |Does not apply --- Comment #6 from Paul Poulain <paul.poulain@biblibre.com> 2011-10-07 14:22:52 UTC --- sorry but the patch does not apply anymore, and there are a lot of conflicts it seems: [SIGNED-OFF] Bug 6303: patron-title.inc to display properly title for borrowers of category_type 'I' Apply? [yn] y Applying: Bug 6303: patron-title.inc to display properly title for borrowers of category_type 'I' /home/paul/koha.dev/koha-community/.git/rebase-apply/patch:53: trailing whitespace. # 'showname' which is the alternate form the user's first name if /home/paul/koha.dev/koha-community/.git/rebase-apply/patch:437: trailing whitespace. # in template <TMPL_IF name="I"> => instutitional (A for Adult, C for children) /home/paul/koha.dev/koha-community/.git/rebase-apply/patch:438: trailing whitespace. $template->param( $data->{'categorycode'} => 1 ); /home/paul/koha.dev/koha-community/.git/rebase-apply/patch:466: space before tab in indent. BORROWER_INFO => [ $borrower ], /home/paul/koha.dev/koha-community/.git/rebase-apply/patch:510: trailing whitespace. error: patch failed: C4/Members.pm:352 error: C4/Members.pm: patch does not apply error: patch failed: circ/circulation.pl:631 error: circ/circulation.pl: patch does not apply error: koha-tmpl/intranet-tmpl/prog/en/modules/members/messaging.tt: does not exist in index error: patch failed: koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt:19 error: koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt: patch does not apply error: patch failed: koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt:201 error: koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt: patch does not apply error: members/messaging.pl: does not exist in index error: patch failed: members/moremember.pl:442 error: members/moremember.pl: patch does not apply error: patch failed: members/notices.pl:55 error: members/notices.pl: patch does not apply Patch failed at 0001 Bug 6303: patron-title.inc to display properly title for borrowers of category_type 'I' -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug.