Changeset 792

Timestamp:

Feb 3, 2016, 12:25:27 AM (9 years ago)

Author:

chronos

Message:

• Fixed: Also Contract table now use BillCode as reference to DocumentLineCode table.
• Fixed: Previous SQL update was not used.

Location:

trunk

Files:

• Application/UpdateTrace.php (modified) (3 diffs)
• Application/Version.php (modified) (1 diff)
• Modules/Finance/Finance.php (modified) (1 diff)

trunk/Application/UpdateTrace.php

@@ -1484 +1484 @@
   }
   $Manager->Execute('ALTER TABLE `FinanceInvoice` DROP `BillCodeText`;');
-
-        //$Manager->Execute('RENAME TABLE `FinanceOperationGroup` TO `FinanceOperationTemplate`');
-        //$Manager->Execute('RENAME TABLE `FinanceInvoiceGroup` TO `FinanceInvoiceTemplate`');
 }
 
@@ -1804 +1801 @@
   $Manager->Execute('ALTER TABLE `Member` ADD `ChangeReplaceId` INT(11) NULL DEFAULT NULL;');
   $Manager->Execute('ALTER TABLE `Member` ADD FOREIGN KEY (`ChangeReplaceId`) REFERENCES `Member`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
+}
+
+function UpdateTo792($Manager)
+{
+  // Transform contracts
+  $Manager->Execute('ALTER TABLE `Contract` CHANGE `BillCode` `BillCodeText` VARCHAR(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL');
+  $Manager->Execute('ALTER TABLE `Contract` ADD `BillCode` INT NULL AFTER `BillCodeText`, ADD INDEX (`BillCode`)');
+  $Manager->Execute('ALTER TABLE `Contract` ADD FOREIGN KEY (`BillCode`) REFERENCES `DocumentLineCode`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
+  $DbResult = $Manager->Execute('SELECT `Contract`.`Id`, `Contract`.`BillCodeText`, `Contract`.`DocumentLine` '.
+    'FROM `Contract` '.
+    'WHERE `Contract`.`BillCodeText`!=""');
+  while($DbRow = $DbResult->fetch_assoc())
+  {
+    if($DbRow['DocumentLine'] == '') $DbRow['DocumentLine'] = 'NULL';
+    $Manager->Execute('INSERT INTO `DocumentLineCode` (`Id` ,`DocumentLine` ,`Name`) '.
+      'VALUES (NULL , '.$DbRow['DocumentLine'].', "'.$DbRow['BillCodeText'].'");');
+    $CodeId = $Manager->Database->insert_id;
+    $Manager->Execute('UPDATE `Contract` SET `BillCode`='.$CodeId.' WHERE `Id`='.$DbRow['Id']);
+  }
+  //$Manager->Execute('ALTER TABLE `Contract` DROP `BillCodeText`;');
 }
 
@@ -1887 +1904 @@
       768 => array('Revision' => 770, 'Function' => 'UpdateTo770'),
       770 => array('Revision' => 785, 'Function' => 'UpdateTo785'),
-      775 => array('Revision' => 786, 'Function' => 'UpdateTo786'),
+      785 => array('Revision' => 786, 'Function' => 'UpdateTo786'),
+      786 => array('Revision' => 792, 'Function' => 'UpdateTo792'),
     ));
   }

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 790; // Subversion revision
-$DatabaseRevision = 785; // SQL structure revision
-$ReleaseTime = strtotime('2016-01-22');
+$Revision = 792; // Subversion revision
+$DatabaseRevision = 792; // SQL structure revision
+$ReleaseTime = strtotime('2016-02-02');

trunk/Modules/Finance/Finance.php

@@ -534 +534 @@
       'Items' => array(
         'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => ''),
-        'BillCode' => array('Type' => 'String', 'Caption' => 'Kód', 'Default' => ''),
+        'BillCode' => array('Type' => 'TDocumentLineCode', 'Caption' => 'Kód', 'Default' => ''),
         'Subject' => array('Type' => 'TSubject', 'Caption' => 'Subjekt', 'Default' => ''),
         'ValidFrom' => array('Type' => 'Date', 'Caption' => 'Platnost od', 'Default' => ''),