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

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

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

Séverine Queune <severine.queune at bulac.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #276 from Séverine Queune <severine.queune at bulac.fr> ---
The sandbox you've requested is not ready.
Some problems occurred applying patches from bug 11708:
<h1>Something went wrong !</h1>Applying: Bug 11708: Change
aqbasketgroups.closed to closeddate
Warning: commit message did 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: New page for basket groups
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc
M       koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
M       koha-tmpl/intranet-tmpl/prog/js/datatables.js
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/js/datatables.js
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/js/datatables.js
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc
error: Failed to merge in the changes.
Patch failed at 0001 Bug 11708: New page for basket groups

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