[Koha-bugs] [Bug 19336] Add option to fines.pl to apply maximal fine amount after delay

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

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

Mazen Khallaf <mazen.i.khallaf at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |mazen.i.khallaf at gmail.com

--- Comment #23 from Mazen Khallaf <mazen.i.khallaf at gmail.com> ---
Couldn't apply the patch

$ git bz apply 19336
y
Bug 19336 - Add option to fines.pl to apply maximal fine amount after delay

85920 - Bug 19336: Add --maxfinesday option to fines.pl
85921 - Bug 19336: (follow-up) Correct DateTime and Koha calls
85922 - Bug 19336: (QA follow-up) Initialize $unitcounttotal in case a report
is written
85923 - Bug 19336: (follow-up) Initialize $unitcount  instead of
$unitcounttotal after changes on master

Apply? [(y)es, (n)o, (i)nteractive] Applying: Bug 19336: Add --maxfinesday
option to fines.pl
Using index info to reconstruct a base tree...
M       misc/cronjobs/fines.pl
Falling back to patching base and 3-way merge...
Auto-merging misc/cronjobs/fines.pl
CONFLICT (content): Merge conflict in misc/cronjobs/fines.pl
error: Failed to merge in the changes.
Patch failed at 0001 Bug 19336: Add --maxfinesday option to fines.pl
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-19336-Add---maxfinesday-option-to-finespl-d37mQ0.patch

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