Attachment #94316 for bug #23049

View | Details | Raw Unified | Return to bug 23049
Collapse All | Expand All

Lines 108-114 sub chargelostitem { Link Here

(-)a/C4/Accounts.pm (-1 / +1 lines)
108	user_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : undef,	108	user_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : undef,
109	interface => C4::Context->interface,	109	interface => C4::Context->interface,
110	library_id => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef,	110	library_id => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef,
111	type => 'processing',	111	type => 'PROCESSING',
112	item_id => $itemnumber,	112	item_id => $itemnumber,
113	issue_id => $issue_id,	113	issue_id => $issue_id,
114	}	114	}




  - sundry
  - new_card
  - overdue
  - PROCESSING
  - RENT
  - RENT_DAILY
  - RENT_RENEW

    'account'          => 'Account Fee',
    'account_renew'    => 'Account Fee',
    'RESERVE'          => 'Reserve Fee',
    'PROCESSING'       => 'Processing Fee',
    'lost_item'        => 'Lost Item',
    'RENT'             => 'Rental Fee',
    'RENT_DAILY'       => 'Rental Fee',

    'sundry'           => 'M',
    'new_card'         => 'N',
    'overdue'          => 'OVERDUE',
    'PROCESSING'       => 'PROCESSING',
    'RENT'             => 'RENT',
    'RENT_DAILY'       => 'RENT_DAILY',
    'RENT_RENEW'       => 'RENT_RENEW',

Lines 6-12 INSERT INTO account_debit_types ( code, description, can_be_added_manually, defa Link Here

(-)a/installer/data/mysql/account_debit_types.sql (-1 / +1 lines)
6	('M', 'Manual fee', 1, NULL, 0),	6	('M', 'Manual fee', 1, NULL, 0),
7	('N', 'New card fee', 1, NULL, 1),	7	('N', 'New card fee', 1, NULL, 1),
8	('OVERDUE', 'Overdue fine', 0, NULL, 1),	8	('OVERDUE', 'Overdue fine', 0, NULL, 1),
9	('PF', 'Lost item processing fee', 0, NULL, 1),	9	('PROCESSING', 'Lost item processing fee', 0, NULL, 1),
10	('RENT', 'Rental fee', 0, NULL, 1),	10	('RENT', 'Rental fee', 0, NULL, 1),
11	('RENT_DAILY', 'Daily rental fee', 0, NULL, 1),	11	('RENT_DAILY', 'Daily rental fee', 0, NULL, 1),
12	('RENT_RENEW', 'Renewal of rental item', 0, NULL, 1),	12	('RENT_RENEW', 'Renewal of rental item', 0, NULL, 1),

Lines 45-51 if ( CheckVersion($DBversion) ) { Link Here

(-)a/installer/data/mysql/atomicupdate/bug_23049_debit.perl (-1 / +8 lines)
45	('M', 'Manual fee', 1, NULL, 0),	45	('M', 'Manual fee', 1, NULL, 0),
46	('N', 'New card fee', 1, NULL, 1),	46	('N', 'New card fee', 1, NULL, 1),
47	('OVERDUE', 'Overdue fine', 0, NULL, 1),	47	('OVERDUE', 'Overdue fine', 0, NULL, 1),
48	('PF', 'Lost item processing fee', 0, NULL, 1),	48	('PROCESSING', 'Lost item processing fee', 0, NULL, 1),
49	('RENT', 'Rental fee', 0, NULL, 1),	49	('RENT', 'Rental fee', 0, NULL, 1),
50	('RENT_DAILY', 'Daily rental fee', 0, NULL, 1),	50	('RENT_DAILY', 'Daily rental fee', 0, NULL, 1),
51	('RENT_RENEW', 'Renewal of rental item', 0, NULL, 1),	51	('RENT_RENEW', 'Renewal of rental item', 0, NULL, 1),
Lines 61-66 if ( CheckVersion($DBversion) ) { Link Here
61	}	61	}
62	);	62	);
63		63
		64	# Update accountype 'PF' to 'PROCESSING'
		65	$dbh->do(
		66	qq{
		67	UPDATE accountlines SET accounttype = 'PROCESSING' WHERE accounttype = 'PF'
		68	}
		69	);
		70
64	# Moving MANUAL_INV to account_debit_types	71	# Moving MANUAL_INV to account_debit_types
65	$dbh->do(	72	$dbh->do(
66	qq{	73	qq{

Lines 6-12 INSERT INTO account_debit_types ( code, description, can_be_added_manually, defa Link Here

(-)a/installer/data/mysql/en/mandatory/account_debit_types.sql (-1 / +1 lines)
6	('M', 'Manual fee', 1, NULL, 0),	6	('M', 'Manual fee', 1, NULL, 0),
7	('N', 'New card fee', 1, NULL, 1),	7	('N', 'New card fee', 1, NULL, 1),
8	('OVERDUE', 'Overdue fine', 0, NULL, 1),	8	('OVERDUE', 'Overdue fine', 0, NULL, 1),
9	('PF', 'Lost item processing fee', 0, NULL, 1),	9	('PROCESSING', 'Lost item processing fee', 0, NULL, 1),
10	('RENT', 'Rental fee', 0, NULL, 1),	10	('RENT', 'Rental fee', 0, NULL, 1),
11	('RENT_DAILY', 'Daily rental fee', 0, NULL, 1),	11	('RENT_DAILY', 'Daily rental fee', 0, NULL, 1),
12	('RENT_RENEW', 'Renewal of rental item', 0, NULL, 1),	12	('RENT_RENEW', 'Renewal of rental item', 0, NULL, 1),

Lines 20-26 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc (-1 / +1 lines)
20	[%- CASE 'M' -%]Sundry	20	[%- CASE 'M' -%]Sundry
21	[%- CASE 'N' -%]New card	21	[%- CASE 'N' -%]New card
22	[%- CASE 'OVERDUE' -%]Fine	22	[%- CASE 'OVERDUE' -%]Fine
23	[%- CASE 'PF' -%]Lost item processing fee	23	[%- CASE 'PROCESSING' -%]Lost item processing fee
24	[%- CASE 'RENT' -%]Rental fee	24	[%- CASE 'RENT' -%]Rental fee
25	[%- CASE 'RENT_DAILY' -%]Daily rental fee	25	[%- CASE 'RENT_DAILY' -%]Daily rental fee
26	[%- CASE 'RENT_RENEW' -%]Renewal of rental item	26	[%- CASE 'RENT_RENEW' -%]Renewal of rental item

Lines 191-197 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc (-1 / +1 lines)
191	[%- CASE 'M' -%]Sundry	191	[%- CASE 'M' -%]Sundry
192	[%- CASE 'N' -%]New card	192	[%- CASE 'N' -%]New card
193	[%- CASE 'OVERDUE' -%]Fine	193	[%- CASE 'OVERDUE' -%]Fine
194	[%- CASE 'PF' -%]Lost item processing fee	194	[%- CASE 'PROCESSING' -%]Lost item processing fee
195	[%- CASE 'RENT' -%]Rental fee	195	[%- CASE 'RENT' -%]Rental fee
196	[%- CASE 'RENT_DAILY' -%]Daily rental fee	196	[%- CASE 'RENT_DAILY' -%]Daily rental fee
197	[%- CASE 'RENT_RENEW' -%]Renewal of rental item	197	[%- CASE 'RENT_RENEW' -%]Renewal of rental item





        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 => '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 => '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 => '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 => '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 => '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 => '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" );


        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 => '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 => '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" );


        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 => '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 => '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 => '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 => '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 => '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 => '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 => '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" );

        $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 => '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 => '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 => '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();

        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 => '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");

        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 => 'PROCESSING' });
        is( $schema->resultset('ActionLog')->count(), $action_logs + 0, 'No logs were added' );
        $lostfine->delete();
        $procfee->delete();

        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 => 'PROCESSING' });
        is( $schema->resultset('ActionLog')->count(), $action_logs + 2, 'Logs were added' );
        $lostfine->delete();
        $procfee->delete();




        LostItem( $item->itemnumber, 1 );

        my $processing_fee_lines = Koha::Account::Lines->search(
            { 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 PROCESSING amount is generated' );
        is( $processing_fee_line->amountoutstanding + 0,
            $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' } );

        LostItem( $item->itemnumber, 1 );

        my $processing_fee_lines = Koha::Account::Lines->search(
            { 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 PROCESSING amount is generated' );
        is( $processing_fee_line->amountoutstanding + 0,
            $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' } );

        LostItem( $item->itemnumber, 1 );

        my $processing_fee_lines = Koha::Account::Lines->search(
            { 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 PROCESSING amount is generated' );
        is( $processing_fee_line->amountoutstanding + 0,
            $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' } );

        LostItem( $item->itemnumber, 1 );

        my $processing_fee_lines = Koha::Account::Lines->search(
            { 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 PROCESSING amount is generated' );
        is( $processing_fee_line->amountoutstanding + 0,
            $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' } );

            $replacement_amount, 'The right LOST amountountstanding is generated' );

        my $account = $patron->account;
        is( $account->balance, $processfee_amount + $replacement_amount, 'Balance is PROCESSING + L' );

        # Partially pay fee
        my $payment_amount = 27;

        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 PROCESSING - payment (LOST_RETURN)' );

        $lost_fee_line->discard_changes;
        is( $lost_fee_line->amountoutstanding + 0, 0, 'Lost fee has no outstanding amount' );


        is( $account->balance,
            $processfee_amount - $payment_amount,
            'The patron balance is the difference between the PROCESSING and the credit'
        );
    };


        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 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' );
- 

Return to bug 23049

Lines 451-457 $debit_type can be any of: Link Here

(-)a/Koha/Account.pm (-3 / +3 lines)
451	- sundry	451	- sundry
452	- new_card	452	- new_card
453	- overdue	453	- overdue
454	- processing	454	- PROCESSING
455	- RENT	455	- RENT
456	- RENT_DAILY	456	- RENT_DAILY
457	- RENT_RENEW	457	- RENT_RENEW
Lines 712-718 our $offset_type = { Link Here
712	'account' => 'Account Fee',	712	'account' => 'Account Fee',
713	'account_renew' => 'Account Fee',	713	'account_renew' => 'Account Fee',
714	'RESERVE' => 'Reserve Fee',	714	'RESERVE' => 'Reserve Fee',
715	'processing' => 'Processing Fee',	715	'PROCESSING' => 'Processing Fee',
716	'lost_item' => 'Lost Item',	716	'lost_item' => 'Lost Item',
717	'RENT' => 'Rental Fee',	717	'RENT' => 'Rental Fee',
718	'RENT_DAILY' => 'Rental Fee',	718	'RENT_DAILY' => 'Rental Fee',
Lines 747-753 our $account_type_debit = { Link Here
747	'sundry' => 'M',	747	'sundry' => 'M',
748	'new_card' => 'N',	748	'new_card' => 'N',
749	'overdue' => 'OVERDUE',	749	'overdue' => 'OVERDUE',
750	'processing' => 'PF',	750	'PROCESSING' => 'PROCESSING',
751	'RENT' => 'RENT',	751	'RENT' => 'RENT',
752	'RENT_DAILY' => 'RENT_DAILY',	752	'RENT_DAILY' => 'RENT_DAILY',
753	'RENT_RENEW' => 'RENT_RENEW',	753	'RENT_RENEW' => 'RENT_RENEW',

Lines 2124-2136 subtest '_FixAccountForLostAndReturned' => sub { Link Here

(-)a/t/db_dependent/Circulation.t (-17 / +16 lines)
2124	LostItem( $item->itemnumber, 1 );	2124	LostItem( $item->itemnumber, 1 );
2125		2125
2126	my $processing_fee_lines = Koha::Account::Lines->search(	2126	my $processing_fee_lines = Koha::Account::Lines->search(
2127	{ borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'PF' } );	2127	{ borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'PROCESSING' } );
2128	is( $processing_fee_lines->count, 1, 'Only one processing fee produced' );	2128	is( $processing_fee_lines->count, 1, 'Only one processing fee produced' );
2129	my $processing_fee_line = $processing_fee_lines->next;	2129	my $processing_fee_line = $processing_fee_lines->next;
2130	is( $processing_fee_line->amount + 0,	2130	is( $processing_fee_line->amount + 0,
2131	$processfee_amount, 'The right PF amount is generated' );	2131	$processfee_amount, 'The right PROCESSING amount is generated' );
2132	is( $processing_fee_line->amountoutstanding + 0,	2132	is( $processing_fee_line->amountoutstanding + 0,
2133	$processfee_amount, 'The right PF amountoutstanding is generated' );	2133	$processfee_amount, 'The right PROCESSING amountoutstanding is generated' );
2134		2134
2135	my $lost_fee_lines = Koha::Account::Lines->search(	2135	my $lost_fee_lines = Koha::Account::Lines->search(
2136	{ borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'LOST' } );	2136	{ borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'LOST' } );
Lines 2188-2200 subtest '_FixAccountForLostAndReturned' => sub { Link Here
2188	LostItem( $item->itemnumber, 1 );	2188	LostItem( $item->itemnumber, 1 );
2189		2189
2190	my $processing_fee_lines = Koha::Account::Lines->search(	2190	my $processing_fee_lines = Koha::Account::Lines->search(
2191	{ borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'PF' } );	2191	{ borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'PROCESSING' } );
2192	is( $processing_fee_lines->count, 1, 'Only one processing fee produced' );	2192	is( $processing_fee_lines->count, 1, 'Only one processing fee produced' );
2193	my $processing_fee_line = $processing_fee_lines->next;	2193	my $processing_fee_line = $processing_fee_lines->next;
2194	is( $processing_fee_line->amount + 0,	2194	is( $processing_fee_line->amount + 0,
2195	$processfee_amount, 'The right PF amount is generated' );	2195	$processfee_amount, 'The right PROCESSING amount is generated' );
2196	is( $processing_fee_line->amountoutstanding + 0,	2196	is( $processing_fee_line->amountoutstanding + 0,
2197	$processfee_amount, 'The right PF amountoutstanding is generated' );	2197	$processfee_amount, 'The right PROCESSING amountoutstanding is generated' );
2198		2198
2199	my $lost_fee_lines = Koha::Account::Lines->search(	2199	my $lost_fee_lines = Koha::Account::Lines->search(
2200	{ borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'LOST' } );	2200	{ borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'LOST' } );
Lines 2258-2270 subtest '_FixAccountForLostAndReturned' => sub { Link Here
2258	LostItem( $item->itemnumber, 1 );	2258	LostItem( $item->itemnumber, 1 );
2259		2259
2260	my $processing_fee_lines = Koha::Account::Lines->search(	2260	my $processing_fee_lines = Koha::Account::Lines->search(
2261	{ borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'PF' } );	2261	{ borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'PROCESSING' } );
2262	is( $processing_fee_lines->count, 1, 'Only one processing fee produced' );	2262	is( $processing_fee_lines->count, 1, 'Only one processing fee produced' );
2263	my $processing_fee_line = $processing_fee_lines->next;	2263	my $processing_fee_line = $processing_fee_lines->next;
2264	is( $processing_fee_line->amount + 0,	2264	is( $processing_fee_line->amount + 0,
2265	$processfee_amount, 'The right PF amount is generated' );	2265	$processfee_amount, 'The right PROCESSING amount is generated' );
2266	is( $processing_fee_line->amountoutstanding + 0,	2266	is( $processing_fee_line->amountoutstanding + 0,
2267	$processfee_amount, 'The right PF amountoutstanding is generated' );	2267	$processfee_amount, 'The right PROCESSING amountoutstanding is generated' );
2268		2268
2269	my $lost_fee_lines = Koha::Account::Lines->search(	2269	my $lost_fee_lines = Koha::Account::Lines->search(
2270	{ borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'LOST' } );	2270	{ borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'LOST' } );
Lines 2311-2323 subtest '_FixAccountForLostAndReturned' => sub { Link Here
2311	LostItem( $item->itemnumber, 1 );	2311	LostItem( $item->itemnumber, 1 );
2312		2312
2313	my $processing_fee_lines = Koha::Account::Lines->search(	2313	my $processing_fee_lines = Koha::Account::Lines->search(
2314	{ borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'PF' } );	2314	{ borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'PROCESSING' } );
2315	is( $processing_fee_lines->count, 1, 'Only one processing fee produced' );	2315	is( $processing_fee_lines->count, 1, 'Only one processing fee produced' );
2316	my $processing_fee_line = $processing_fee_lines->next;	2316	my $processing_fee_line = $processing_fee_lines->next;
2317	is( $processing_fee_line->amount + 0,	2317	is( $processing_fee_line->amount + 0,
2318	$processfee_amount, 'The right PF amount is generated' );	2318	$processfee_amount, 'The right PROCESSING amount is generated' );
2319	is( $processing_fee_line->amountoutstanding + 0,	2319	is( $processing_fee_line->amountoutstanding + 0,
2320	$processfee_amount, 'The right PF amountoutstanding is generated' );	2320	$processfee_amount, 'The right PROCESSING amountoutstanding is generated' );
2321		2321
2322	my $lost_fee_lines = Koha::Account::Lines->search(	2322	my $lost_fee_lines = Koha::Account::Lines->search(
2323	{ borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'LOST' } );	2323	{ borrowernumber => $patron->id, itemnumber => $item->itemnumber, debit_type_code => 'LOST' } );
Lines 2328-2334 subtest '_FixAccountForLostAndReturned' => sub { Link Here
2328	$replacement_amount, 'The right LOST amountountstanding is generated' );	2328	$replacement_amount, 'The right LOST amountountstanding is generated' );
2329		2329
2330	my $account = $patron->account;	2330	my $account = $patron->account;
2331	is( $account->balance, $processfee_amount + $replacement_amount, 'Balance is PF + L' );	2331	is( $account->balance, $processfee_amount + $replacement_amount, 'Balance is PROCESSING + L' );
2332		2332
2333	# Partially pay fee	2333	# Partially pay fee
2334	my $payment_amount = 27;	2334	my $payment_amount = 27;
Lines 2363-2369 subtest '_FixAccountForLostAndReturned' => sub { Link Here
2363	my $credit_return_id = C4::Circulation::_FixAccountForLostAndReturned( $item->itemnumber, $patron->id );	2363	my $credit_return_id = C4::Circulation::_FixAccountForLostAndReturned( $item->itemnumber, $patron->id );
2364	my $credit_return = Koha::Account::Lines->find($credit_return_id);	2364	my $credit_return = Koha::Account::Lines->find($credit_return_id);
2365		2365
2366	is( $account->balance, $processfee_amount - $payment_amount, 'Balance is PF - payment (LOST_RETURN)' );	2366	is( $account->balance, $processfee_amount - $payment_amount, 'Balance is PROCESSING - payment (LOST_RETURN)' );
2367		2367
2368	$lost_fee_line->discard_changes;	2368	$lost_fee_line->discard_changes;
2369	is( $lost_fee_line->amountoutstanding + 0, 0, 'Lost fee has no outstanding amount' );	2369	is( $lost_fee_line->amountoutstanding + 0, 0, 'Lost fee has no outstanding amount' );
Lines 2383-2389 subtest '_FixAccountForLostAndReturned' => sub { Link Here
2383		2383
2384	is( $account->balance,	2384	is( $account->balance,
2385	$processfee_amount - $payment_amount,	2385	$processfee_amount - $payment_amount,
2386	'The patron balance is the difference between the PF and the credit'	2386	'The patron balance is the difference between the PROCESSING and the credit'
2387	);	2387	);
2388	};	2388	};
2389		2389
Lines 2459-2465 subtest '_FixAccountForLostAndReturned' => sub { Link Here
2459	my $credit_return_id = C4::Circulation::_FixAccountForLostAndReturned( $item_id, $patron->id );	2459	my $credit_return_id = C4::Circulation::_FixAccountForLostAndReturned( $item_id, $patron->id );
2460	my $credit_return = Koha::Account::Lines->find($credit_return_id);	2460	my $credit_return = Koha::Account::Lines->find($credit_return_id);
2461		2461
2462	is( $account->balance, $manual_debit_amount - $payment_amount, 'Balance is PF - payment (LOST_RETURN)' );	2462	is( $account->balance, $manual_debit_amount - $payment_amount, 'Balance is PROCESSING - payment (LOST_RETURN)' );
2463		2463
2464	my $manual_debit = Koha::Account::Lines->search({ borrowernumber => $patron->id, debit_type_code => 'OVERDUE', status => 'UNRETURNED' })->next;	2464	my $manual_debit = Koha::Account::Lines->search({ borrowernumber => $patron->id, debit_type_code => 'OVERDUE', status => 'UNRETURNED' })->next;
2465	is( $manual_debit->amountoutstanding + 0, $manual_debit_amount - $payment_amount, 'reconcile_balance was called' );	2465	is( $manual_debit->amountoutstanding + 0, $manual_debit_amount - $payment_amount, 'reconcile_balance was called' );
2466	-