[Koha-bugs] [Bug 7235] Adding invoice number and vendor name to the moredetail page

bugzilla-daemon at bugs.koha-community.org bugzilla-daemon at bugs.koha-community.org
Fri Mar 2 15:03:19 CET 2012


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

Julian Maurice <julian.maurice at biblibre.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |julian.maurice at biblibre.com

--- Comment #12 from Julian Maurice <julian.maurice at biblibre.com> ---
The second patch doesn't apply anymore:

Applying: Bug 7235: Adding invoice number and vendor name to the moredetail
page
Bug 7235: Add order date and checks for permissions
Apply? [yn] y

Applying: Bug 7235: Add order date and checks for permissions
fatal: sha1 information is lacking or useless
(koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 7235: Add order date and checks for permissions
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-7235-Add-order-date-and-checks-for-permissions-JZZp_S.patch

-- 
You are receiving this mail because:
You are watching all bug changes.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-bugs/attachments/20120302/c22f1efd/attachment-0001.htm>


More information about the Koha-bugs mailing list