Changeset 508

Timestamp:

Apr 1, 2013, 8:36:27 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Negenerovat faktury pokud fakturovaná částka je nula.
• Přidáno: Zobrazení akcí při prohlížení položek správy dat.
• Přidáno: V tabulce Subjektů se nyní zobrazují související platby.

Location:

trunk

Files:

• Common/Version.php (modified) (1 diff)
• Modules/FinanceBankAPI/FileImport.php (modified) (1 diff)
• Modules/IS/IS.php (modified) (3 diffs)
• finance/manage.php (modified) (2 diffs)
• finance/user_state.php (modified) (3 diffs)
• form_classes.php (modified) (2 diffs)
• system/generators/dns.php (modified) (1 diff)

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 507; // Subversion revision
+$Revision = 508; // Subversion revision
 $DatabaseRevision = 507; 
 $ReleaseTime = '2013-04-01';

trunk/Modules/FinanceBankAPI/FileImport.php

@@ -30 +30 @@
   {   
     if(!$this->System->Modules['User']->CheckPermission('Finance', 'SubjectList')) return('Nemáte oprávnění');
-    
+     
     $DbResult = $this->Database->select('FinanceBankAccount', '*', 'Id='.$_GET['id']);
     $BankAccount = $DbResult->fetch_assoc();

trunk/Modules/IS/IS.php

@@ -14 +14 @@
       return('Nemáte oprávnění');
 
-    $DbResult = $this->Database->select('ISMenuItem', '*');
+    $DbResult = $this->Database->select('ISMenuItem', '*', '1 ORDER BY Parent,Name');
     while($DbRow = $DbResult->fetch_assoc())
     {
@@ -126 +126 @@
   function ShowView($Table, $Id)
   {
+    if($Table != '') $FormClass = $this->System->FormManager->Classes[$Table];
+      else return($this->SystemMessage('Chyba', 'Tabulka nenalezena'));
+    
     $Form = new Form($this->System->FormManager);
     $Form->SetClass($Table);
@@ -140 +143 @@
     $Output .= '<li><a href="?a=add"><img alt="Přidat" title="Přidat" src="'.
       $this->System->Link('/images/add.png').'"/>Přidat</a></li>';
+    if(array_key_exists('ItemActions', $FormClass))
+    {
+      foreach($FormClass['ItemActions'] as $Action)
+        $Output .= '<li><a href="'.$this->System->Link($Action['URL']).'&amp;id='.$Id.'"><img alt="'.$Action['Caption'].'" title="'.$Action['Caption'].'" src="'.
+            $this->System->Link('/images/action.png').'"/>'.$Action['Caption'].'</a></li>';
+    }  
     $Output .= '</ul><br/>';
     

trunk/finance/manage.php

@@ -320 +320 @@
       'ON Subject.Id=Member.Subject LEFT JOIN FinanceBillingPeriod ON '.
       'FinanceBillingPeriod.Id=Member.BillingPeriodNext WHERE (Member.Blocked = 0)'.
-      'AND (Member.BillingPeriodNext > 1)';
+      'AND (Member.BillingPeriodNext > 1) AND (MemberPayment.MonthlyTotal != 0)';
     
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM ('.$SQL.') AS T');
@@ -404 +404 @@
           $MonthlyTotal -= $Member['MonthlyPlus'];
         }
-        $PayPerPeriod = $MonthlyTotal * $Period['MonthCount'];
-    
-        $TimePeriodText = date('j.n.Y', $Period['From']).' - '.date('j.n.Y', $Period['To']);
-        $Output .= $TimePeriodText.': '.$MonthlyTotal.' * '.$Period['MonthCount'].' = '.$PayPerPeriod.'<br />';
-        $this->InsertInvoice($Member['Subject'], time(), time() + 3600 * 24 * INVOICE_DUE_DAYS, 
-          $InvoiceItems, INVOICE_OUT_DOC_LINE, $Period['From'], $Period['To']);
-    
-        $Output .= $this->SendPaymentEmail($Member['Id']);
+        $PayPerPeriod = $MonthlyTotal * $Period['MonthCount'];  
+        if($PayPerPeriod != 0)
+        {
+          $TimePeriodText = date('j.n.Y', $Period['From']).' - '.date('j.n.Y', $Period['To']);
+          $Output .= $TimePeriodText.': '.$MonthlyTotal.' * '.$Period['MonthCount'].' = '.$PayPerPeriod.'<br />';
+          $this->InsertInvoice($Member['Subject'], time(), time() + 3600 * 24 * INVOICE_DUE_DAYS, 
+            $InvoiceItems, INVOICE_OUT_DOC_LINE, $Period['From'], $Period['To']);
+    
+          $Output .= $this->SendPaymentEmail($Member['Id']);
+        } else $Output .= '<br />';
         $this->Database->update('Member', 'Id='.$Member['Id'], 
           array('BillingPeriodLastDate' => TimeToMysqlDateTime($Period['To'])));

trunk/finance/user_state.php

@@ -69 +69 @@
     $DbRow = $DbResult->fetch_array();
     $Total = $DbRow['Total'];
-    $Output .= 'Stav účtu: <strong>'.$Total.' Kč</strong<br /><br /><br/>';
+    $Output .= 'Stav účtu: <strong>'.round($Total, 2).' Kč</strong<br /><br /><br/>';
     
     // Tabulka operaci
@@ -91 +91 @@
       $Output .= '<tr><td style="text-align: right;">'.HumanDate($Row['Time']).'</td>'.
       '<td style="text-align: left;">'.$Row['Text'].'</td>'.
-      '<td style="text-align: right;">'.$Row['Value'].'</td>'.
+      '<td style="text-align: right;">'.round($Row['Value'], 2).'</td>'.
       '<td style="text-align: center;">'.$Period.'</td>'.
       '<td style="text-align: center;">'.$Invoice.'</td></tr>';
@@ -97 +97 @@
     }
     $Output .= '<tr><td style="text-align: right;" colspan="2"><strong>Celkem za rok</strong></td>'.
-    '<td style="text-align: right;"><strong>'.$SumValue.'</strong></td>'.
+    '<td style="text-align: right;"><strong>'.round($SumValue, 2).'</strong></td>'.
     '<td style="text-align: center;">&nbsp;</td>'.
     '<td style="text-align: center;">&nbsp;</td></tr>';

trunk/form_classes.php

@@ -537 +537 @@
       'Note' => array('Type' => 'String', 'Caption' => 'Poznámka', 'Default' => ''),
       'Customer' => array('Type' => 'TMemberListSubject', 'Caption' => 'Členové', 'Default' => ''),
+      'Operations' => array('Type' => 'TFinanceOperationListSubject', 'Caption' => 'Platby', 'Default' => ''),
+      'Invoices' => array('Type' => 'TFinanceInvoiceListSubject', 'Caption' => 'Faktury', 'Default' => ''),
     ),
   ),
@@ -1298 +1300 @@
     'Filter' => '1',
   ),
+  'TFinanceOperationListSubject' => array(
+    'Type' => 'ManyToOne',
+    'Table' => 'FinanceOperation',
+    'Id' => 'Id',
+    'Ref' => 'Subject',
+    'Filter' => '1',
+  ),
+  'TFinanceInvoiceListSubject' => array(
+    'Type' => 'ManyToOne',
+    'Table' => 'FinanceInvoice',
+    'Id' => 'Id',
+    'Ref' => 'Subject',
+    'Filter' => '1',
+  ),
 );
 }

trunk/system/generators/dns.php

@@ -3 +3 @@
 if(isset($_SERVER['REMOTE_ADDR'])) die();
 include('../../Common/Global.php');
+$Database = &$System->Database;
 
 $BaseDomain = 'zdechov.net';