From 181fcc25424620bcf15e8e8d8fbf0dcafebe4005 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Fri, 19 Jun 2015 11:44:16 -0300 Subject: [PATCH] Bug 13993: DBRev 3.21.00.009 Signed-off-by: Tomas Cohen Arazi (cherry picked from commit a80d188c83be6131c9274a29c5dcc03893c9e617) Conflicts: Koha.pm --- Koha.pm | 2 +- ...rrect-OrderStatus-Of-Poorly-Transferred-Orders.sql | 3 --- installer/data/mysql/updatedatabase.pl | 11 +++++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/Bug-13993-Correct-OrderStatus-Of-Poorly-Transferred-Orders.sql diff --git a/Koha.pm b/Koha.pm index a665017d62..b0bd54d977 100644 --- a/Koha.pm +++ b/Koha.pm @@ -29,7 +29,7 @@ use vars qw{ $VERSION }; # - #4 : the developer version. The 4th number is the database subversion. # used by developers when the database changes. updatedatabase take care of the changes itself # and is automatically called by Auth.pm when needed. -$VERSION = "3.20.01.001"; +$VERSION = "3.21.00.009"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/Bug-13993-Correct-OrderStatus-Of-Poorly-Transferred-Orders.sql b/installer/data/mysql/atomicupdate/Bug-13993-Correct-OrderStatus-Of-Poorly-Transferred-Orders.sql deleted file mode 100644 index 0a05ae59e4..0000000000 --- a/installer/data/mysql/atomicupdate/Bug-13993-Correct-OrderStatus-Of-Poorly-Transferred-Orders.sql +++ /dev/null @@ -1,3 +0,0 @@ -UPDATE aqorders SET orderstatus='cancelled' - WHERE (datecancellationprinted IS NOT NULL OR - datecancellationprinted<>'0000-00-00'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 6a8e37c2f7..55056fb3b6 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -10550,6 +10550,17 @@ if ( CheckVersion($DBversion) ) { SetVersion ($DBversion); } +$DBversion = "3.21.00.009"; +if ( CheckVersion($DBversion) ) { + $dbh->do(q| + UPDATE aqorders SET orderstatus='cancelled' + WHERE (datecancellationprinted IS NOT NULL OR + datecancellationprinted<>'0000-00-00'); + |); + print "Upgrade to $DBversion done (Bug 13993: Correct orderstatus for transferred orders)\n"; + SetVersion($DBversion); +} + # DEVELOPER PROCESS, search for anything to execute in the db_update directory # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.39.5