http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7621
--- Comment #45 from delaye <[email protected]> --- I try again the patch test in a sandbox but I have this error message Applying: BUG 7621 [ENH] Circulation: Match age restriction of title with borrower's age without using categories Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Circulation.pm Auto-merging installer/data/mysql/kohastructure.sql Auto-merging installer/data/mysql/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Failed to merge in the changes. Patch failed at 0001 BUG 7621 [ENH] Circulation: Match age restriction of title with borrower's age without using categories When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Bug 7621 - Circulation: Match age restriction of title with borrower's age without using categories BUG 7621 [ENH] Circulation: Match age restriction of title with borrower's age without using categories Apply? [yn] Patch left in /tmp/BUG-7621-ENH-Circulation-Match-age-restriction-of--YuivIy.patch **** I launch the following commands ALTER TABLE biblioitems ADD COLUMN agerestriction VARCHAR(255) DEFAULT NULL AFTER cn_sort; ALTER TABLE deletedbiblioitems ADD COLUMN agerestriction VARCHAR(255) DEFAULT NULL AFTER cn_sort; INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AgeRestrictionMarker','','Markers for age restriction indication, e.g. FSK|PEGI|Age|. See: http://wiki.koha-community.org/wiki/Age_restriction',NULL,'free'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AgeRestrictionOverride',0,'Allow staff to check out an item with age restriction.',NULL,'YesNo'); but i have always the problem , in koha i don't find the new system preference can you rebase the patch?.... -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://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/
