Attachment 88282 Details for Bug 22563 – Bug 22563: Clean up remaing LR cases

[patch] Bug 22563: Clean up remaing LR cases

Bug-22563-Clean-up-remaing-LR-cases.patch (text/plain), 3.92 KB, created by Martin Renvoize (ashimema) on 2019-04-18 09:29:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2019-04-18 09:29:55 UTC

Size: 3.92 KB

patch

obsolete

>From 7c15ad7cee48334e30a37d2c5b9d18f26e6c35b2 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Thu, 28 Mar 2019 08:29:41 +0000
>Subject: [PATCH] Bug 22563: Clean up remaing LR cases
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> .../data/mysql/atomicupdate/bug_22563.perl | 34 +++++++++++++++++++
> .../en/modules/reports/cash_register_stats.tt | 2 +-
> reports/cash_register_stats.pl | 4 +--
> 3 files changed, 37 insertions(+), 3 deletions(-)
> create mode 100644 installer/data/mysql/atomicupdate/bug_22563.perl
>
>diff --git a/installer/data/mysql/atomicupdate/bug_22563.perl b/installer/data/mysql/atomicupdate/bug_22563.perl
>new file mode 100644
>index 0000000000..fd085b56a3
>--- /dev/null
>+++ b/installer/data/mysql/atomicupdate/bug_22563.perl
>@@ -0,0 +1,34 @@
>+$DBversion = 'XXX'; # will be replaced by the RM
>+if ( CheckVersion($DBversion) ) {
>+
>+ my $sth = $dbh->prepare( "SELECT accountlines_id, issue_id, borrowernumber, itemnumber, amount, manager_id FROM accountlines WHERE accounttype = 'LR' AND amount < 0" );
>+ $sth->execute();
>+ while ( my $row = $sth->fetchrow_hashref ) {
>+ $dbh->do(
>+"INSERT INTO accountlines (accounttype, issue_id, borrowernumber, itemnumber, amount, manager_id) VALUES ( ?, ?, ?, ?, ?, ? );",
>+ {},
>+ (
>+ 'CR', $row->{issue_id},
>+ $row->{borrowernumber}, $row->{itemnumber},
>+ $row->{amount}, $row->{manager_id}
>+ )
>+ );
>+ my $credit_id = $dbh->last_insert_id();
>+ my $amount = $row->{amount} * -1;
>+ $dbh->do("INSERT INTO account_offsets (credit_id, debit_id, type, amount) VALUES (?,?,?,?);",{},($credit_id, $row->{accountlines_id}, 'Lost Item', $amount));
>+ $dbh->do("UPDATE accountlines SET amount = '$amount' WHERE accountlines_id = '$row->{accountlines_id}';");
>+ }
>+
>+ $dbh->do(qq{
>+ UPDATE
>+ accountlines
>+ SET
>+ accounttype = 'LOST',
>+ status = 'RETURNED'
>+ WHERE
>+ accounttype = 'LR';
>+ });
>+
>+ SetVersion($DBversion);
>+ print "Upgrade to $DBversion done (Bug 22518 - Fix accounttypes for 'L' and 'LR')\n";
>+}
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
>index 1aca2fb209..88f6a8dc73 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
>@@ -211,7 +211,7 @@
> Account management fee
> [% ELSIF loopresul.accounttype == "M" %]
> Sundry
>- [% ELSIF loopresul.accounttype == "L" || loopresul.accounttype == "LR" %]
>+ [% ELSIF loopresul.accounttype == "LOST" %]
> Lost item
> [% ELSIF loopresul.accounttype == "N" %]
> New card
>diff --git a/reports/cash_register_stats.pl b/reports/cash_register_stats.pl
>index b030f6684e..33922b803f 100755
>--- a/reports/cash_register_stats.pl
>+++ b/reports/cash_register_stats.pl
>@@ -118,11 +118,11 @@ if ($do_it) {
> $row->{date} = dt_from_string($row->{date}, 'sql');
> 
> push (@loopresult, $row);
>- if($transaction_type eq 'ACT' && ($row->{accounttype} !~ /^C$|^CR$|^LR$|^Pay$/)){
>+ if($transaction_type eq 'ACT' && ($row->{accounttype} !~ /^C$|^CR$|^Pay$/)){
> pop @loopresult;
> next;
> }
>- if($row->{accounttype} =~ /^C$|^CR$|^LR$/){
>+ if($row->{accounttype} =~ /^C$|^CR$/){
> $grantotal -= abs($row->{amount});
> $row->{amount} = '-' . $row->{amount};
> }elsif($row->{accounttype} eq 'FORW' || $row->{accounttype} eq 'W'){
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 22563: 86913 | 86914 | 87092 | 87093 | 87094 | 87637 | 87638 | 87639 | 87640 | 87641 | 87642 | 87801 | 87802 | 87803 | 87804 | 87805 | 87806 | 88279 | 88280 | 88281 | 88282 | 88283 | 88284 | 88285 | 88323 | 88324 | 88325 | 88326 | 88327 | 88328 | 88720 | 88721 | 88722 | 88723 | 88724 | 88725 | 89462 | 89463 | 89464 | 89465 | 89466 | 89467 | 90221 | 90222 | 90223 | 90224 | 90225 | 90226 | 90227 | 90307 | 90308 | 90309 | 90310 | 90311 | 90312 | 90330 | 90331 | 90332 | 90333 | 90334 | 90335 | 90632 | 90637 | 90667 | 91338 | 91339 | 91340 | 91341 | 91342 | 91343 | 91344 | 91345 | 91346 | 91347 | 91348