Changeset 207 for trunk/finance

Timestamp:

May 4, 2009, 10:09:30 PM (16 years ago)

Author:

george

Message:

• Upraveno: Tarify přepočítat jen ručně a ne při každém načtení stránky.

Location:

trunk/finance

Files:

• clenove.php (modified) (1 diff)
• finance.php (modified) (2 diffs)
• manage.php (modified) (2 diffs)
• user_state.php (modified) (1 diff)
• zivnost.php (modified) (1 diff)

trunk/finance/clenove.php

@@ -10 +10 @@
   {
     $Finance = $this->System->Modules['Finance'];
-          $this->System->Modules['Finance']->RecalculateTariffs(1);
+          $this->System->Modules['Finance']->LoadTariffs(1);
           if(!$this->System->Modules['User']->CheckPermission('Finance', 'SubjectList')) return('Nemáte oprávnění');
 

trunk/finance/finance.php

@@ -121 +121 @@
     $this->TotalPaid = $Row['MonthlyTotal'];
   
-    $this->RecalculateTariffs($Period);
     $this->LoadTariffs($Period);
   }
@@ -181 +180 @@
     }
                 $this->System->Modules['Log']->NewRecord('Finance', 'RecalculateMemberPayment');        
+    $this->RecalculateTariffs(1);
+    $this->RecalculateTariffs(0);
     return($Output);
   } 

trunk/finance/manage.php

@@ -475 +475 @@
 
     $Output .= $Finance->RecalculateSegmentParameters();
-    $Output .= $Finance->RecalculateTariffs();
+    $Output .= $Finance->LoadTariffs();
     //$InvoiceGenerator->CustomGenerate();
     $Output .= $Finance->RecalculateMemberPayment();
@@ -560 +560 @@
       }
 
-      $Output .= $Finance->RecalculateTariffs();
             $Finance->RecalculateMemberPayment();
       //CreateMonthlyOverallBill();

trunk/finance/user_state.php

@@ -11 +11 @@
   {
           $Finance = &$this->System->Modules['Finance'];
-          $this->System->Modules['Finance']->RecalculateTariffs(1);
+          $this->System->Modules['Finance']->LoadTariffs(1);
 
     if(array_key_exists('old', $_GET))

trunk/finance/zivnost.php

@@ -77 +77 @@
   {
           if(!$this->System->Modules['User']->CheckPermission('Finance', 'TradingStatus')) return('Nemáte oprávnění');
-    $this->System->Modules['Finance']->RecalculateTariffs(1);
+    $this->System->Modules['Finance']->LoadTariffs(1);
     //TransformFinance();