[Koha-bugs] [Bug 25037] Add checkout_type to checkouts

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

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

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

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

--- Comment #67 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
This patch set on longer applies. Please rebase!

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 25037: Convert issues.onsite_checkout to issues.checkout_type
Applying: Bug 25037: Schema changes
Applying: Bug 25037: Add Koha::Checkouts checkout_type constants and TT plugin
Applying: Bug 25037: Replace occurences to issues.onsite_checkout
Using index info to reconstruct a base tree...
M       C4/Circulation.pm
M       C4/Items.pm
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
M       koha-tmpl/intranet-tmpl/prog/js/checkouts.js
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
M       t/db_dependent/Circulation.t
M       t/db_dependent/Items.t
M       t/db_dependent/Koha/Account/Line.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Koha/Account/Line.t
Auto-merging t/db_dependent/Items.t
Auto-merging t/db_dependent/Circulation.t
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/js/checkouts.js
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
Auto-merging C4/Items.pm
Auto-merging C4/Circulation.pm
CONFLICT (content): Merge conflict in C4/Circulation.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 25037: Replace occurences to issues.onsite_checkout
The copy of the patch that failed is found in: .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-25037-Replace-occurences-to-issuesonsitechecko-4HO8b_.patch

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