[Koha-bugs] [Bug 11169] OPAC: Display an acquisition details tab

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

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

Koha Team Lyon 3 <koha at univ-lyon3.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |koha at univ-lyon3.fr

--- Comment #5 from Koha Team Lyon 3 <koha at univ-lyon3.fr> ---
he sandbox you've requested is not ready.
Some problems occurred applying patches from bug 11169:
<h1>Something went wrong !</h1>Applying: Bug 11169: Display acquition details
at the OPAC
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging C4/Acquisition.pm
Auto-merging installer/data/mysql/sysprefs.sql
Auto-merging installer/data/mysql/updatedatabase.pl
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
Auto-merging koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
Auto-merging opac/opac-detail.pl
CONFLICT (content): Merge conflict in opac/opac-detail.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 11169: Display acquition details at the OPAC
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 11169 - OPAC: Display an acquisition details tab

22594 - Bug 11169: Display acquition details at the OPAC
22595 - Bug 11169: [Bootstrap] Display acquition details at the OPAC
25657 - Bug 11169: Hide the date_due column

Apply? [(y)es, (n)o, (i)nteractive] Patch left in
/tmp/Bug-11169-Display-acquition-details-at-the-OPAC-CZbyQZ.patch .

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