From 95077493bd57d0a0a0f9e4dc08eeaa5a1828f26a Mon Sep 17 00:00:00 2001 From: Srdjan Date: Tue, 6 Nov 2012 14:12:14 +1300 Subject: [PATCH] Bug 7243: Rewording and renaming Signed-off-by: Kyle M Hall Passed-QA-by: Jared Camins-Esakov Signed-off-by: Jared Camins-Esakov --- C4/Circulation.pm | 30 +++++++++---------- C4/Members.pm | 22 +++++++------- installer/data/mysql/sysprefs.sql | 4 +-- installer/data/mysql/updatedatabase.pl | 6 ++-- .../admin/preferences/circulation.pref | 8 ++--- t/db_dependent/lib/KohaTest/Members.pm | 2 +- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 1545f8913e..063a409b62 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -772,30 +772,30 @@ sub CanBookBeIssued { # # DEBTS - my ($ballance, $non_issue_ballance, $other_charges) = - C4::Members::GetMemberAccountBallance( $borrower->{'borrowernumber'} ); + my ($balance, $non_issue_charges, $other_charges) = + C4::Members::GetMemberAccountBalance( $borrower->{'borrowernumber'} ); my $amountlimit = C4::Context->preference("noissuescharge"); my $allowfineoverride = C4::Context->preference("AllowFineOverride"); my $allfinesneedoverride = C4::Context->preference("AllFinesNeedOverride"); if ( C4::Context->preference("IssuingInProcess") ) { - if ( $non_issue_ballance > $amountlimit && !$inprocess && !$allowfineoverride) { - $issuingimpossible{DEBT} = sprintf( "%.2f", $non_issue_ballance ); - } elsif ( $non_issue_ballance > $amountlimit && !$inprocess && $allowfineoverride) { - $needsconfirmation{DEBT} = sprintf( "%.2f", $non_issue_ballance ); - } elsif ( $allfinesneedoverride && $non_issue_ballance > 0 && $non_issue_ballance <= $amountlimit && !$inprocess ) { - $needsconfirmation{DEBT} = sprintf( "%.2f", $non_issue_ballance ); + if ( $non_issue_charges > $amountlimit && !$inprocess && !$allowfineoverride) { + $issuingimpossible{DEBT} = sprintf( "%.2f", $non_issue_charges ); + } elsif ( $non_issue_charges > $amountlimit && !$inprocess && $allowfineoverride) { + $needsconfirmation{DEBT} = sprintf( "%.2f", $non_issue_charges ); + } elsif ( $allfinesneedoverride && $non_issue_charges > 0 && $non_issue_charges <= $amountlimit && !$inprocess ) { + $needsconfirmation{DEBT} = sprintf( "%.2f", $non_issue_charges ); } } else { - if ( $non_issue_ballance > $amountlimit && $allowfineoverride ) { - $needsconfirmation{DEBT} = sprintf( "%.2f", $non_issue_ballance ); - } elsif ( $non_issue_ballance > $amountlimit && !$allowfineoverride) { - $issuingimpossible{DEBT} = sprintf( "%.2f", $non_issue_ballance ); - } elsif ( $non_issue_ballance > 0 && $allfinesneedoverride ) { - $needsconfirmation{DEBT} = sprintf( "%.2f", $non_issue_ballance ); + if ( $non_issue_charges > $amountlimit && $allowfineoverride ) { + $needsconfirmation{DEBT} = sprintf( "%.2f", $non_issue_charges ); + } elsif ( $non_issue_charges > $amountlimit && !$allowfineoverride) { + $issuingimpossible{DEBT} = sprintf( "%.2f", $non_issue_charges ); + } elsif ( $non_issue_charges > 0 && $allfinesneedoverride ) { + $needsconfirmation{DEBT} = sprintf( "%.2f", $non_issue_charges ); } } - if ($ballance > 0 && $other_charges > 0) { + if ($balance > 0 && $other_charges > 0) { $alerts{OTHER_CHARGES} = sprintf( "%.2f", $other_charges ); } diff --git a/C4/Members.pm b/C4/Members.pm index 7d4f894231..f1136c2eb5 100644 --- a/C4/Members.pm +++ b/C4/Members.pm @@ -432,7 +432,7 @@ sub patronflags { my %flags; my ( $patroninformation) = @_; my $dbh=C4::Context->dbh; - my ($ballance, $owing) = GetMemberAccountBallance( $patroninformation->{'borrowernumber'}); + my ($balance, $owing) = GetMemberAccountBalance( $patroninformation->{'borrowernumber'}); if ( $owing > 0 ) { my %flaginfo; my $noissuescharge = C4::Context->preference("noissuescharge") || 5; @@ -443,10 +443,10 @@ sub patronflags { } $flags{'CHARGES'} = \%flaginfo; } - elsif ( $ballance < 0 ) { + elsif ( $balance < 0 ) { my %flaginfo; - $flaginfo{'message'} = sprintf "Patron has credit of \$%.02f", -$ballance; - $flaginfo{'amount'} = sprintf "%.02f", $ballance; + $flaginfo{'message'} = sprintf "Patron has credit of \$%.02f", -$balance; + $flaginfo{'amount'} = sprintf "%.02f", $balance; $flags{'CREDITS'} = \%flaginfo; } if ( $patroninformation->{'gonenoaddress'} @@ -1156,31 +1156,31 @@ sub GetMemberAccountRecords { return ( $total, \@acctlines,$numlines); } -=head2 GetMemberAccountBallance +=head2 GetMemberAccountBalance - ($total_ballance, $non_issue_ballance, $other_charges) = &GetMemberAccountBallance($borrowernumber); + ($total_balance, $non_issue_balance, $other_charges) = &GetMemberAccountBalance($borrowernumber); Calculates amount immediately owing by the patron - non-issue charges. Based on GetMemberAccountRecords. Charges exempt from non-issue are: * Res (reserves) -* Rent (rental) if RentalsInNoissueCharges syspref is set to false -* Manual invoices if ManInvInNoissueCharges syspref is set to false +* Rent (rental) if RentalsInNoissuesCharge syspref is set to false +* Manual invoices if ManInvInNoissuesCharge syspref is set to false =cut my $ACCOUNT_TYPE_LENGTH = 5; # this is plain ridiculous... my @not_fines = ('Res'); -push @not_fines, 'Rent' unless C4::Context->preference('RentalsInNoissueCharges'); -unless ( C4::Context->preference('ManInvInNoissueCharges') ) { +push @not_fines, 'Rent' unless C4::Context->preference('RentalsInNoissuesCharge'); +unless ( C4::Context->preference('ManInvInNoissuesCharge') ) { my $dbh = C4::Context->dbh; my $man_inv_types = $dbh->selectcol_arrayref(qq{SELECT authorised_value FROM authorised_values WHERE category = 'MANUAL_INV'}); push @not_fines, map substr($_, 0, $ACCOUNT_TYPE_LENGTH), @$man_inv_types; } my %not_fine = map {$_ => 1} @not_fines; -sub GetMemberAccountBallance { +sub GetMemberAccountBalance { my ($borrowernumber) = @_; my ($total, $acctlines) = GetMemberAccountRecords($borrowernumber); diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 796a553d04..7e9f43d13e 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -327,8 +327,8 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('EasyAnalyticalRecords','0','If on, display in the catalogue screens tools to easily setup analytical record relationships','','YesNo'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowRecentComments',0,'If ON a link to recent comments will appear in the OPAC masthead',NULL,'YesNo'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('CircAutoPrintQuickSlip', '1', 'Choose what should happen when an empty barcode field is submitted in circulation: Display a print quick slip window or Clear the screen.',NULL,'YesNo'); -INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('RentalsInNoissueCharges', '1', 'Include rental charges when summing up charges for NoissueCharge.',NULL,'YesNo'); -INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ManInvInNoissueCharges', '1', 'Include MAN_INV charges when summing up charges for NoissueCharge.',NULL,'YesNo'); +INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('RentalsInNoissuesCharge', '1', 'Rental charges block checkouts (added to noissuescharge).',NULL,'YesNo'); +INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ManInvInNoissuesCharge', '1', 'MANUAL_INV charges block checkouts (added to noissuescharge).',NULL,'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('NoticeCSS','','Notices CSS url.',NULL,'free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('SlipCSS','','Slips CSS url.',NULL,'free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('TransferWhenCancelAllWaitingHolds','0','Transfer items when cancelling all waiting holds',NULL,'YesNo'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index a03b3e6f3c..1646fa6d39 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -6341,9 +6341,9 @@ if ( CheckVersion($DBversion) ) { $DBversion = "3.11.00.XXX"; if (C4::Context->preference("Version") < TransformToNum($DBversion)) { - $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('RentalsInNoissueCharges', '1', 'Include rental charges when summing up charges for NoissueCharge.',NULL,'YesNo');"); - $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ManInvInNoissueCharges', '1', 'Include MAN_INV charges when summing up charges for NoissueCharge.',NULL,'YesNo');"); - print "Upgrade to $DBversion done (Add sysprefs RentalsInNoissueCharges and ManInvInNoissueCharges.)\n"; + $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('RentalsInNoissuesCharge', '1', 'Rental charges block checkouts (added to noissuescharge).',NULL,'YesNo');"); + $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ManInvInNoissuesCharge', '1', 'MANUAL_INV charges block checkouts (added to noissuescharge).',NULL,'YesNo');"); + print "Upgrade to $DBversion done (Add sysprefs RentalsInNoissuesCharge and ManInvInNoissuesCharge.)\n"; SetVersion($DBversion); } 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 1156b46c6c..82c1c02f0d 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 @@ -265,17 +265,17 @@ Circulation: class: integer - '[% local_currency %] in fines.' - - - pref: RentalsInNoissueCharges + - pref: RentalsInNoissuesCharge choices: yes: Include no: "Don't include" - - rental charges when summing up charges for NoissueCharge. + - rental charges when summing up charges for noissuescharge. - - - pref: ManInvInNoissueCharges + - pref: ManInvInNoissuesCharge choices: yes: Include no: "Don't include" - - MAN_INV charges when summing up charges for NoissueCharge. + - MANUAL_INV charges when summing up charges for noissuescharge. - - pref: ReturnBeforeExpiry choices: diff --git a/t/db_dependent/lib/KohaTest/Members.pm b/t/db_dependent/lib/KohaTest/Members.pm index edaa85b10a..d1a76fe3c2 100644 --- a/t/db_dependent/lib/KohaTest/Members.pm +++ b/t/db_dependent/lib/KohaTest/Members.pm @@ -27,7 +27,7 @@ sub methods : Test( 1 ) { GetPendingIssues GetAllIssues GetMemberAccountRecords - GetMemberAccountBallance + GetMemberAccountBalance GetBorNotifyAcctRecord checkuniquemember checkcardnumber -- 2.39.5