Changeset 500 for trunk/finance

Timestamp:

Mar 10, 2013, 10:08:23 AM (12 years ago)

Author:

chronos

Message:

• Upraveno: Bankovní účty se nyní odkazují do seznamu existujících bank. Z nich se pak přiřazuje kód banky.
• Upraveno: Pro import plateb z banky bude nově použit samostatný modul FinanceBankAPI.
• Upraveno: Zkušební podpora formulářového typu soubor (File).
• Upraveno: Kód PrefixMultiplier přesunut do samostatného souboru.

Location:

trunk/finance

Files:

• bills.php (modified) (3 diffs)
• manage.php (modified) (2 diffs)

trunk/finance/bills.php

@@ -43 +43 @@
     $MainSubject = $DbResult->fetch_assoc();
     
-    $DbResult = $this->Database->select('FinanceBankAccount', '*', '(`Subject`='.
-        $Config['Finance']['MainSubjectId'].') AND (`Use`=1)');
+    $DbResult = $this->Database->query('SELECT FinanceBankAccount.*, FinanceBank.Code AS NumberFull FROM FinanceBankAccount '.
+      'JOIN FinanceBank ON FinanceBank.Id=FinanceBankAccount.Bank '.
+      'WHERE (FinanceBankAccount.`Subject`='.$Config['Finance']['MainSubjectId'].') AND (FinanceBankAccount.`Use`=1)');
     $MainSubjectAccount = $DbResult->fetch_assoc();
     
@@ -66 +67 @@
       'IČ: '.$MainSubject['IC'].'<br>'.
       'DIČ: '.$MainSubject['DIC'].'<br>'.
-      'Účet: '.$MainSubjectAccount['Number'].'<br>'.
+      'Účet: '.$MainSubjectAccount['NumberFull'].'<br>'.
       'Plátce DPH: '.$BooleanText[$MainSubject['PayVAT']].'<br>'.
       '</td><td valign="top">'.
@@ -134 +135 @@
     $MainSubject = $DbResult->fetch_assoc();
     
-    $DbResult = $this->Database->select('FinanceBankAccount', '*', '(`Subject`='.
-        $Config['Finance']['MainSubjectId'].') AND (`Use`=1)');
+    $DbResult = $this->Database->query('SELECT FinanceBankAccount.*, FinanceBank.Code AS NumberFull FROM FinanceBankAccount '.
+      'JOIN FinanceBank ON FinanceBank.Id=FinanceBankAccount.Bank '.
+      'WHERE (FinanceBankAccount.`Subject`='.$Config['Finance']['MainSubjectId'].') AND (FinanceBankAccount.`Use`=1)');
     $MainSubjectAccount = $DbResult->fetch_assoc();
     

trunk/finance/manage.php

@@ -553 +553 @@
     $MainSubject = $DbResult->fetch_assoc();  
     
-    $DbResult = $this->Database->select('FinanceBankAccount', '*', '(`Subject`='.
-      $Config['Finance']['MainSubjectId'].') AND (`Use`=1)');
+    $DbResult = $this->Database->query('SELECT FinanceBankAccount.*, FinanceBank.Code AS NumberFull FROM FinanceBankAccount '.
+      'JOIN FinanceBank ON FinanceBank.Id=FinanceBankAccount.Bank '.
+      'WHERE (FinanceBankAccount.`Subject`='.$Config['Finance']['MainSubjectId'].') AND (FinanceBankAccount.`Use`=1)');
     $MainSubjectAccount = $DbResult->fetch_assoc();
         
@@ -569 +570 @@
         'Vaše platební období: <strong>'.$this->System->Modules['Finance']->BillingPeriods[$Member['BillingPeriod']]['Name'].'</strong><br />'."\n".
         'Pravidelná platba za období: <strong>'.$MemberPayment['MonthlyTotal'].' Kč</strong><br />'."\n".
-        'Bankovní účet: <strong>'.$MainSubjectAccount['Number'].'<br/>'."\n".
+        'Bankovní účet: <strong>'.$MainSubjectAccount['NumberFull'].'<br/>'."\n".
         'Variabilní symbol: <strong>'.$Member['Subject'].'</strong><br/>'."\n".
         'Stav vašeho účtu: <strong>'.($MemberPayment['Cash'] - $MemberPayment['MonthlyTotal']).' Kč</strong><br /><br />'."\n";