Changeset 558

Timestamp:

Jul 21, 2013, 10:55:49 PM (11 years ago)

Author:

chronos

Message:

• Opraveno: Chyba při zobrazení zařízení zákazníků pokud není žádný přihlášený.
• Přidáno: Generování příjmových a výdajových dokladů.

Location:

trunk

Files:

• Common/Version.php (modified) (1 diff)
• Modules/Finance/Bill.php (modified) (6 diffs)
• Modules/Finance/Finance.php (modified) (1 diff)
• Modules/Finance/Manage.php (modified) (1 diff)
• Modules/Network/HostList.php (modified) (1 diff)
• Modules/Network/UserHosts.php (modified) (1 diff)

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 556; // Subversion revision
+$Revision = 558; // Subversion revision
 $DatabaseRevision = 551; // SQL structure revision
-$ReleaseTime = '2013-07-15';
+$ReleaseTime = '2013-07-21';
 

trunk/Modules/Finance/Bill.php

@@ -32 +32 @@
   function GenerateHTML()
   {
-    global $SpecificSymbol, $Config;
-    
     $DbResult = $this->Database->select('FinanceInvoice', '*', '`Id`='.$this->InvoiceId);
     $Invoice = $DbResult->fetch_assoc();
@@ -40 +38 @@
     $Subject = $DbResult->fetch_assoc();
     
-    $DbResult = $this->Database->select('Subject', '*', '`Id`='.$Config['Finance']['MainSubjectId']);
+    $DbResult = $this->Database->select('Subject', '*', '`Id`='.$this->System->Config['Finance']['MainSubjectId']);
     $MainSubject = $DbResult->fetch_assoc();
     
     $DbResult = $this->Database->query('SELECT FinanceBankAccount.*, CONCAT(FinanceBankAccount.Number, "/", FinanceBank.Code) AS NumberFull FROM FinanceBankAccount '.
       'JOIN FinanceBank ON FinanceBank.Id=FinanceBankAccount.Bank '.
-      'WHERE (FinanceBankAccount.`Subject`='.$Config['Finance']['MainSubjectId'].') AND (FinanceBankAccount.`Use`=1)');
+      'WHERE (FinanceBankAccount.`Subject`='.$this->System->Config['Finance']['MainSubjectId'].') AND (FinanceBankAccount.`Use`=1)');
     $MainSubjectAccount = $DbResult->fetch_assoc();
     
@@ -132 +130 @@
     $Subject = $DbResult->fetch_assoc();
     
-    $DbResult = $this->Database->select('Subject', '*', '`Id`='.$Config['Finance']['MainSubjectId']);
+    $DbResult = $this->Database->select('Subject', '*', '`Id`='.$this->System->Config['Finance']['MainSubjectId']);
     $MainSubject = $DbResult->fetch_assoc();
     
     $DbResult = $this->Database->query('SELECT FinanceBankAccount.*, CONCAT(FinanceBankAccount.Number, "/", FinanceBank.Code) AS NumberFull FROM FinanceBankAccount '.
       'JOIN FinanceBank ON FinanceBank.Id=FinanceBankAccount.Bank '.
-      'WHERE (FinanceBankAccount.`Subject`='.$Config['Finance']['MainSubjectId'].') AND (FinanceBankAccount.`Use`=1)');
+      'WHERE (FinanceBankAccount.`Subject`='.$this->System->Config['Finance']['MainSubjectId'].') AND (FinanceBankAccount.`Use`=1)');
     $MainSubjectAccount = $DbResult->fetch_assoc();
     
@@ -146 +144 @@
     //  $InvoiceItems[$Item['Id']] = $Item;
     //}
+    $BooleanText = array('Ne', 'Ano');
+    if($Operation['Value'] < 0)
+    $Desc = array(
+      'Type' => 'VÝDAJOVÝ', 
+      'Signature' => 'Vydal', 
+      'Sign' => -1,
+      'Target' => 'Vydáno komu',
+    );
+    else $Desc = array(
+      'Type' => 'PŘÍJMOVÝ', 
+      'Signature' => 'Přijal', 
+      'Sign' => 1,
+      'Target' => 'Přijato od',
+    );
 
     $Output = '<table width="100%" border="1" cellspacing="0" cellpadding="3"><tr><td width="50%">'.
@@ -157 +169 @@
       'Plátce DPH: '.$BooleanText[$MainSubject['PayVAT']].
       '</td><td width="50%" valign="top">'.
-      '<font size="5"><strong>PŘÍJMOVÝ POKLADNÍ DOKLAD</strong></font><br><br>'.
-      'Číslo dokladu: '.$Bill['BillCode'].'<br>'.
-      'Datum vystavení: '.HumanDate($Bill['TimeCreate']).'<br>'.
+      '<font size="5"><strong>'.$Desc['Type'].' POKLADNÍ DOKLAD</strong></font><br><br>'.
+      'Číslo dokladu: '.$Operation['BillCode'].'<br>'.
+      'Datum vystavení: '.HumanDate($Operation['Time']).'<br>'.
       '</td></tr>'.
-      '<tr><td colspan="2"><strong>Přijato od:</strong><br>'.
+      '<tr><td colspan="2"><strong>'.$Desc['Target'].':</strong><br>'.
       $Subject['Name'].'<br>'.
       $Subject['AddressStreet'].'<br>'.
@@ -174 +186 @@
     //  $Total += ($Polozka['Quantity'] * $Polozka['Price']);
     //}
+    $Description = $Operation['Text'];
+    $Total = $Operation['Value'] * $Desc['Sign'];
     $Output .= '</td></tr>'.
       '<tr><td colspan="2"><strong>Částka:</strong> '.$Total.' Kč<br><br>'.
       '</td></tr>'.
       '<tr><td colspan="2"><strong>Účel platby:</strong><br>'.$Description.'</td></tr>'.
-      '<tr><td><br><br>Podpis příjemce:</td><td><br><br>Podpis pokladníka:</td></tr>';
+      '<tr><td>&nbsp;</td><td><br><br>'.$Desc['Signature'].':</td></tr>';
     $Output .= '</table>';
     return($Output);

trunk/Modules/Finance/Finance.php

@@ -363 +363 @@
         'Taxable' => array('Type' => 'Boolean', 'Caption' => 'Zdanitelné', 'Default' => ''),
         'Value' => array('Type' => 'Integer', 'Caption' => 'Částka', 'Default' => '0', 'Suffix' => 'Kč'),
+        'File' => array('Type' => 'TFile', 'Caption' => 'Doklad', 'Default' => '', 'Null' => true),
         'Text' => array('Type' => 'String', 'Caption' => 'Popis', 'Default' => ''),
         'Network' => array('Type' => 'Boolean', 'Caption' => 'Týkající sítě', 'Default' => ''),

trunk/Modules/Finance/Manage.php

@@ -393 +393 @@
 
     // FinanceOperations
+    $DbResult = $this->Database->query('SELECT * FROM `FinanceOperation` WHERE (`BillCode` <> "") '.
+        'AND (`Value` != 0) AND (`File` IS NULL) AND (`Generate` = 1)');
+    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;
+      $FileName = 'doklad2-'.$FileId.'.pdf';
+      $Bill = new BillOperation($this->System);
+      $Bill->Database = &$this->System->Database;
+      $Bill->System = &$this->System;
+      $Bill->OperationId = $Row['Id'];
+      $FullFileName = $this->System->Modules['File']->GetDir($this->System->Modules['Finance']->DirectoryId).$FileName;
+      $Bill->SaveToFile($FullFileName);
+      if(file_exists($FullFileName))
+      {
+        $this->Database->update('File', 'Id='.$FileId, array('Name' => $FileName, 'Size' => filesize($FullFileName)));
+        $this->Database->update('FinanceOperation', 'Id='.$Row['Id'], array('File' => $FileId));
+        $Output .= '.';
+      } else $Output .= 'Soubor "'.$FullFileName.'" se nepodařilo uložit.';
+    }    
     return($Output);
   }

trunk/Modules/Network/HostList.php

@@ -15 +15 @@
     $Output = '<div align="center" style="font-size: small;"><table class="WideTable">';
     $Output .= '<tr><th>Jméno počítače</th><th>IP adresa</th><th>Typ</th><th>Naposledy online</th><th>Správce</th></tr>';
-    $DbResult = $this->Database->query('SELECT NetworkDevice.*, User.Name as UserName, NetworkDeviceType.Name AS HostType FROM NetworkDevice LEFT JOIN Member ON Member.Id = NetworkDevice.Member LEFT JOIN User ON Member.ResponsibleUser = User.Id LEFT JOIN NetworkDeviceType ON NetworkDeviceType.Id = NetworkDevice.Type WHERE NetworkDevice.Used = 1 '.$Where.'ORDER BY NetworkDevice.Name');
+    $DbResult = $this->Database->query('SELECT NetworkDevice.*, User.Name as UserName, NetworkDeviceType.Name AS HostType FROM NetworkDevice '.
+      'LEFT JOIN Member ON Member.Id = NetworkDevice.Member '.
+      'LEFT JOIN User ON Member.ResponsibleUser = User.Id '.
+      'LEFT JOIN NetworkDeviceType ON NetworkDeviceType.Id = NetworkDevice.Type WHERE NetworkDevice.Used = 1 '.$Where.'ORDER BY NetworkDevice.Name');
     while($Device = $DbResult->fetch_assoc())
     {

trunk/Modules/Network/UserHosts.php

@@ -15 +15 @@
     global $Config;
     
+    if($this->System->User->User['Id'] == '') return($this->SystemMessage('Nepovolený přístup', 'Nemáte oprávnění pro tuto operaci'));
     $Output = '<div align="center" style="font-size: small;"><table class="WideTable">';
     $Output .= '<tr><th>Jméno počítače</th><th>Místní adresa</th><th>Veřejná adresa</th><th>Fyzická adresa</th><th>Typ</th><th>Naposledy online</th></tr>';
-    $DbResult = $this->Database->query('SELECT NetworkDevice.*, NetworkDeviceType.Name AS HostType FROM NetworkDevice LEFT JOIN NetworkDeviceType ON NetworkDeviceType.Id = NetworkDevice.Type WHERE NetworkDevice.Used = 1 AND NetworkDevice.Member = (SELECT Customer FROM UserCustomerRel WHERE User='.$this->System->User->User['Id'].') ORDER BY NetworkDevice.Name');
+    $DbResult = $this->Database->query('SELECT NetworkDevice.*, NetworkDeviceType.Name AS HostType FROM NetworkDevice '.
+      'LEFT JOIN NetworkDeviceType ON NetworkDeviceType.Id = NetworkDevice.Type '.
+      'WHERE NetworkDevice.Used = 1 AND NetworkDevice.Member = (SELECT Customer FROM UserCustomerRel WHERE User='.$this->System->User->User['Id'].') ORDER BY NetworkDevice.Name');
     while($Device = $DbResult->fetch_assoc())
     {
       if($Device['Online'] == 1) $Style = 'color: blue;'; else $Style = '';
-      $Output .= '<tr><td colspan="4" style="text-align: left; font-weight: bold; '.$Style.'">'.$Device['Name'].'</td><td>'.$Device['HostType'].'</td><td style="text-align: right;">'.HumanDate($Device['LastOnline']).'</td></tr>';
+      $Output .= '<tr><td colspan="4" style="text-align: left; font-weight: bold; '.
+        $Style.'">'.$Device['Name'].'</td><td>'.$Device['HostType'].'</td><td style="text-align: right;">'.HumanDate($Device['LastOnline']).'</td></tr>';
       $DbResult2 = $this->Database->query('SELECT * FROM NetworkInterface WHERE Device = '.$Device['Id']);
       while($Interface = $DbResult2->fetch_assoc())