Changeset 558 for trunk/Modules/Finance/Bill.php

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ů.

File:

• trunk/Modules/Finance/Bill.php (modified) (6 diffs)

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);