Changeset 509 for trunk/finance

Timestamp:

Apr 1, 2013, 11:37:49 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Generování bankovního účtu do dokladů a emailů.

Location:

trunk/finance

Files:

• bills.php (modified) (3 diffs)
• manage.php (modified) (1 diff)
• tarify.php (modified) (1 diff)

trunk/finance/bills.php

@@ -43 +43 @@
     $MainSubject = $DbResult->fetch_assoc();
     
-    $DbResult = $this->Database->query('SELECT FinanceBankAccount.*, FinanceBank.Code AS NumberFull FROM FinanceBankAccount '.
+    $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)');
@@ -135 +135 @@
     $MainSubject = $DbResult->fetch_assoc();
     
-    $DbResult = $this->Database->query('SELECT FinanceBankAccount.*, FinanceBank.Code AS NumberFull FROM FinanceBankAccount '.
+    $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)');
@@ -154 +154 @@
       'IČ: '.$MainSubject['IC'].'<br>'.
       'DIČ: '.$MainSubject['DIC'].'<br>'.
-      'Účet: '.$MainSubjectAccount['Number'].'<br>'.
+      'Účet: '.$MainSubjectAccount['NumberFull'].'<br>'.
       'Plátce DPH: '.$BooleanText[$MainSubject['PayVAT']].
       '</td><td width="50%" valign="top">'.

trunk/finance/manage.php

@@ -560 +560 @@
     $MainSubject = $DbResult->fetch_assoc();  
     
-    $DbResult = $this->Database->query('SELECT FinanceBankAccount.*, FinanceBank.Code AS NumberFull FROM FinanceBankAccount '.
+    $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)');

trunk/finance/tarify.php

@@ -18 +18 @@
     $Output .= '<br />';
 
-    $Output .= '<table width="50%" class="WideTable" style="font-size: small;">';
+    $Output .= '<table width="70%" class="WideTable" style="font-size: small;">';
     $Output .= '<tr><th>Název tarifu</th><th>Min. rychlost [kbit/s]</th><th>Max. rychlost [kbit/s]</th><th>Agregační poměr</th><th>Počet podílníků</th><th>Cena [Kč]</th><th>Součet ceny [Kč]</th></tr>';
     $TotalPrice = 0;