Changeset 844

Timestamp:

Jan 1, 2017, 10:21:42 PM (8 years ago)

Author:

chronos

Message:

• Added: Autocreate new finance year if necessary for new document line items.

Location:

trunk

Files:

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

trunk/Application/FormClasses.php

@@ -29 +29 @@
       'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
       'Shortcut' => array('Type' => 'String', 'Caption' => 'Kód', 'Default' => ''),
+      'Yearly' => array('Type' => 'Boolean', 'Caption' => 'Ročně', 'Default' => 0),
       'Sequence' => array('Type' => 'TDocumentLineSequenceListLine', 'Caption' => 'Čísleníky', 'Default' => ''),
       'Codes' => array('Type' => 'TDocumentLineCodeList', 'Caption' => 'Kódy', 'Default' => ''),

trunk/Application/UpdateTrace.php

@@ -2036 +2036 @@
 {
   $Manager->Execute('ALTER TABLE `News` CHANGE `Date` `Date` DATETIME NULL, CHANGE `TargetDate` `TargetDate` DATETIME NULL;');
+}
+
+function UpdateTo844($Manager)
+{
+  $Manager->Execute('ALTER TABLE `DocumentLine` ADD `Yearly` BOOLEAN NOT NULL DEFAULT FALSE AFTER `Shortcut`;');
 }
 
@@ -2132 +2137 @@
       824 => array('Revision' => 831, 'Function' => 'UpdateTo831'),
       831 => array('Revision' => 838, 'Function' => 'UpdateTo838'),
+      838 => array('Revision' => 844, 'Function' => 'UpdateTo844'),
     ));
   }

trunk/Application/Version.php

@@ -2 +2 @@
 
 $Revision = 844; // Subversion revision
-$DatabaseRevision = 838; // SQL structure revision
+$DatabaseRevision = 844; // SQL structure revision
 $ReleaseTime = strtotime('2017-01-01');

trunk/Modules/Finance/Finance.php

@@ -82 +82 @@
     return(round($Spotreba * 0.72 * $this->kWh));
   }
-
-  function GetNextDocumentLineNumber($Id, $FinanceYear = 0)
-  {
-    if($FinanceYear == 0)
+  
+  function CreateFinanceYear($Year)
+  {
+    $StartTime = mktime(0, 0, 0, 1, 1, $Year);
+    $EndTime = mktime(0, 0, 0, 12, 31, $Year);
+    $this->Database->insert('FinanceYear', array('Year' => $Year, 
+          'DateStart' => TimeToMysqlDate($StartTime), 'DateEnd' => TimeToMysqlDate($EndTime), 'Closed' => 0));
+        $YearId = $this->Database->insert_id;
+
+    // Create DocumentLineSequence from previous
+    $DbResult = $this->Database->select('DocumentLine', 'Id', '`Yearly` = 1');
+    while($DbRow = $DbResult->fetch_assoc())
+    {
+          $this->Database->insert('DocumentLineSequence', array('FinanceYear' => $YearId, 
+            'NextNumber' => 1, 'YearPrefix' => 1, 'DocumentLine' => $DbRow['Id']));
+        }
+  }
+  
+  function GetFinanceYear($Year)
+  {
+    if($Year == 0)
     {
       // Get latest year
       $DbResult = $this->Database->select('FinanceYear', '*', '1 ORDER BY `Year` DESC LIMIT 1');
-    } else $DbResult = $this->Database->select('FinanceYear', '*', '`Year`='.$FinanceYear);
-    if($DbResult->num_rows == 0) throw new Exception('Rok '.$FinanceYear.' nenalezen');
+    } else $DbResult = $this->Database->select('FinanceYear', '*', '`Year`='.$Year);
+    if($DbResult->num_rows == 0) {
+          if($Year == date('Y'))
+          {
+                $this->CreateFinanceYear($Year);
+        $DbResult = $this->Database->select('FinanceYear', '*', '`Year`='.$Year);           
+          } else throw new Exception('Rok '.$Year.' nenalezen');
+        }
     $FinanceYear = $DbResult->fetch_assoc();
-    if($FinanceYear['Closed'] == 1) throw new Exception('Rok '.$FinanceYear['Year'].' je již uzavřen. Nelze do něj přidávat položky.');
+    if($FinanceYear['Closed'] == 1) 
+      throw new Exception('Rok '.$FinanceYear['Year'].' je již uzavřen. Nelze do něj přidávat položky.');
+    return $FinanceYear;          
+  }
+
+  function GetNextDocumentLineNumber($Id, $FinanceYear = 0)
+  {
+        $FinanceYear = $this->GetFinanceYear($FinanceYear);
 
     $DbResult = $this->Database->query('SELECT `Shortcut`, `Id` FROM `DocumentLine` WHERE `Id`='.$Id);