[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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #216 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Hi Julian, can you give it another go? I think your branch might have been
missing the latest commits (bug 18791).


Apply? [(y)es, (n)o, (i)nteractive] y  
Applying: Bug 11708: Add aqbasketgroups.closeddate
Applying: Bug 11708: Unit tests for aqbasketgroups.closeddate
Applying: Bug 11708: basketgroup.pl can now display basketgroups for all
suppliers
Applying: Bug 11708: Remove column aqbasketgroups.closed
Applying: Bug 11708: Place "Basket groups" menu entry on top of the side
navigation
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/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/includes/datatables.inc
Failed to merge in the changes.
Patch failed at 0001 Bug 11708: New page for basket groups
The copy of the patch that failed is found in:
   /home/vagrant/kohaclone/.git/rebase-apply/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-11708-New-page-for-basket-groups-pzWRYQ.patch

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