[Koha-bugs] [Bug 23012] Possibility to mark processing fee by default refund when item is found

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

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

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #46 from David Nind <david at davidnind.com> ---
Patches no longer applies.

Just applying the last two patches to the current master makes the tests pass
for t/db_dependent/Koha/Items.t - before applying any patches, the tests were
failing.

git bz apply 23012

Bug 23012 - Possibility to mark processing fee by default refund when item is
found

142481 - Bug 23012: Database updates for PROCESSING_FOUND account credit type
142482 - Bug 23012: Show the PROCESSING_FOUND account credit type
142483 - Bug 23012: Set policy for lost item processing fee
142484 - Bug 23012: Apply processing fee return policy when lost item found
142485 - Bug 23012: (QA follow-up) Combine method to get both values
142486 - Bug 23012: (QA follow-up) No need to create and delete rules for
branch
142487 - Bug 23012: (QA follow-up) Add exec flag to db update
142736 - Bug 23012: Fix t/db_dependent/Koha/Item.t
142737 - Bug 23012: (follow-up) Fix t/db_dependent/Koha/Items.t

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 23012: Database updates for PROCESSING_FOUND account credit type
Using index info to reconstruct a base tree...
M       installer/data/mysql/mandatory/account_credit_types.sql
Falling back to patching base and 3-way merge...
Applying: Bug 23012: Show the PROCESSING_FOUND account credit type
Using index info to reconstruct a base tree...
M       Koha/Account.pm
M       api/v1/swagger/definitions/patron_account_credit.yaml
M       koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
M       koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: Bug 23012: Set policy for lost item processing fee
Using index info to reconstruct a base tree...
M       Koha/CirculationRules.pm
M       admin/smart-rules.pl
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
M       t/db_dependent/Koha/CirculationRules.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Koha/CirculationRules.t
Auto-merging Koha/CirculationRules.pm
Applying: Bug 23012: Apply processing fee return policy when lost item found
Using index info to reconstruct a base tree...
M       C4/Circulation.pm
M       Koha/Item.pm
M       circ/returns.pl
M       koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
M       t/db_dependent/Koha/Item.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Koha/Item.t
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
Auto-merging Koha/Item.pm
CONFLICT (content): Merge conflict in Koha/Item.pm
Auto-merging C4/Circulation.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 23012: Apply processing fee return policy when lost
item found

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