Changeset 725

Timestamp:

Jan 4, 2015, 11:30:15 PM (10 years ago)

Author:

chronos

Message:

• Modified: Old invoice items with validity period contained in Text was changed to move period to PeriodFrom and PeriodTo columns.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Setup/Update.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/Finance/Finance.php (modified) (2 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 724; // Subversion revision
-$DatabaseRevision = 722; // SQL structure revision
-$ReleaseTime = strtotime('2015-01-03');
+$Revision = 725; // Subversion revision
+$DatabaseRevision = 725; // SQL structure revision
+$ReleaseTime = strtotime('2015-01-04');

trunk/Common/Setup/Update.php

@@ -52 +52 @@
       $RevUpdate($this);
             $DbRevision = $TraceItem['Revision'];
-            $this->Database->query('UPDATE `'.$this->VersionTable.'` SET `Revision`= '.$TraceItem['Revision'].' WHERE `Id`=1');
+            $this->Database->query('UPDATE `'.$this->VersionTable.'` SET `Revision`= '.
+                $TraceItem['Revision'].' WHERE `Id`=1');
           }
           return($Output);       

trunk/Common/Setup/Updates.php

@@ -1127 +1127 @@
 {
         $Manager->Execute('ALTER TABLE `Service` DROP `CustomerCount`;');
+}
+
+function UpdateTo725($Manager)
+{
+        // Text column of invoices is not used. Text from invoice items is taken instead.
+        $DbResult = $Manager->Execute('ALTER TABLE `FinanceInvoice` DROP `Text`;');
+        
+        $SearchText = 'Připojení k síti'; 
+        $DbResult = $Manager->Execute('SELECT * FROM `FinanceInvoiceItem` WHERE `Description` LIKE "'.$SearchText.' za období%";');
+        while($DbRow = $DbResult->fetch_assoc())
+        {
+                $Text = trim(substr($DbRow['Description'], strlen($SearchText.' za období') + 1));
+                $Text = explode('-', $Text);            
+                $PeriodFrom = explode('.', trim($Text[0]));
+                $PeriodFrom = $PeriodFrom[2].'-'.$PeriodFrom[1].'-'.$PeriodFrom[0];
+                $PeriodTo = explode('.', trim($Text[1]));
+                $PeriodTo = $PeriodTo[2].'-'.$PeriodTo[1].'-'.$PeriodTo[0];
+                $Manager->Execute('UPDATE `FinanceInvoice` SET `PeriodFrom`="'.$PeriodFrom.'", `PeriodTo`="'.$PeriodTo.'" WHERE `Id`='.$DbRow['FinanceInvoice']);
+        }
+        $DbResult = $Manager->Execute('UPDATE `FinanceInvoiceItem` SET `Description` = "'.$SearchText.'" WHERE `Description` LIKE "'.$SearchText.' za období%";');
+        
+        $SearchText = 'Připojení k Internetu'; 
+        $DbResult = $Manager->Execute('SELECT * FROM `FinanceInvoiceItem` WHERE `Description` LIKE "'.$SearchText.' za období%";');
+        while($DbRow = $DbResult->fetch_assoc())
+        {
+                $Text = trim(substr($DbRow['Description'], strlen($SearchText.' za období') + 1));
+                $Text = explode('-', $Text);            
+                $PeriodFrom = explode('.', trim($Text[0]));
+                $PeriodFrom = $PeriodFrom[2].'-'.$PeriodFrom[1].'-'.$PeriodFrom[0];
+                $Text[1] = trim($Text[1]);
+                if(strpos($Text[1], ' ') !== false) $Text[1] = substr($Text[1], 0, strpos($Text[1], ' '));
+                $PeriodTo = explode('.', trim($Text[1]));
+                $PeriodTo = $PeriodTo[2].'-'.$PeriodTo[1].'-'.$PeriodTo[0];
+                $Manager->Execute('UPDATE `FinanceInvoice` SET `PeriodFrom`="'.$PeriodFrom.'", `PeriodTo`="'.$PeriodTo.'" WHERE `Id`='.$DbRow['FinanceInvoice']);
+        }
+        $DbResult = $Manager->Execute('UPDATE `FinanceInvoiceItem` SET `Description` = "'.$SearchText.'" WHERE `Description` LIKE "'.$SearchText.' za období%";');
 }
 
@@ -1188 +1224 @@
         719 => array('Revision' => 720, 'Function' => 'UpdateTo720'),
         720 => array('Revision' => 722, 'Function' => 'UpdateTo722'),
+        722 => array('Revision' => 725, 'Function' => 'UpdateTo725'),
     ));
   }

trunk/Modules/Finance/Finance.php

@@ -95 +95 @@
 
     $DbResult = $this->Database->query('SELECT * FROM `DocumentLineSequence` WHERE '.
-        '`DocumentLine`='.$Id.' AND `FinanceYear`='.$FinanceYear['Id']);
+      '`DocumentLine`='.$Id.' AND `FinanceYear`='.$FinanceYear['Id']);
     $Sequence = $DbResult->fetch_assoc();
 
@@ -104 +104 @@
 
     $this->Database->query('UPDATE `DocumentLineSequence` SET `NextNumber` = `NextNumber` + 1 '.
-        'WHERE (`DocumentLine`='.$Id.') AND (`FinanceYear`='.$FinanceYear['Id'].')');
+      'WHERE (`DocumentLine`='.$Id.') AND (`FinanceYear`='.$FinanceYear['Id'].')');
     return($Result);
   }