Changeset 793 for trunk/Modules/Finance

Timestamp:

Feb 3, 2016, 10:57:54 AM (9 years ago)

Author:

chronos

Message:

• Fixed: Error using $System global variable instead of class fields.

Location:

trunk/Modules/Finance

Files:

• Finance.php (modified) (1 diff)
• Manage.php (modified) (1 diff)

trunk/Modules/Finance/Finance.php

@@ -508 +508 @@
         'TopTariffPrice' => array('Type' => 'Integer', 'Caption' => 'Nejvyšší cena tarifu', 'Default' => '0', 'Suffix' => 'Kč'),
         'ChangeAction' => array('Type' => 'TActionEnum', 'Caption' => 'Změna - akce', 'Default' => '', 'Null' => true),
-        'ChangeTime' => array('Type' => 'DateTime', 'Caption' => 'Změna - čas', 'Default' => '', 'Null' => true),
-        'ChangeReplaceId' => array('Type' => 'TFinanceCharge', 'Caption' => 'Změna - položka', 'Default' => '0', 'Null' => true),
+        'ChangeTime' => array('Type' => 'DateTime', 'Caption' => 'Změna - čas', 'Default' => '', 'Null' => true, 'NotInList' => true),
+        'ChangeReplaceId' => array('Type' => 'TFinanceCharge', 'Caption' => 'Změna - položka', 'Default' => '0', 'Null' => true, 'NotInList' => true),
       ),
     ));

trunk/Modules/Finance/Manage.php

@@ -199 +199 @@
         {
           $TimePeriodText = date('j.n.Y', $Period['From']).' - '.date('j.n.Y', $Period['To']);
-          $Output .= $TimePeriodText.': '.$MonthlyTotal.' * '.$Period['MonthCount'].' = '.$PayPerPeriod.'<br />';
+          $Output .= $TimePeriodText.': '.$MonthlyTotal.' * '.$Period['MonthCount'].' = '.$PayPerPeriod;
           $this->InsertInvoice($Member['Subject'], time(), time() + 3600 * 24 * INVOICE_DUE_DAYS,
-            $InvoiceItems, $FinanceGroup, $Period['From'],
-            $Period['To']);
+            $InvoiceItems, $FinanceGroup, $Period['From'], $Period['To']);
 
           $Output .= $this->SendPaymentEmail($Member['Id']);