Bug 21683: (follow-up) Polish the change - based on feedback

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index e01ddd9..7ab1db7 100644 (file)
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -2385,7 +2385,7 @@ sub _FixAccountForLostAndReturned {
             accounttype => { -in => [ 'L', 'Rep', 'W' ] },
         },
         {
-            order_by => { -desc => [ 'date' ] }
+            order_by => { -desc => [ 'date', 'accountlines_id' ] }
         }
     );
 

diff --git a/misc/maintenance/fix_accountlines_rmdupfines_bug8253.pl b/misc/maintenance/fix_accountlines_rmdupfines_bug8253.pl
index b637547..96ec288 100755 (executable)
--- a/misc/maintenance/fix_accountlines_rmdupfines_bug8253.pl
+++ b/misc/maintenance/fix_accountlines_rmdupfines_bug8253.pl
@@ -98,13 +98,13 @@ foreach my $keeper (@$results) {
         }
 
         my $sql =
-            "DELETE FROM accountlines WHERE accountlines_id = ? LIMIT 1";
+            "DELETE FROM accountlines WHERE accountlines_id = ?";
         $dbh->do( $sql, undef, $f->{'accountlines_id'} );
     }
 
     if ($has_changed) {
         my $sql =
-            "UPDATE accountlines SET amountoutstanding = ? WHERE accountlines_id = ? LIMIT 1";
+            "UPDATE accountlines SET amountoutstanding = ? WHERE accountlines_id = ?";
         $dbh->do(
             $sql,                           undef,
             $keeper->{'amountoutstanding'}, $keeper->{'accountlines_id'}

diff --git a/t/db_dependent/Stats.t b/t/db_dependent/Stats.t
index 7e2e6f7..2c6cdbc 100644 (file)
--- a/t/db_dependent/Stats.t
+++ b/t/db_dependent/Stats.t
@@ -4,7 +4,7 @@ use Modern::Perl;
 use C4::Stats;
 use Koha::Database;
 
-use Test::More tests => 18;
+use Test::More tests => 19;
 
 BEGIN {
     use_ok('C4::Stats');
@@ -119,6 +119,7 @@ is ($params->{other},          $line->{other},          "UpdateStats save other
 is ($params->{itemtype},       $line->{itemtype},       "UpdateStats save itemtype param in itemtype field of statistics table");
 is ($params->{location},       $line->{location},       "UpdateStats save location param in location field of statistics table");
 is ($params->{ccode},          $line->{ccode},          "UpdateStats save ccode param in ccode field of statistics table");
+is (undef,                     $line->{proccode},       "UpdateStats save no proccode param in proccode field of statistics table");
 
 $dbh->do(q|DELETE FROM statistics|);
 $params = {