From 3ef397125f92dde918a0745f44f047ccf6a98d84 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Fri, 10 May 2019 17:41:41 +0000
Subject: [PATCH] Bug 5770: DBRev 18.12.00.073

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 Koha.pm                                       |  2 +-
 .../data/mysql/atomicupdate/bug_5770.perl     | 41 -------------------
 installer/data/mysql/updatedatabase.pl        | 41 +++++++++++++++++++
 3 files changed, 42 insertions(+), 42 deletions(-)
 delete mode 100644 installer/data/mysql/atomicupdate/bug_5770.perl

diff --git a/Koha.pm b/Koha.pm
index b31160885d..5a6387ab6c 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 = "18.12.00.072";
+$VERSION = "18.12.00.073";
 
 sub version {
     return $VERSION;
diff --git a/installer/data/mysql/atomicupdate/bug_5770.perl b/installer/data/mysql/atomicupdate/bug_5770.perl
deleted file mode 100644
index 627415ac55..0000000000
--- a/installer/data/mysql/atomicupdate/bug_5770.perl
+++ /dev/null
@@ -1,41 +0,0 @@
-$DBversion = '18.12.00.XXX'; # will be replaced by the RM
-if( CheckVersion( $DBversion ) ) {
-    $dbh->do( q{
-            INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES
-            ('EmailPurchaseSuggestions','0','0|EmailAddressForSuggestions|BranchEmailAddress|KohaAdminEmailAddress','Choose email address that will be sent new purchase suggestions','Choice'),
-            ('EmailAddressForSuggestions','','','If you choose EmailAddressForSuggestions you should enter a valid email address','free')
-    });
-
-    $dbh->do( q{
-            INSERT IGNORE INTO `letter` (module, code, name, title, content, is_html, message_transport_type) VALUES
-            ('suggestions','NEW_SUGGESTION','New suggestion','New suggestion','<h3>Suggestion pending approval</h3>
-                <p><h4>Suggested by</h4>
-                    <ul>
-                        <li><<borrowers.firstname>> <<borrowers.surname>></li>
-                        <li><<borrowers.cardnumber>></li>
-                        <li><<borrowers.phone>></li>
-                        <li><<borrowers.email>></li>
-                    </ul>
-                </p>
-                <p><h4>Title suggested</h4>
-                    <ul>
-                        <li><b>Library:</b> <<branches.branchname>></li>
-                        <li><b>Title:</b> <<suggestions.title>></li>
-                        <li><b>Author:</b> <<suggestions.author>></li>
-                        <li><b>Copyright date:</b> <<suggestions.copyrightdate>></li>
-                        <li><b>Standard number (ISBN, ISSN or other):</b> <<suggestions.isbn>></li>
-                        <li><b>Publisher:</b> <<suggestions.publishercode>></li>
-                        <li><b>Collection title:</b> <<suggestions.collectiontitle>></li>
-                        <li><b>Publication place:</b> <<suggestions.place>></li>
-                        <li><b>Quantity:</b> <<suggestions.quantity>></li>
-                        <li><b>Item type:</b> <<suggestions.itemtype>></li>
-                        <li><b>Reason for suggestion:</b> <<suggestions.patronreason>></li>
-                        <li><b>Notes:</b> <<suggestions.note>></li>
-                    </ul>
-                </p>',1, 'email')
-    });
-
-    # Always end with this (adjust the bug info)
-    SetVersion( $DBversion );
-    print "Upgrade to $DBversion done (Bug 5770 - Email librarian when purchase suggestion made)\n";
-}
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index eff21d7316..162988afd2 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -18580,6 +18580,47 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,
     print "Upgrade to $DBversion done (Bug 22809 - Move 'INVOICE' from template to a slip)\n";
 }
 
+$DBversion = '18.12.00.073';
+if( CheckVersion( $DBversion ) ) {
+    $dbh->do( q{
+            INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES
+            ('EmailPurchaseSuggestions','0','0|EmailAddressForSuggestions|BranchEmailAddress|KohaAdminEmailAddress','Choose email address that will be sent new purchase suggestions','Choice'),
+            ('EmailAddressForSuggestions','','','If you choose EmailAddressForSuggestions you should enter a valid email address','free')
+    });
+
+    $dbh->do( q{
+            INSERT IGNORE INTO `letter` (module, code, name, title, content, is_html, message_transport_type) VALUES
+            ('suggestions','NEW_SUGGESTION','New suggestion','New suggestion','<h3>Suggestion pending approval</h3>
+                <p><h4>Suggested by</h4>
+                    <ul>
+                        <li><<borrowers.firstname>> <<borrowers.surname>></li>
+                        <li><<borrowers.cardnumber>></li>
+                        <li><<borrowers.phone>></li>
+                        <li><<borrowers.email>></li>
+                    </ul>
+                </p>
+                <p><h4>Title suggested</h4>
+                    <ul>
+                        <li><b>Library:</b> <<branches.branchname>></li>
+                        <li><b>Title:</b> <<suggestions.title>></li>
+                        <li><b>Author:</b> <<suggestions.author>></li>
+                        <li><b>Copyright date:</b> <<suggestions.copyrightdate>></li>
+                        <li><b>Standard number (ISBN, ISSN or other):</b> <<suggestions.isbn>></li>
+                        <li><b>Publisher:</b> <<suggestions.publishercode>></li>
+                        <li><b>Collection title:</b> <<suggestions.collectiontitle>></li>
+                        <li><b>Publication place:</b> <<suggestions.place>></li>
+                        <li><b>Quantity:</b> <<suggestions.quantity>></li>
+                        <li><b>Item type:</b> <<suggestions.itemtype>></li>
+                        <li><b>Reason for suggestion:</b> <<suggestions.patronreason>></li>
+                        <li><b>Notes:</b> <<suggestions.note>></li>
+                    </ul>
+                </p>',1, 'email')
+    });
+
+    SetVersion( $DBversion );
+    print "Upgrade to $DBversion done (Bug 5770 - Email librarian when purchase suggestion made)\n";
+}
+
 # SEE bug 13068
 # if there is anything in the atomicupdate, read and execute it.
 
-- 
2.20.1