Bugzilla – Attachment 94170 Details for
Bug 23805
Add a dedicated credit_types table
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23805: Update 'C' to 'CREDIT' for consistency
Bug-23805-Update-C-to-CREDIT-for-consistency.patch (text/plain), 7.00 KB, created by
Martin Renvoize (ashimema)
on 2019-10-15 11:05:42 UTC
(
hide
)
Description:
Bug 23805: Update 'C' to 'CREDIT' for consistency
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2019-10-15 11:05:42 UTC
Size:
7.00 KB
patch
obsolete
>From 9db8e657fa5b98426cd4aa11453d74e73a8140c5 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Mon, 14 Oct 2019 16:20:31 +0100 >Subject: [PATCH] Bug 23805: Update 'C' to 'CREDIT' for consistency > >--- > Koha/Account.pm | 6 +++--- > Koha/Account/Line.pm | 2 +- > api/v1/swagger/definitions/patron_account_credit.json | 2 +- > installer/data/mysql/account_credit_types.sql | 2 +- > installer/data/mysql/atomicupdate/bug_23805_credit.perl | 9 ++++++++- > .../data/mysql/en/mandatory/account_credit_types.sql | 2 +- > koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc | 2 +- > .../opac-tmpl/bootstrap/en/includes/account-table.inc | 2 +- > reports/cash_register_stats.pl | 2 +- > 9 files changed, 18 insertions(+), 11 deletions(-) > >diff --git a/Koha/Account.pm b/Koha/Account.pm >index 4d1947e7bb..f9d81050bb 100644 >--- a/Koha/Account.pm >+++ b/Koha/Account.pm >@@ -322,7 +322,7 @@ my $credit_line = Koha::Account->new({ patron_id => $patron_id })->add_credit( > ); > > $credit_type can be any of: >- - 'credit' >+ - 'CREDIT' > - 'payment' > - 'forgiven' > - 'lost_item_return' >@@ -716,7 +716,7 @@ sub reconcile_balance { > =cut > > our $offset_type = { >- 'credit' => 'Manual Credit', >+ 'CREDIT' => 'Manual Credit', > 'forgiven' => 'Writeoff', > 'lost_item_return' => 'Lost Item', > 'payment' => 'Payment', >@@ -739,7 +739,7 @@ our $offset_type = { > =cut > > our $account_type_credit = { >- 'credit' => 'C', >+ 'CREDIT' => 'CREDIT', > 'forgiven' => 'FOR', > 'lost_item_return' => 'LOST_RETURN', > 'payment' => 'Pay', >diff --git a/Koha/Account/Line.pm b/Koha/Account/Line.pm >index 6ea8935623..30467b1093 100644 >--- a/Koha/Account/Line.pm >+++ b/Koha/Account/Line.pm >@@ -338,7 +338,7 @@ sub adjust { > { > amount => $new_outstanding * -1, > description => 'Overpayment refund', >- type => 'credit', >+ type => 'CREDIT', > interface => $interface, > ( $update_type eq 'overdue_update' ? ( item_id => $self->itemnumber ) : ()), > } >diff --git a/api/v1/swagger/definitions/patron_account_credit.json b/api/v1/swagger/definitions/patron_account_credit.json >index 1bde9c37a8..a2eee7adb7 100644 >--- a/api/v1/swagger/definitions/patron_account_credit.json >+++ b/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", >diff --git a/installer/data/mysql/account_credit_types.sql b/installer/data/mysql/account_credit_types.sql >index 7828d09199..021538e5d9 100644 >--- a/installer/data/mysql/account_credit_types.sql >+++ b/installer/data/mysql/account_credit_types.sql >@@ -4,5 +4,5 @@ INSERT INTO account_debit_types ( code, description, can_be_added_manually, is_s > ('W', 'Writeoff', 0, 1), > ('WO', 'Writeoff', 0, 1), > ('FOR', 'Forgiven', 1, 1), >-('C', 'Credit', 1, 1), >+('CREDIT', 'Credit', 1, 1), > ('LOST_RETURN', 'Lost item fee refund', 0, 1); >diff --git a/installer/data/mysql/atomicupdate/bug_23805_credit.perl b/installer/data/mysql/atomicupdate/bug_23805_credit.perl >index 46b0d552b7..0ce6c07cc3 100644 >--- a/installer/data/mysql/atomicupdate/bug_23805_credit.perl >+++ b/installer/data/mysql/atomicupdate/bug_23805_credit.perl >@@ -41,7 +41,7 @@ if ( CheckVersion($DBversion) ) { > ('W', 'Writeoff', 0, 1), > ('WO', 'Writeoff', 0, 1), > ('FOR', 'Forgiven', 1, 1), >- ('C', 'Credit', 1, 1), >+ ('CREDIT', 'Credit', 1, 1), > ('LOST_RETURN', 'Lost item fee refund', 0, 1) > } > ); >@@ -75,6 +75,13 @@ if ( CheckVersion($DBversion) ) { > } > ); > >+ # Update accountype 'C' to 'CREDIT' >+ $dbh->do( >+ qq{ >+ UPDATE accountlines SET accounttype = 'CREDIT' WHERE accounttype = 'C' OR accounttype = 'CR' >+ } >+ ); >+ > # Populating credit_type_code > $dbh->do( > qq{ >diff --git a/installer/data/mysql/en/mandatory/account_credit_types.sql b/installer/data/mysql/en/mandatory/account_credit_types.sql >index 7828d09199..021538e5d9 100644 >--- a/installer/data/mysql/en/mandatory/account_credit_types.sql >+++ b/installer/data/mysql/en/mandatory/account_credit_types.sql >@@ -4,5 +4,5 @@ INSERT INTO account_debit_types ( code, description, can_be_added_manually, is_s > ('W', 'Writeoff', 0, 1), > ('WO', 'Writeoff', 0, 1), > ('FOR', 'Forgiven', 1, 1), >-('C', 'Credit', 1, 1), >+('CREDIT', 'Credit', 1, 1), > ('LOST_RETURN', 'Lost item fee refund', 0, 1); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc >index 0ae245e61c..39df30a257 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc >@@ -7,7 +7,7 @@ > [%- CASE 'FOR' -%]Forgiven > [%- CASE 'PAY' -%]Payment > [%- CASE 'WO' -%]Writeoff >- [%- CASE 'C' -%]Credit >+ [%- CASE 'CREDIT' -%]Credit > [%- CASE 'LOST_RETURN' -%]Lost item fee refund > [%- CASE -%][% account.credit_type.description | html %] > [%- END -%] >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 5d850509b1..09f21100fe 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc >@@ -178,7 +178,7 @@ > [%- CASE 'FOR' -%]Forgiven > [%- CASE 'PAY' -%]Payment > [%- CASE 'WO' -%]Writeoff >- [%- CASE 'C' -%]Credit >+ [%- CASE 'CREDIT' -%]Credit > [%- CASE 'LOST_RETURN' -%]Lost item fee refund > [%- CASE -%][% account.credit_type.description | html %] > [%- END -%] >diff --git a/reports/cash_register_stats.pl b/reports/cash_register_stats.pl >index d0889bf503..9c9ae2ef67 100755 >--- a/reports/cash_register_stats.pl >+++ b/reports/cash_register_stats.pl >@@ -72,7 +72,7 @@ if ($do_it) { > if ($transaction_type eq 'ALL') { #All Transactons > $whereTType = q{}; > } elsif ($transaction_type eq 'ACT') { #Active >- $whereTType = q{ AND credit_type_code IN ('Pay','C') }; >+ $whereTType = q{ AND credit_type_code IN ('Pay','CREDIT') }; > } elsif ($transaction_type eq 'FORW') { > $whereTType = q{ AND credit_type_code IN ('FOR','W') }; > } else { >-- >2.20.1
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 23805
:
94153
|
94154
|
94155
|
94156
|
94157
|
94158
|
94159
|
94160
|
94161
|
94162
|
94163
|
94164
|
94166
|
94167
|
94168
|
94169
|
94170
|
94171
|
94172
|
94173
|
94174
|
94175
|
94176
|
94177
|
94178
|
94801
|
94815
|
94832
|
94895