From 7e66d32be4d0d6e3a1afffb4ab788cc4466bc4d2 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Fri, 5 Mar 2021 12:53:34 +0000
Subject: [PATCH] Bug 12224: DBRev 20.12.00.022

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 Koha.pm                                       |  2 +-
 .../bug_12224-add_CHECKINSLIP_notice.perl     | 23 ------------------
 installer/data/mysql/updatedatabase.pl        | 24 +++++++++++++++++++
 3 files changed, 25 insertions(+), 24 deletions(-)
 delete mode 100644 installer/data/mysql/atomicupdate/bug_12224-add_CHECKINSLIP_notice.perl

diff --git a/Koha.pm b/Koha.pm
index 01f1db319c..78b1f74262 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 = "20.12.00.021";
+$VERSION = "20.12.00.022";
 
 sub version {
     return $VERSION;
diff --git a/installer/data/mysql/atomicupdate/bug_12224-add_CHECKINSLIP_notice.perl b/installer/data/mysql/atomicupdate/bug_12224-add_CHECKINSLIP_notice.perl
deleted file mode 100644
index d48dde9d53..0000000000
--- a/installer/data/mysql/atomicupdate/bug_12224-add_CHECKINSLIP_notice.perl
+++ /dev/null
@@ -1,23 +0,0 @@
-$DBversion = 'XXX';
-if( CheckVersion( $DBversion ) ) {
-    $dbh->do(q{ INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, content, message_transport_type) VALUES
-        ('circulation','CHECKINSLIP','','Checkin slip',1,'Checkin slip',
-"<h3>[% branch.branchname %]</h3>
-Checked in items for [% borrower.title %] [% borrower.firstname %] [% borrower.initials %] [% borrower.surname %] <br />
-([% borrower.cardnumber %]) <br />
-
-[% today | $KohaDates %]<br />
-
-<h4>Checked in today</h4>
-[% FOREACH checkin IN old_checkouts %]
-[% SET item = checkin.item %]
-<p>
-[% item.biblio.title %] <br />
-Barcode: [% item.barcode %] <br />
-</p>
-[% END %]",
-        'print')
-    });
-
-    NewVersion( $DBversion, 12224, "Add CHECKINSLIP notice" );
-}
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 5f4e6e1e13..4d1eee90fe 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -23634,6 +23634,30 @@ if( CheckVersion( $DBversion ) ) {
     NewVersion( $DBversion, 22824, "Update syspref values for YesNo");
 }
 
+$DBversion = '20.12.00.022';
+if( CheckVersion( $DBversion ) ) {
+    $dbh->do(q{ INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, content, message_transport_type) VALUES
+        ('circulation','CHECKINSLIP','','Checkin slip',1,'Checkin slip',
+"<h3>[% branch.branchname %]</h3>
+Checked in items for [% borrower.title %] [% borrower.firstname %] [% borrower.initials %] [% borrower.surname %] <br />
+([% borrower.cardnumber %]) <br />
+
+[% today | $KohaDates %]<br />
+
+<h4>Checked in today</h4>
+[% FOREACH checkin IN old_checkouts %]
+[% SET item = checkin.item %]
+<p>
+[% item.biblio.title %] <br />
+Barcode: [% item.barcode %] <br />
+</p>
+[% END %]",
+        'print')
+    });
+
+    NewVersion( $DBversion, 12224, "Add CHECKINSLIP notice" );
+}
+
 # SEE bug 13068
 # if there is anything in the atomicupdate, read and execute it.
 my $update_dir = C4::Context->config('intranetdir') . '/installer/data/mysql/atomicupdate/';
-- 
2.20.1