https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30403
[email protected] changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off --- Comment #8 from [email protected] --- I tested this patch once (Koha 21.05 or 21.11, I don't remember) and it worked, but when I retest (koha 22.06) I get an error when I apply the patch : "Applying: Bug 30403: Add syspref UpdateNotForLoanStatusOnCheckout Using index info to reconstruct a base tree... M C4/Circulation.pm M installer/data/mysql/mandatory/sysprefs.sql M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref M t/db_dependent/Circulation/issue.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Circulation/issue.t CONFLICT (content): Merge conflict in t/db_dependent/Circulation/issue.t Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref Auto-merging installer/data/mysql/mandatory/sysprefs.sql Auto-merging C4/Circulation.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 30403: Add syspref UpdateNotForLoanStatusOnCheckout" -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
