https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38839
Magnus Enger <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #25 from Magnus Enger <[email protected]> --- $ git bz apply 38839 Bug 38839 - Add validation for replacement price in item input form 176407 - Bug 38839: Added "decimal" validation for replacement price in item and batch modification forms. 176839 - Bug 38839: (follow-up) Removed maxLength check for replacementPrice field. 177093 - Bug 38839: (follow-up) Added stricter validation for replacement price fields. Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 38839: Added "decimal" validation for replacement price in item and batch modification forms. Using index info to reconstruct a base tree... M Koha/UI/Form/Builder/Item.pm M koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc M koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt M koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt M t/db_dependent/Koha/UI/Form/Builder/Item.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Koha/UI/Form/Builder/Item.t Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc Auto-merging Koha/UI/Form/Builder/Item.pm CONFLICT (content): Merge conflict in Koha/UI/Form/Builder/Item.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 38839: Added "decimal" validation for replacement price in item and batch modification forms. hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-38839-Added-decimal-validation-for-replacement-SpLhcX.patch -- 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/
