Browse Source

Bug 23805: Update 'FOR' to 'FORGIVEN' for consistency

Signed-off-by: Kyle Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
remotes/origin/19.11.x
Martin Renvoize 3 years ago
parent
commit
2665dc9094
Signed by: martin.renvoize GPG Key ID: 422B469130441A0F
  1. 2
      C4/Circulation.pm
  2. 6
      Koha/Account.pm
  3. 2
      api/v1/swagger/definitions/patron_account_credit.json
  4. 2
      installer/data/mysql/account_credit_types.sql
  5. 9
      installer/data/mysql/atomicupdate/bug_23805_credit.perl
  6. 2
      koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
  7. 2
      koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
  8. 4
      reports/cash_register_stats.pl
  9. 2
      t/db_dependent/Koha/Account.t

2
C4/Circulation.pm

@ -2366,7 +2366,7 @@ sub _FixOverduesOnReturn {
user_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : undef,
library_id => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef,
interface => C4::Context->interface,
type => 'forgiven',
type => 'FORGIVEN',
item_id => $item
}
);

6
Koha/Account.pm

@ -324,7 +324,7 @@ my $credit_line = Koha::Account->new({ patron_id => $patron_id })->add_credit(
$credit_type can be any of:
- 'CREDIT'
- 'payment'
- 'forgiven'
- 'FORGIVEN'
- 'lost_item_return'
- 'writeoff'
@ -717,7 +717,7 @@ sub reconcile_balance {
our $offset_type = {
'CREDIT' => 'Manual Credit',
'forgiven' => 'Writeoff',
'FORGIVEN' => 'Writeoff',
'lost_item_return' => 'Lost Item',
'payment' => 'Payment',
'writeoff' => 'Writeoff',
@ -740,7 +740,7 @@ our $offset_type = {
our $account_type_credit = {
'CREDIT' => 'CREDIT',
'forgiven' => 'FOR',
'FORGIVEN' => 'FORGIVEN',
'lost_item_return' => 'LOST_RETURN',
'payment' => 'Pay',
'writeoff' => 'W'

2
api/v1/swagger/definitions/patron_account_credit.json

@ -3,7 +3,7 @@
"properties": {
"credit_type": {
"type": "string",
"description": "Type of credit ('CREDIT', 'forgiven', 'lost_item_return', 'payment', 'writeoff' )"
"description": "Type of credit ('CREDIT', 'FORGIVEN', 'lost_item_return', 'payment', 'writeoff' )"
},
"amount": {
"type": "number",

2
installer/data/mysql/account_credit_types.sql

@ -3,6 +3,6 @@ INSERT INTO account_debit_types ( code, description, can_be_added_manually, is_s
('PAY', 'Payment', 0, 1),
('W', 'Writeoff', 0, 1),
('WO', 'Writeoff', 0, 1),
('FOR', 'Forgiven', 1, 1),
('FORGIVEN', 'Forgiven', 1, 1),
('CREDIT', 'Credit', 1, 1),
('LOST_RETURN', 'Lost item fee refund', 0, 1);

9
installer/data/mysql/atomicupdate/bug_23805_credit.perl

@ -40,7 +40,7 @@ if ( CheckVersion($DBversion) ) {
('PAY', 'Payment', 0, 1),
('W', 'Writeoff', 0, 1),
('WO', 'Writeoff', 0, 1),
('FOR', 'Forgiven', 1, 1),
('FORGIVEN', 'Forgiven', 1, 1),
('CREDIT', 'Credit', 1, 1),
('LOST_RETURN', 'Lost item fee refund', 0, 1)
}
@ -82,6 +82,13 @@ if ( CheckVersion($DBversion) ) {
}
);
# Update accountype 'FOR' to 'FORGIVEN'
$dbh->do(
qq{
UPDATE accountlines SET accounttype = 'FORGIVEN' WHERE accounttype = 'FOR' OR accounttype = 'FORW'
}
);
# Populating credit_type_code
$dbh->do(
qq{

2
koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc

@ -4,7 +4,7 @@
[%- SWITCH account.credit_type_code -%]
[%- CASE 'Pay' -%]Payment
[%- CASE 'W' -%]Writeoff
[%- CASE 'FOR' -%]Forgiven
[%- CASE 'FORGIVEN' -%]Forgiven
[%- CASE 'PAY' -%]Payment
[%- CASE 'WO' -%]Writeoff
[%- CASE 'CREDIT' -%]Credit

2
koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc

@ -175,7 +175,7 @@
[%- SWITCH account.credit_type_code -%]
[%- CASE 'Pay' -%]Payment
[%- CASE 'W' -%]Writeoff
[%- CASE 'FOR' -%]Forgiven
[%- CASE 'FORGIVEN' -%]Forgiven
[%- CASE 'PAY' -%]Payment
[%- CASE 'WO' -%]Writeoff
[%- CASE 'CREDIT' -%]Credit

4
reports/cash_register_stats.pl

@ -74,7 +74,7 @@ if ($do_it) {
} elsif ($transaction_type eq 'ACT') { #Active
$whereTType = q{ AND credit_type_code IN ('Pay','CREDIT') };
} elsif ($transaction_type eq 'FORW') {
$whereTType = q{ AND credit_type_code IN ('FOR','W') };
$whereTType = q{ AND credit_type_code IN ('FORGIVEN','W') };
} else {
if ( any { $transaction_type eq $_->code } @debit_types ) {
$whereTType = q{ AND debit_type_code = ? };
@ -128,7 +128,7 @@ if ($do_it) {
if($row->{credit_type_code} =~ /^C$|^CR$/){
$grantotal -= abs($row->{amount});
$row->{amount} = '-' . $row->{amount};
}elsif($row->{credit_type_code} eq 'FORW' || $row->{credit_type_code} eq 'W'){
}elsif($row->{credit_type_code} eq 'FORGIVEN' || $row->{credit_type_code} eq 'W'){
}else{
$grantotal += abs($row->{amount});
}

2
t/db_dependent/Koha/Account.t

@ -276,7 +276,7 @@ subtest 'add_credit() tests' => sub {
description => 'Manual credit applied',
library_id => $patron->branchcode,
user_id => $patron->id,
type => 'forgiven',
type => 'FORGIVEN',
interface => 'commandline'
}
);

Loading…
Cancel
Save