Bug 25253

Summary: Allow to apply modification template when exporting checkouts
Product: Koha Reporter: Julian Maurice <julian.maurice>
Component: CirculationAssignee: Julian Maurice <julian.maurice>
Status: Patch doesn't apply --- QA Contact: Testopia <testopia>
Severity: enhancement    
Priority: P5 - low CC: fridolin.somers, gmcharlt, kyle.m.hall, severine.queune
Version: Main   
Hardware: All   
OS: All   
Change sponsored?: --- Patch complexity: ---
Documentation contact: Documentation submission:
Text to go in the release notes:
Version(s) released in:
Bug Depends on: 24679    
Bug Blocks:    
Attachments: Bug 25253: Allow to apply modification template when exporting checkouts

Description Julian Maurice 2020-04-22 14:32:54 UTC

    
Comment 1 Julian Maurice 2020-04-22 14:33:25 UTC
Created attachment 103483 [details] [review]
Bug 25253: Allow to apply modification template when exporting checkouts

Test plan:
0. Apply bug 24679
1. Enable ExportCircHistory syspref
2. Create a MARC modification template
3. Go to 'Check out' or 'Details' tab of a borrower with checkouts
4. Make the checkouts table appear
5. Under the checkouts table, choose a MARC modification template, and
click on 'Export'
6. Verify that the modification template has been applied in the
exported file
Comment 2 Séverine Queune 2022-04-05 08:00:00 UTC
Quite an old one, rebase is needed :/

$ git bz apply 25253

Bug 25253 Depends on bug 24679 (Failed QA)
Follow? [(y)es, (n)o] y

Bug 24679 - Allow to apply a MARC modification template in export tool

111519 - Bug 24679: Allow to apply a MARC modification template in export tool
111520 - Bug 24679: Return the correct id in AddModificationTemplate
111521 - Bug 24679: Fix exporter tests

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 24679: Allow to apply a MARC modification template in export tool
Using index info to reconstruct a base tree...
M	C4/Record.pm
M	Koha/Exporter/Record.pm
M	koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt
M	t/db_dependent/Exporter/Record.t
M	tools/export.pl
Falling back to patching base and 3-way merge...
Auto-merging tools/export.pl
CONFLICT (content): Merge conflict in tools/export.pl
Auto-merging t/db_dependent/Exporter/Record.t
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt
Auto-merging Koha/Exporter/Record.pm
Auto-merging C4/Record.pm
CONFLICT (content): Merge conflict in C4/Record.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 24679: Allow to apply a MARC modification template in export tool
hint: Use 'git am --show-current-patch=diff' to see the failed 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-24679-Allow-to-apply-a-MARC-modification-templ-6_q4PP.patch
Comment 3 Fridolin Somers 2024-01-05 09:55:37 UTC
Must be applyed on top of Bug 24679