X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=installer%2Fdata%2Fmysql%2Fupdatedatabase.pl;h=68e7cbcf4f90c662493a9a463c010c1363561811;hb=17800939e8a3e6f34549ade0e5e068728e5cb907;hp=421032898682523fe637a7bc7d059772b8c163c8;hpb=de4eeac2af2a65f0013850e6051830a739d45783;p=koha_fer

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 4210328986..68e7cbcf4f 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -2874,6 +2874,8 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
 
 $DBversion = '3.01.00.077';
 if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+
+    $dbh->do("SET FOREIGN_KEY_CHECKS=0 ");
     $dbh->do("DROP TABLE IF EXISTS `aqbudgetperiods` ");
     $dbh->do(qq|
                     CREATE TABLE `aqbudgetperiods` (
@@ -2890,7 +2892,7 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
 
    $dbh->do(<<ADDPERIODS);
 INSERT INTO aqbudgetperiods (budget_period_startdate,budget_period_enddate,budget_period_active,budget_period_description,budget_period_locked)
-SELECT DISTINCT startdate, enddate, 1, concat(startdate," ",enddate),1 from aqbudget
+SELECT DISTINCT startdate, enddate, NOW() BETWEEN startdate and enddate, concat(startdate," ",enddate),NOT NOW() BETWEEN startdate AND enddate from aqbudget
 ADDPERIODS
 # SORRY , NO AQBUDGET/AQBOOKFUND -> AQBUDGETS IMPORT JUST YET,
 # BUT A NEW CLEAN AQBUDGETS TABLE CREATE FOR NOW..
@@ -2906,18 +2908,19 @@ ADDPERIODS
   #$dbh->do("drop table aqbudget;");
 
 
-    $dbh->do(<<BUDGETNAME);
-ALTER TABLE aqbudget RENAME `aqbudgets`
-BUDGETNAME
-    my $maxbudgetid=$dbh->selectcol_arrayref(<<IDsBUDGET);
-SELECT MAX(aqbudgetid) from aqbudgets
+    my $maxbudgetid = $dbh->selectcol_arrayref(<<IDsBUDGET);
+SELECT MAX(aqbudgetid) from aqbudget
 IDsBUDGET
 
 $$maxbudgetid[0] = 0 if !$$maxbudgetid[0];
 
     $dbh->do(<<BUDGETAUTOINCREMENT);
-ALTER TABLE `aqbudgets` AUTO_INCREMENT=$$maxbudgetid[0]
+ALTER TABLE aqbudget AUTO_INCREMENT=$$maxbudgetid[0]
 BUDGETAUTOINCREMENT
+    
+    $dbh->do(<<BUDGETNAME);
+ALTER TABLE aqbudget RENAME `aqbudgets`
+BUDGETNAME
 
     $dbh->do(<<BUDGETS);
 ALTER TABLE `aqbudgets`
@@ -2996,9 +2999,8 @@ BUDGETDROPDATES
                 # cannot do until aqorderbreakdown removed
 #    $dbh->do("DROP TABLE aqbookfund ");
 
-
-
 #    $dbh->do("ALTER TABLE aqorders  ADD FOREIGN KEY (`budget_id`) REFERENCES `aqbudgets` (`budget_id`) ON UPDATE CASCADE  " ); ????
+    $dbh->do("SET FOREIGN_KEY_CHECKS=1 ");
 
     print "Upgrade to $DBversion done (Adding new aqbudgetperiods, aqbudgets and aqbudget_planning tables  )\n";
     SetVersion ($DBversion);
@@ -3677,7 +3679,7 @@ if (C4::Context->preference('Version') < TransformToNum($DBversion)){
     SetVersion ($DBversion);
 }
 
-$DBversion = 'XXXX';
+$DBversion = '3.01.00.143';
 if (C4::Context->preference('Version') < TransformToNum($DBversion)){
     $dbh->do(qq{CREATE INDEX auth_value_idx ON authorised_values (authorised_value)});
     $dbh->do(qq{CREATE INDEX auth_val_cat_idx ON borrower_attribute_types (authorised_value_category)});