Bugzilla – Attachment 11508 Details for
Bug 4906
Allow fine calculation to exclude grace period
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 4906 - Problem with grace period calculation and fine intervals >1
Bug-4906---Problem-with-grace-period-calculation-a.patch (text/plain), 4.49 KB, created by
Kyle M Hall (khall)
on 2012-08-09 14:57:21 UTC
(
hide
)
Description:
Bug 4906 - Problem with grace period calculation and fine intervals >1
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2012-08-09 14:57:21 UTC
Size:
4.49 KB
patch
obsolete
>From beb5c5b2e2e1996e723e9471a345034152436753 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Thu, 9 Aug 2012 10:53:46 -0400 >Subject: [PATCH] Bug 4906 - Problem with grace period calculation and fine intervals >1 > >This patch adds the system preference FinesIncludeGracePeriod which >allows the library the choice to include the grace period when calculating >a fine ( Koha's current behavior ) or to ingore the grace period for >the purposes of fines calculation. It is set by default to preserve the >current behavior. >--- > C4/Overdues.pm | 6 +++++- > installer/data/mysql/sysprefs.sql | 1 + > installer/data/mysql/updatedatabase.pl | 8 ++++++++ > .../en/modules/admin/preferences/circulation.pref | 6 ++++++ > 4 files changed, 20 insertions(+), 1 deletions(-) > >diff --git a/C4/Overdues.pm b/C4/Overdues.pm >index d17f445..5ca8865 100644 >--- a/C4/Overdues.pm >+++ b/C4/Overdues.pm >@@ -264,7 +264,11 @@ sub CalcFine { > my $units_minus_grace = $chargeable_units - $data->{firstremind}; > my $amount = 0; > if ($data->{'chargeperiod'} && $units_minus_grace ) { >- $amount = int($chargeable_units / $data->{'chargeperiod'}) * $data->{'fine'};# TODO fine calc should be in cents >+ if ( C4::Context->preference('FinesIncludeGracePeriod') ) { >+ $amount = int($chargeable_units / $data->{'chargeperiod'}) * $data->{'fine'};# TODO fine calc should be in cents >+ } else { >+ $amount = int($units_minus_grace / $data->{'chargeperiod'}) * $data->{'fine'}; >+ } > } else { > # a zero (or null) chargeperiod means no charge. > } >diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql >index f5a18b2..02ebd0e 100644 >--- a/installer/data/mysql/sysprefs.sql >+++ b/installer/data/mysql/sysprefs.sql >@@ -374,3 +374,4 @@ INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ( > INSERT INTO systempreferences (variable,value,explanation,type) VALUES('EnableBorrowerFiles','0','If enabled, allows librarians to upload and attach arbitrary files to a borrower record.','YesNo'); > INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('UpdateTotalIssuesOnCirc','0','Whether to update the totalissues field in the biblio on each circ.',NULL,'YesNo'); > INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('IntranetSlipPrinterJS','','Use this JavaScript for printing slips. Define at least function printThenClose(). For use e.g. with Firefox PlugIn jsPrintSetup, see http://jsprintsetup.mozdev.org/','','Free'); >+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('FinesIncludeGracePeriod','1','If enabled, fines calculations will include the grace period.',NULL,'YesNo'); >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index ed0c674..2e54a53 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -5635,6 +5635,14 @@ if(C4::Context->preference("Version") < TransformToNum($DBversion) ) { > SetVersion($DBversion); > } > >+$DBversion = "3.09.00.XXX"; >+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { >+ $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('FinesIncludeGracePeriod','1','If enabled, fines calculations will include the grace period.',NULL,'YesNo');"); >+ >+ print "Upgrade to $DBversion done (Add system preference FinesIncludeGracePeriod)\n"; >+ SetVersion($DBversion); >+} >+ > =head1 FUNCTIONS > > =head2 TableExists($table) >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >index a758b19..c3820a6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >@@ -394,6 +394,12 @@ Circulation: > test: Calculate (but only for mailing to the admin) > production: Calculate and charge > - fines (when <code>misc/cronjobs/fines.pl</code> is being run). >+ - >+ - pref: FinesForGracePeriod >+ choices: >+ yes: Include >+ no: "Don't include" >+ - the grace period when calculating the fine for an overdue item. > Self Checkout: > - > - pref: ShowPatronImageInWebBasedSelfCheck >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 4906
:
11507
|
11508
|
13515
|
13570
|
13574
|
15969
|
15970