https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23214
--- Comment #6 from AgustÃn Moyano <agustinmoy...@theke.io> --- (In reply to Maryse Simard from comment #5) > I can't apply the patch : > > Applying: Bug 23214: Modify account-table.inc to enable payment of > guarantees fines > fatal: sha1 information is lacking or useless > (koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc). > error: could not build fake ancestor > Patch failed at 0001 Bug 23214: Modify account-table.inc to enable payment > of guarantees fines Hi Maryse, that's weird.. I just applied patches root@48ecf79b6b40:koha(bug-23214)$ git bz apply 23214 Bug 23214 Depends on bug 20691 Follow? [(y)es, (n)o] y Bug 20691 Depends on bug 14570 Follow? [(y)es, (n)o] y Bug 14570 - Make it possible to add multiple guarantors to a record 91694 - Bug 14570: Make it possible to add multiple guarantors to a record 91695 - Bug 14570: (follow-up) fix table name in j2a.pl 91696 - Bug 14570: (follow-up) fix qa FAIL tests 91697 - Bug 14570: (follow-up) Fix tests 91698 - Bug 14570: (QA follow-up) fix sample borrowers, remove guarantorid) 91699 - Bug 14570: (follow-up) Fix patron type when "add child" button is pressed 91700 - Bug 14570: Update schema files [Do Not Push] Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 14570: Make it possible to add multiple guarantors to a record Applying: Bug 14570: (follow-up) fix table name in j2a.pl Applying: Bug 14570: (follow-up) fix qa FAIL tests Applying: Bug 14570: (follow-up) Fix tests Applying: Bug 14570: (QA follow-up) fix sample borrowers, remove guarantorid) Applying: Bug 14570: (follow-up) Fix patron type when "add child" button is pressed Applying: Bug 14570: Update schema files [Do Not Push] Bug 20691 - Add ability for guarantors to view guarantee's fines in OPAC 91159 - Bug 20691: Database update 91160 - Bug 20691: Add ability to turn feature on and off 91161 - Bug 20691: Implement fines view 91162 - Bug 20691: (follow-up) Fix qa fails Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 20691: Database update Applying: Bug 20691: Add ability to turn feature on and off Applying: Bug 20691: Implement fines view Using index info to reconstruct a base tree... M koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt M opac/opac-user.pl Falling back to patching base and 3-way merge... Auto-merging opac/opac-user.pl Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc Applying: Bug 20691: (follow-up) Fix qa fails Bug 23214 - OPAC add ability to pay guarantees fines 91007 - Bug 23214: Modify account-table.inc to enable payment of guarantees fines Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 23214: Modify account-table.inc to enable payment of guarantees fines Using index info to reconstruct a base tree... M koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc Did you do it in a fresh koha/master copy? -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/