Bugzilla – Attachment 94316 Details for
Bug 23049
Replace MANUAL_INV authorised value with a dedicated table
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23049: Update 'PF' to 'PROCESSING' for consistency
Bug-23049-Update-PF-to-PROCESSING-for-consistency.patch (text/plain), 30.43 KB, created by
Martin Renvoize (ashimema)
on 2019-10-16 15:30:51 UTC
(
hide
)
Description:
Bug 23049: Update 'PF' to 'PROCESSING' for consistency
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2019-10-16 15:30:51 UTC
Size:
30.43 KB
patch
obsolete
>From d28c72b8e559f047e309b667bb25b7b437ea113e Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Thu, 10 Oct 2019 17:15:39 +0100 >Subject: [PATCH] Bug 23049: Update 'PF' to 'PROCESSING' for consistency >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> >--- > C4/Accounts.pm | 2 +- > Koha/Account.pm | 6 +-- > installer/data/mysql/account_debit_types.sql | 2 +- > .../mysql/atomicupdate/bug_23049_debit.perl | 9 +++- > .../en/mandatory/account_debit_types.sql | 2 +- > .../prog/en/includes/accounts.inc | 2 +- > .../bootstrap/en/includes/account-table.inc | 2 +- > t/db_dependent/Accounts.t | 42 +++++++++---------- > t/db_dependent/Circulation.t | 32 +++++++------- > 9 files changed, 53 insertions(+), 46 deletions(-) > >diff --git a/C4/Accounts.pm b/C4/Accounts.pm >index 6aa1bb4a6e..3f06595d74 100644 >--- a/C4/Accounts.pm >+++ b/C4/Accounts.pm >@@ -108,7 +108,7 @@ sub chargelostitem { > user_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : undef, > interface => C4::Context->interface, > library_id => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef, >- type => 'processing', >+ type => 'PROCESSING', > item_id => $itemnumber, > issue_id => $issue_id, > } >diff --git a/Koha/Account.pm b/Koha/Account.pm >index c6776c6e3f..8dfd3a4d4d 100644 >--- a/Koha/Account.pm >+++ b/Koha/Account.pm >@@ -451,7 +451,7 @@ $debit_type can be any of: > - sundry > - new_card > - overdue >- - processing >+ - PROCESSING > - RENT > - RENT_DAILY > - RENT_RENEW >@@ -712,7 +712,7 @@ our $offset_type = { > 'account' => 'Account Fee', > 'account_renew' => 'Account Fee', > 'RESERVE' => 'Reserve Fee', >- 'processing' => 'Processing Fee', >+ 'PROCESSING' => 'Processing Fee', > 'lost_item' => 'Lost Item', > 'RENT' => 'Rental Fee', > 'RENT_DAILY' => 'Rental Fee', >@@ -747,7 +747,7 @@ our $account_type_debit = { > 'sundry' => 'M', > 'new_card' => 'N', > 'overdue' => 'OVERDUE', >- 'processing' => 'PF', >+ 'PROCESSING' => 'PROCESSING', > 'RENT' => 'RENT', > 'RENT_DAILY' => 'RENT_DAILY', > 'RENT_RENEW' => 'RENT_RENEW', >diff --git a/installer/data/mysql/account_debit_types.sql b/installer/data/mysql/account_debit_types.sql >index 1737295293..8f7d70a289 100644 >--- a/installer/data/mysql/account_debit_types.sql >+++ b/installer/data/mysql/account_debit_types.sql >@@ -6,7 +6,7 @@ INSERT INTO account_debit_types ( code, description, can_be_added_manually, defa > ('M', 'Manual fee', 1, NULL, 0), > ('N', 'New card fee', 1, NULL, 1), > ('OVERDUE', 'Overdue fine', 0, NULL, 1), >-('PF', 'Lost item processing fee', 0, NULL, 1), >+('PROCESSING', 'Lost item processing fee', 0, NULL, 1), > ('RENT', 'Rental fee', 0, NULL, 1), > ('RENT_DAILY', 'Daily rental fee', 0, NULL, 1), > ('RENT_RENEW', 'Renewal of rental item', 0, NULL, 1), >diff --git a/installer/data/mysql/atomicupdate/bug_23049_debit.perl b/installer/data/mysql/atomicupdate/bug_23049_debit.perl >index be063adf15..eb49506523 100644 >--- a/installer/data/mysql/atomicupdate/bug_23049_debit.perl >+++ b/installer/data/mysql/atomicupdate/bug_23049_debit.perl >@@ -45,7 +45,7 @@ if ( CheckVersion($DBversion) ) { > ('M', 'Manual fee', 1, NULL, 0), > ('N', 'New card fee', 1, NULL, 1), > ('OVERDUE', 'Overdue fine', 0, NULL, 1), >- ('PF', 'Lost item processing fee', 0, NULL, 1), >+ ('PROCESSING', 'Lost item processing fee', 0, NULL, 1), > ('RENT', 'Rental fee', 0, NULL, 1), > ('RENT_DAILY', 'Daily rental fee', 0, NULL, 1), > ('RENT_RENEW', 'Renewal of rental item', 0, NULL, 1), >@@ -61,6 +61,13 @@ if ( CheckVersion($DBversion) ) { > } > ); > >+ # Update accountype 'PF' to 'PROCESSING' >+ $dbh->do( >+ qq{ >+ UPDATE accountlines SET accounttype = 'PROCESSING' WHERE accounttype = 'PF' >+ } >+ ); >+ > # Moving MANUAL_INV to account_debit_types > $dbh->do( > qq{ >diff --git a/installer/data/mysql/en/mandatory/account_debit_types.sql b/installer/data/mysql/en/mandatory/account_debit_types.sql >index 1737295293..8f7d70a289 100644 >--- a/installer/data/mysql/en/mandatory/account_debit_types.sql >+++ b/installer/data/mysql/en/mandatory/account_debit_types.sql >@@ -6,7 +6,7 @@ INSERT INTO account_debit_types ( code, description, can_be_added_manually, defa > ('M', 'Manual fee', 1, NULL, 0), > ('N', 'New card fee', 1, NULL, 1), > ('OVERDUE', 'Overdue fine', 0, NULL, 1), >-('PF', 'Lost item processing fee', 0, NULL, 1), >+('PROCESSING', 'Lost item processing fee', 0, NULL, 1), > ('RENT', 'Rental fee', 0, NULL, 1), > ('RENT_DAILY', 'Daily rental fee', 0, NULL, 1), > ('RENT_RENEW', 'Renewal of rental item', 0, NULL, 1), >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc >index 1f0f6bd2a6..8dbe0feed1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc >@@ -20,7 +20,7 @@ > [%- CASE 'M' -%]Sundry > [%- CASE 'N' -%]New card > [%- CASE 'OVERDUE' -%]Fine >- [%- CASE 'PF' -%]Lost item processing fee >+ [%- CASE 'PROCESSING' -%]Lost item processing fee > [%- CASE 'RENT' -%]Rental fee > [%- CASE 'RENT_DAILY' -%]Daily rental fee > [%- CASE 'RENT_RENEW' -%]Renewal of rental item >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc >index 2643dd30a9..d4f16c29b1 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc >@@ -191,7 +191,7 @@ > [%- CASE 'M' -%]Sundry > [%- CASE 'N' -%]New card > [%- CASE 'OVERDUE' -%]Fine >- [%- CASE 'PF' -%]Lost item processing fee >+ [%- CASE 'PROCESSING' -%]Lost item processing fee > [%- CASE 'RENT' -%]Rental fee > [%- CASE 'RENT_DAILY' -%]Daily rental fee > [%- CASE 'RENT_RENEW' -%]Renewal of rental item >diff --git a/t/db_dependent/Accounts.t b/t/db_dependent/Accounts.t >index 85b15512ea..a34c523341 100644 >--- a/t/db_dependent/Accounts.t >+++ b/t/db_dependent/Accounts.t >@@ -585,38 +585,38 @@ subtest "C4::Accounts::chargelostitem tests" => sub { > > C4::Accounts::chargelostitem( $cli_borrowernumber, $cli_itemnumber1, 0, "Perdedor"); > $lostfine = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber1, debit_type_code => 'LOST' }); >- $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber1, debit_type_code => 'PF' }); >+ $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber1, debit_type_code => 'PROCESSING' }); > ok( !$lostfine, "No lost fine if no replacementcost or default when pref off"); > ok( !$procfee, "No processing fee if no processing fee"); > C4::Accounts::chargelostitem( $cli_borrowernumber, $cli_itemnumber1, 6.12, "Perdedor"); > $lostfine = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber1, debit_type_code => 'LOST' }); >- $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber1, debit_type_code => 'PF' }); >+ $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber1, debit_type_code => 'PROCESSING' }); > ok( $lostfine->amount == 6.12, "Lost fine equals replacementcost when pref off and no default set"); > ok( !$procfee, "No processing fee if no processing fee"); > $lostfine->delete(); > > C4::Accounts::chargelostitem( $cli_borrowernumber, $cli_itemnumber2, 0, "Perdedor"); > $lostfine = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber2, debit_type_code => 'LOST' }); >- $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber2, debit_type_code => 'PF' }); >+ $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber2, debit_type_code => 'PROCESSING' }); > ok( !$lostfine, "No lost fine if no replacementcost but default set when pref off"); > ok( !$procfee, "No processing fee if no processing fee"); > C4::Accounts::chargelostitem( $cli_borrowernumber, $cli_itemnumber2, 6.12, "Perdedor"); > $lostfine = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber2, debit_type_code => 'LOST' }); >- $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber2, debit_type_code => 'PF' }); >+ $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber2, debit_type_code => 'PROCESSING' }); > ok( $lostfine->amount == 6.12 , "Lost fine equals replacementcost when pref off and default set"); > ok( !$procfee, "No processing fee if no processing fee"); > $lostfine->delete(); > > C4::Accounts::chargelostitem( $cli_borrowernumber, $cli_itemnumber3, 0, "Perdedor"); > $lostfine = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber3, debit_type_code => 'LOST' }); >- $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber3, debit_type_code => 'PF' }); >+ $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber3, debit_type_code => 'PROCESSING' }); > ok( !$lostfine, "No lost fine if no replacementcost and no default set when pref off"); > ok( $procfee->amount == 8.16, "Processing fee if processing fee"); > is( $procfee->issue_id, $cli_issue_id_3, "Processing fee issue id is correct" ); > $procfee->delete(); > C4::Accounts::chargelostitem( $cli_borrowernumber, $cli_itemnumber3, 6.12, "Perdedor"); > $lostfine = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber3, debit_type_code => 'LOST' }); >- $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber3, debit_type_code => 'PF' }); >+ $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber3, debit_type_code => 'PROCESSING' }); > ok( $lostfine->amount == 6.12 , "Lost fine equals replacementcost when pref off and no default set"); > ok( $procfee->amount == 8.16, "Processing fee if processing fee"); > is( $procfee->issue_id, $cli_issue_id_3, "Processing fee issue id is correct" ); >@@ -625,14 +625,14 @@ subtest "C4::Accounts::chargelostitem tests" => sub { > > C4::Accounts::chargelostitem( $cli_borrowernumber, $cli_itemnumber4, 0, "Perdedor"); > $lostfine = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4, debit_type_code => 'LOST' }); >- $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4, debit_type_code => 'PF' }); >+ $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4, debit_type_code => 'PROCESSING' }); > ok( !$lostfine, "No lost fine if no replacementcost but default set when pref off"); > ok( $procfee->amount == 2.04, "Processing fee if processing fee"); > is( $procfee->issue_id, $cli_issue_id_4, "Processing fee issue id is correct" ); > $procfee->delete(); > C4::Accounts::chargelostitem( $cli_borrowernumber, $cli_itemnumber4, 6.12, "Perdedor"); > $lostfine = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4, debit_type_code => 'LOST' }); >- $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4, debit_type_code => 'PF' }); >+ $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4, debit_type_code => 'PROCESSING' }); > ok( $lostfine->amount == 6.12 , "Lost fine equals replacementcost when pref off and default set"); > ok( $procfee->amount == 2.04, "Processing fee if processing fee"); > is( $procfee->issue_id, $cli_issue_id_4, "Processing fee issue id is correct" ); >@@ -643,44 +643,44 @@ subtest "C4::Accounts::chargelostitem tests" => sub { > > C4::Accounts::chargelostitem( $cli_borrowernumber, $cli_itemnumber1, 0, "Perdedor"); > $lostfine = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber1, debit_type_code => 'LOST' }); >- $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber1, debit_type_code => 'PF' }); >+ $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber1, debit_type_code => 'PROCESSING' }); > ok( !$lostfine, "No lost fine if no replacementcost or default when pref on"); > ok( !$procfee, "No processing fee if no processing fee"); > C4::Accounts::chargelostitem( $cli_borrowernumber, $cli_itemnumber1, 6.12, "Perdedor"); > $lostfine = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber1, debit_type_code => 'LOST' }); >- $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber1, debit_type_code => 'PF' }); >+ $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber1, debit_type_code => 'PROCESSING' }); > is( $lostfine->amount, "6.120000", "Lost fine equals replacementcost when pref on and no default set"); > ok( !$procfee, "No processing fee if no processing fee"); > > C4::Accounts::chargelostitem( $cli_borrowernumber, $cli_itemnumber2, 0, "Perdedor"); > $lostfine = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber2, debit_type_code => 'LOST' }); >- $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber2, debit_type_code => 'PF' }); >+ $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber2, debit_type_code => 'PROCESSING' }); > is( $lostfine->amount(), "16.320000", "Lost fine is default if no replacementcost but default set when pref on"); > ok( !$procfee, "No processing fee if no processing fee"); > $lostfine->delete(); > C4::Accounts::chargelostitem( $cli_borrowernumber, $cli_itemnumber2, 6.12, "Perdedor"); > $lostfine = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber2, debit_type_code => 'LOST' }); >- $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber2, debit_type_code => 'PF' }); >+ $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber2, debit_type_code => 'PROCESSING' }); > is( $lostfine->amount, "6.120000" , "Lost fine equals replacementcost when pref on and default set"); > ok( !$procfee, "No processing fee if no processing fee"); > > C4::Accounts::chargelostitem( $cli_borrowernumber, $cli_itemnumber3, 0, "Perdedor"); > $lostfine = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber3, debit_type_code => 'LOST' }); >- $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber3, debit_type_code => 'PF' }); >+ $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber3, debit_type_code => 'PROCESSING' }); > ok( !$lostfine, "No lost fine if no replacementcost and default not set when pref on"); > is( $procfee->amount, "8.160000", "Processing fee if processing fee"); > is( $procfee->issue_id, $cli_issue_id_3, "Processing fee issue id is correct" ); > $procfee->delete(); > C4::Accounts::chargelostitem( $cli_borrowernumber, $cli_itemnumber3, 6.12, "Perdedor"); > $lostfine = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber3, debit_type_code => 'LOST' }); >- $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber3, debit_type_code => 'PF' }); >+ $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber3, debit_type_code => 'PROCESSING' }); > is( $lostfine->amount, "6.120000", "Lost fine equals replacementcost when pref on and no default set"); > is( $procfee->amount, "8.160000", "Processing fee if processing fee"); > is( $procfee->issue_id, $cli_issue_id_3, "Processing fee issue id is correct" ); > > C4::Accounts::chargelostitem( $cli_borrowernumber, $cli_itemnumber4, 0, "Perdedor"); > $lostfine = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4, debit_type_code => 'LOST' }); >- $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4, debit_type_code => 'PF' }); >+ $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4, debit_type_code => 'PROCESSING' }); > is( $lostfine->amount, "4.080000", "Lost fine is default if no replacementcost but default set when pref on"); > is( $procfee->amount, "2.040000", "Processing fee if processing fee"); > is( $procfee->issue_id, $cli_issue_id_4, "Processing fee issue id is correct" ); >@@ -688,20 +688,20 @@ subtest "C4::Accounts::chargelostitem tests" => sub { > $procfee->delete(); > C4::Accounts::chargelostitem( $cli_borrowernumber, $cli_itemnumber4, 6.12, "Perdedor"); > $lostfine = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4, debit_type_code => 'LOST' }); >- $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4, debit_type_code => 'PF' }); >+ $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4, debit_type_code => 'PROCESSING' }); > is( $lostfine->amount, "6.120000", "Lost fine equals replacementcost when pref on and default set"); > is( $procfee->amount, "2.040000", "Processing fee if processing fee"); > is( $procfee->issue_id, $cli_issue_id_4, "Processing fee issue id is correct" ); > C4::Accounts::chargelostitem( $cli_borrowernumber, $cli_itemnumber4, 6.12, "Perdedor"); > my $lostfines = Koha::Account::Lines->search({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4, debit_type_code => 'LOST' }); >- my $procfees = Koha::Account::Lines->search({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4, debit_type_code => 'PF' }); >+ my $procfees = Koha::Account::Lines->search({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4, debit_type_code => 'PROCESSING' }); > ok( $lostfines->count == 1 , "Lost fine cannot be double charged for the same issue_id"); > ok( $procfees->count == 1, "Processing fee cannot be double charged for the same issue_id"); > MarkIssueReturned($cli_borrowernumber, $cli_itemnumber4); > $cli_issue_id_4X = $builder->build({ source => 'Issue', value => { borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4 } })->{issue_id}; > C4::Accounts::chargelostitem( $cli_borrowernumber, $cli_itemnumber4, 6.12, "Perdedor"); > $lostfines = Koha::Account::Lines->search({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4, debit_type_code => 'LOST' }); >- $procfees = Koha::Account::Lines->search({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4, debit_type_code => 'PF' }); >+ $procfees = Koha::Account::Lines->search({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4, debit_type_code => 'PROCESSING' }); > ok( $lostfines->count == 2 , "Lost fine can be charged twice for the same item if they are distinct issue_id's"); > ok( $procfees->count == 2, "Processing fee can be charged twice for the same item if they are distinct issue_id's"); > $lostfines->delete(); >@@ -724,7 +724,7 @@ subtest "C4::Accounts::chargelostitem tests" => sub { > is($lostfine->branchcode, $branchcode, "Lost fine branchcode set correctly"); > > # Processing Fee >- $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4, debit_type_code => 'PF' }); >+ $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4, debit_type_code => 'PROCESSING' }); > ok($procfee, "Processing fee created"); > is($procfee->manager_id, $staff_id, "Processing fee manager_id set correctly"); > is($procfee->issue_id, $cli_issue_id_4X, "Processing fee issue_id set correctly"); >@@ -743,7 +743,7 @@ subtest "C4::Accounts::chargelostitem tests" => sub { > t::lib::Mocks::mock_preference( 'FinesLog', 0 ); > C4::Accounts::chargelostitem( $cli_borrowernumber, $cli_itemnumber4, 0, "Perdedor"); > $lostfine = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4, debit_type_code => 'LOST' }); >- $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4, debit_type_code => 'PF' }); >+ $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4, debit_type_code => 'PROCESSING' }); > is( $schema->resultset('ActionLog')->count(), $action_logs + 0, 'No logs were added' ); > $lostfine->delete(); > $procfee->delete(); >@@ -751,7 +751,7 @@ subtest "C4::Accounts::chargelostitem tests" => sub { > t::lib::Mocks::mock_preference( 'FinesLog', 1 ); > C4::Accounts::chargelostitem( $cli_borrowernumber, $cli_itemnumber4, 0, "Perdedor"); > $lostfine = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4, debit_type_code => 'LOST' }); >- $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4, debit_type_code => 'PF' }); >+ $procfee = Koha::Account::Lines->find({ borrowernumber => $cli_borrowernumber, itemnumber => $cli_itemnumber4, debit_type_code => 'PROCESSING' }); > is( $schema->resultset('ActionLog')->count(), $action_logs + 2, 'Logs were added' ); > $lostfine->delete(); > $procfee->delete(); >diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t >index 51fe4ade7f..4d6f49cb87 100755 >--- a/t/db_dependent/Circulation.t >+++ b/t/db_dependent/Circulation.t >@@ -2124,13 +2124,13 @@ subtest '_FixAccountForLostAndReturned' => sub { > LostItem( $item->itemnumber, 1 ); > > my $processing_fee_lines = Koha::Account::Lines->search( >- { borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'PF' } ); >+ { borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'PROCESSING' } ); > is( $processing_fee_lines->count, 1, 'Only one processing fee produced' ); > my $processing_fee_line = $processing_fee_lines->next; > is( $processing_fee_line->amount + 0, >- $processfee_amount, 'The right PF amount is generated' ); >+ $processfee_amount, 'The right PROCESSING amount is generated' ); > is( $processing_fee_line->amountoutstanding + 0, >- $processfee_amount, 'The right PF amountoutstanding is generated' ); >+ $processfee_amount, 'The right PROCESSING amountoutstanding is generated' ); > > my $lost_fee_lines = Koha::Account::Lines->search( > { borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'LOST' } ); >@@ -2188,13 +2188,13 @@ subtest '_FixAccountForLostAndReturned' => sub { > LostItem( $item->itemnumber, 1 ); > > my $processing_fee_lines = Koha::Account::Lines->search( >- { borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'PF' } ); >+ { borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'PROCESSING' } ); > is( $processing_fee_lines->count, 1, 'Only one processing fee produced' ); > my $processing_fee_line = $processing_fee_lines->next; > is( $processing_fee_line->amount + 0, >- $processfee_amount, 'The right PF amount is generated' ); >+ $processfee_amount, 'The right PROCESSING amount is generated' ); > is( $processing_fee_line->amountoutstanding + 0, >- $processfee_amount, 'The right PF amountoutstanding is generated' ); >+ $processfee_amount, 'The right PROCESSING amountoutstanding is generated' ); > > my $lost_fee_lines = Koha::Account::Lines->search( > { borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'LOST' } ); >@@ -2258,13 +2258,13 @@ subtest '_FixAccountForLostAndReturned' => sub { > LostItem( $item->itemnumber, 1 ); > > my $processing_fee_lines = Koha::Account::Lines->search( >- { borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'PF' } ); >+ { borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'PROCESSING' } ); > is( $processing_fee_lines->count, 1, 'Only one processing fee produced' ); > my $processing_fee_line = $processing_fee_lines->next; > is( $processing_fee_line->amount + 0, >- $processfee_amount, 'The right PF amount is generated' ); >+ $processfee_amount, 'The right PROCESSING amount is generated' ); > is( $processing_fee_line->amountoutstanding + 0, >- $processfee_amount, 'The right PF amountoutstanding is generated' ); >+ $processfee_amount, 'The right PROCESSING amountoutstanding is generated' ); > > my $lost_fee_lines = Koha::Account::Lines->search( > { borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'LOST' } ); >@@ -2311,13 +2311,13 @@ subtest '_FixAccountForLostAndReturned' => sub { > LostItem( $item->itemnumber, 1 ); > > my $processing_fee_lines = Koha::Account::Lines->search( >- { borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'PF' } ); >+ { borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'PROCESSING' } ); > is( $processing_fee_lines->count, 1, 'Only one processing fee produced' ); > my $processing_fee_line = $processing_fee_lines->next; > is( $processing_fee_line->amount + 0, >- $processfee_amount, 'The right PF amount is generated' ); >+ $processfee_amount, 'The right PROCESSING amount is generated' ); > is( $processing_fee_line->amountoutstanding + 0, >- $processfee_amount, 'The right PF amountoutstanding is generated' ); >+ $processfee_amount, 'The right PROCESSING amountoutstanding is generated' ); > > my $lost_fee_lines = Koha::Account::Lines->search( > { borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'LOST' } ); >@@ -2328,7 +2328,7 @@ subtest '_FixAccountForLostAndReturned' => sub { > $replacement_amount, 'The right LOST amountountstanding is generated' ); > > my $account = $patron->account; >- is( $account->balance, $processfee_amount + $replacement_amount, 'Balance is PF + L' ); >+ is( $account->balance, $processfee_amount + $replacement_amount, 'Balance is PROCESSING + L' ); > > # Partially pay fee > my $payment_amount = 27; >@@ -2363,7 +2363,7 @@ subtest '_FixAccountForLostAndReturned' => sub { > my $credit_return_id = C4::Circulation::_FixAccountForLostAndReturned( $item->itemnumber, $patron->id ); > my $credit_return = Koha::Account::Lines->find($credit_return_id); > >- is( $account->balance, $processfee_amount - $payment_amount, 'Balance is PF - payment (LOST_RETURN)' ); >+ is( $account->balance, $processfee_amount - $payment_amount, 'Balance is PROCESSING - payment (LOST_RETURN)' ); > > $lost_fee_line->discard_changes; > is( $lost_fee_line->amountoutstanding + 0, 0, 'Lost fee has no outstanding amount' ); >@@ -2383,7 +2383,7 @@ subtest '_FixAccountForLostAndReturned' => sub { > > is( $account->balance, > $processfee_amount - $payment_amount, >- 'The patron balance is the difference between the PF and the credit' >+ 'The patron balance is the difference between the PROCESSING and the credit' > ); > }; > >@@ -2459,7 +2459,7 @@ subtest '_FixAccountForLostAndReturned' => sub { > my $credit_return_id = C4::Circulation::_FixAccountForLostAndReturned( $item_id, $patron->id ); > my $credit_return = Koha::Account::Lines->find($credit_return_id); > >- is( $account->balance, $manual_debit_amount - $payment_amount, 'Balance is PF - payment (LOST_RETURN)' ); >+ is( $account->balance, $manual_debit_amount - $payment_amount, 'Balance is PROCESSING - payment (LOST_RETURN)' ); > > my $manual_debit = Koha::Account::Lines->search({ borrowernumber => $patron->id, debit_type_code => 'OVERDUE', status => 'UNRETURNED' })->next; > is( $manual_debit->amountoutstanding + 0, $manual_debit_amount - $payment_amount, 'reconcile_balance was called' ); >-- >2.20.1
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=94316">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 23049
:
93513
|
93514
|
93515
|
93516
|
93518
|
93519
|
93520
|
93521
|
93522
|
93523
|
93529
|
93557
|
93564
|
93565
|
93567
|
93568
|
93569
|
93570
|
93571
|
93572
|
93573
|
93574
|
93575
|
93576
|
93577
|
93578
|
93579
|
93960
|
93961
|
93962
|
93963
|
93964
|
93965
|
93966
|
93967
|
93968
|
93969
|
93970
|
93972
|
93973
|
93974
|
93975
|
93976
|
93977
|
93978
|
93979
|
93989
|
93990
|
93991
|
93992
|
93993
|
93994
|
93995
|
93996
|
93997
|
93998
|
93999
|
94000
|
94001
|
94002
|
94003
|
94004
|
94005
|
94006
|
94007
|
94008
|
94073
|
94074
|
94075
|
94076
|
94077
|
94078
|
94079
|
94080
|
94081
|
94082
|
94083
|
94084
|
94085
|
94086
|
94087
|
94088
|
94089
|
94090
|
94091
|
94092
|
94093
|
94111
|
94112
|
94113
|
94114
|
94115
|
94116
|
94117
|
94118
|
94119
|
94120
|
94121
|
94122
|
94123
|
94124
|
94125
|
94126
|
94127
|
94128
|
94129
|
94130
|
94131
|
94132
|
94133
|
94134
|
94135
|
94136
|
94137
|
94138
|
94139
|
94140
|
94141
|
94142
|
94143
|
94144
|
94145
|
94146
|
94147
|
94148
|
94149
|
94150
|
94151
|
94152
|
94165
|
94307
|
94308
|
94309
|
94310
|
94311
|
94312
|
94313
|
94314
|
94315
|
94316
|
94317
|
94318
|
94319
|
94320
|
94321
|
94323
|
94324
|
94325
|
94326
|
94327
|
94328
|
94329
|
94331
|
94332
|
94333
|
94334
|
94335
|
94336
|
94337
|
94338
|
94339
|
94340
|
94341
|
94342
|
94343
|
94344
|
94345
|
94346
|
94347
|
94348
|
94349
|
94350
|
94351
|
94352
|
94648