http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5356
Koha Team Lyon 3 <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Patch doesn't apply --- Comment #5 from Koha Team Lyon 3 <[email protected]> --- try to apply on a Lyon3 branch rebase on the git-community/master. Can't apply : Applying: Bug 5356: delivery place and billing place centralised in basket management /home/kohabac/src/.git/rebase-apply/patch:76: trailing whitespace. $order->{'entrydate'}, error: patch failed: C4/Acquisition.pm:42 error: C4/Acquisition.pm: patch does not apply error: patch failed: acqui/basket.pl:129 error: acqui/basket.pl: patch does not apply error: patch failed: acqui/basketheader.pl:50 error: acqui/basketheader.pl: patch does not apply error: patch failed: installer/data/mysql/kohastructure.sql:2525 error: installer/data/mysql/kohastructure.sql: patch does not apply error: patch failed: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt:134 error: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt: patch does not apply error: patch failed: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt:189 error: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt: patch does not apply error: patch failed: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt:125 error: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt: patch does not apply Patch failed at 0001 Bug 5356: delivery place and billing place centralised in basket management 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". Patch left in /tmp/Bug-5356-delivery-place-and-billing-place-centrali-MNbz5d.patch -- You are receiving this mail because: You are the QA Contact for the bug. 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/
