Comment # 12
from Julian Maurice
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