Changeset 866

Timestamp:

Dec 23, 2019, 1:08:17 AM (5 years ago)

Author:

chronos

Message:

• Added: Allow to manually regenerate PDF files for invoices and finance operations.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/Finance/Finance.php (modified) (5 diffs)
• Modules/Finance/Manage.php (modified) (4 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 865; // Subversion revision
+$Revision = 866; // Subversion revision
 $DatabaseRevision = 862; // SQL structure revision
 $ReleaseTime = strtotime('2019-12-23');

trunk/Modules/Finance/Finance.php

@@ -82 +82 @@
     return(round($Spotreba * 0.72 * $this->kWh));
   }
-  
+
   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, 
+    $this->Database->insert('FinanceYear', array('Year' => $Year,
           'DateStart' => TimeToMysqlDate($StartTime), 'DateEnd' => TimeToMysqlDate($EndTime), 'Closed' => 0));
         $YearId = $this->Database->insert_id;
@@ -95 +95 @@
     while($DbRow = $DbResult->fetch_assoc())
     {
-          $this->Database->insert('DocumentLineSequence', array('FinanceYear' => $YearId, 
+          $this->Database->insert('DocumentLineSequence', array('FinanceYear' => $YearId,
             'NextNumber' => 1, 'YearPrefix' => 1, 'DocumentLine' => $DbRow['Id']));
         }
   }
-  
+
   function GetFinanceYear($Year)
   {
@@ -111 +111 @@
           {
                 $this->CreateFinanceYear($Year);
-        $DbResult = $this->Database->select('FinanceYear', '*', '`Year`='.$Year);           
+        $DbResult = $this->Database->select('FinanceYear', '*', '`Year`='.$Year);
           } else throw new Exception('Rok '.$Year.' nenalezen');
         }
     $FinanceYear = $DbResult->fetch_assoc();
-    if($FinanceYear['Closed'] == 1) 
+    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;          
+    return $FinanceYear;
   }
 
@@ -273 +273 @@
       'AfterInsert' => array($this, 'AfterInsertFinanceOperation'),
       'BeforeModify' => array($this, 'BeforeModifyFinanceOperation'),
+      'ItemActions' => array(
+        array('Caption' => 'Přegenerovat doklad', 'URL' => '/finance/sprava/?Operation=RegenerateOperation&i=#RowId'),
+      ),
     ));
 
@@ -377 +380 @@
       'AfterInsert' => array($this, 'AfterInsertFinanceInvoice'),
       'BeforeModify' => array($this, 'BeforeModifyFinanceInvoice'),
+      'ItemActions' => array(
+        array('Caption' => 'Přegenerovat doklad', 'URL' => '/finance/sprava/?Operation=RegenerateInvoice&i=#RowId'),
+      ),
     ));
     $this->System->FormManager->RegisterClass('FinanceInvoiceIn', $this->System->FormManager->Classes['FinanceInvoice']);

trunk/Modules/Finance/Manage.php

@@ -28 +28 @@
       case 'GenerateBills':
         $Output = $this->GenerateBills();
+        break;
+      case 'RegenerateInvoice':
+        $Output = $this->GenerateInvoice('AND (Id='.$_GET['i'].')');
+        break;
+      case 'RegenerateOperation':
+        $Output = $this->GenerateOperation('AND (Id='.$_GET['i'].')');
         break;
       default:
@@ -406 +412 @@
   }
 
-  function GenerateBills()
-  {
-    $Output = '';
-
-    // FinanceInvoice
+  function GenerateInvoice($Where)
+  {
+    $Output = '';
     $DbResult = $this->Database->query('SELECT * FROM `FinanceInvoice` WHERE (`BillCode` <> "") '.
-      'AND (`Value` != 0) AND (`File` IS NULL) AND (`Generate` = 1)');
+      'AND (`Value` != 0) AND (`Generate` = 1)'.$Where);
     while($Row = $DbResult->fetch_assoc())
     {
-      $DbResult2 = $this->Database->insert('File', array('Name' => '', 'Size' => 0,
-        'Directory' => $this->System->Modules['Finance']->DirectoryId, 'Time' => 'NOW()'));
-      $FileId = $this->Database->insert_id;
+      if ($Row['File'] == null)
+      {
+        $DbResult2 = $this->Database->insert('File', array('Name' => '', 'Size' => 0,
+          'Directory' => $this->System->Modules['Finance']->DirectoryId, 'Time' => 'NOW()'));
+        $FileId = $this->Database->insert_id;
+      } else $FileId = $Row['File'];
       $FileName = 'doklad-'.$FileId.'.pdf';
       $Bill = new BillInvoice($this->System);
@@ -425 +432 @@
       $FullFileName = $this->System->Modules['File']->GetDir($this->System->Modules['Finance']->DirectoryId).$FileName;
       $Bill->SaveToFile($FullFileName);
-      if(file_exists($FullFileName))
+      if (file_exists($FullFileName))
       {
         $this->Database->update('File', 'Id='.$FileId, array('Name' => $FileName, 'Size' => filesize($FullFileName)));
         $this->Database->update('FinanceInvoice', 'Id='.$Row['Id'], array('File' => $FileId));
-        $Output .= '.';
+        $Output .= 'Faktura '.$Row['Id'].' vygenerována do souboru '.$FileName.'<br/>'."\n";
       } else $Output .= 'Soubor "'.$FullFileName.'" se nepodařilo uložit.';
     }
-
-    // FinanceOperations
+    return $Output;
+  }
+
+  function GenerateOperation($Where)
+  {
+    $Output = '';
     $DbResult = $this->Database->query('SELECT * FROM `FinanceOperation` WHERE (`BillCode` <> "") '.
-        'AND (`Value` != 0) AND (`File` IS NULL) AND (`Generate` = 1)');
+        'AND (`Value` != 0) AND (`Generate` = 1)'.$Where);
     while($Row = $DbResult->fetch_assoc())
     {
-      $DbResult2 = $this->Database->insert('File', array('Name' => '', 'Size' => 0,
+      if ($Row['File'] == null)
+      {
+        $DbResult2 = $this->Database->insert('File', array('Name' => '', 'Size' => 0,
           'Directory' => $this->System->Modules['Finance']->DirectoryId, 'Time' => 'NOW()'));
-      $FileId = $this->Database->insert_id;
+        $FileId = $this->Database->insert_id;
+      } else $FileId = $Row['File'];
       $FileName = 'doklad2-'.$FileId.'.pdf';
       $Bill = new BillOperation($this->System);
@@ -452 +466 @@
         $this->Database->update('File', 'Id='.$FileId, array('Name' => $FileName, 'Size' => filesize($FullFileName)));
         $this->Database->update('FinanceOperation', 'Id='.$Row['Id'], array('File' => $FileId));
-        $Output .= '.';
+        $Output .= 'Doklad pro platbu '.$Row['Id'].' vygenerován do souboru '.$FileName.'<br/>'."\n";
       } else $Output .= 'Soubor "'.$FullFileName.'" se nepodařilo uložit.';
     }
+    return $Output;
+  }
+
+  function GenerateBills()
+  {
+    $Output = '';
+    // Generate PDF files for new invoices and operations
+    $Output .= $this->GenerateInvoice(' AND (`File` IS NULL)');
+    $Output .= $this->GenerateOperation(' AND (`File` IS NULL)');
     return($Output);
   }