[Koha-bugs] [Bug 11708] Display all basketgroups on one page, and new column aqbasketgroups.closeddate

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11708

--- Comment #28 from Alessandra Carassiti <a.carassiti at cineca.it> ---
I tried to test this patch with the sandbox system, it does not work, here is
the result & paste what is written: 'Some problems occurred applying patches
from bug 11708:
<h1>Something went wrong !</h1>Applying: Bug 11708: Add
aqbasketgroups.closeddate
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Warning: commit message does not conform to UTF-8.
You may want to amend it after fixing the message, or set the config
variable i18n.commitencoding to the encoding your project uses.
Applying: Bug 11708: Unit tests for aqbasketgroups.closeddate
Warning: commit message does not conform to UTF-8.
You may want to amend it after fixing the message, or set the config
variable i18n.commitencoding to the encoding your project uses.
Applying: Bug 11708: basketgroup.pl can now display basketgroups for all
suppliers
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Renaming intranet-tmpl/prog/en/css/datatables.css =>
koha-tmpl/opac-tmpl/prog/en/css/datatables.css
Auto-merging koha-tmpl/opac-tmpl/prog/en/css/datatables.css
CONFLICT (rename/modify): Merge conflict in
koha-tmpl/opac-tmpl/prog/en/css/datatables.css
Failed to merge in the changes.
Patch failed at 0001 Bug 11708: basketgroup.pl can now display basketgroups for
all suppliers
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.
Bug 11708 - Display all basketgroups on one page, and new column
aqbasketgroups.closeddate

31305 - Bug 11708: Add aqbasketgroups.closeddate
31306 - Bug 11708: Unit tests for aqbasketgroups.closeddate
31307 - Bug 11708: basketgroup.pl can now display basketgroups for all
suppliers
31308 - Bug 11708: explicitly remove pagination
31309 - Bug 11708: All basketgroups on one page - several fixes

Apply? [(y)es, (n)o, (i)nteractive] Patch left in
/tmp/Bug-11708-basketgrouppl-can-now-display-basketgrou-rdAn9M.patch .'

-- 
You are receiving this mail because:
You are watching all bug changes.