Changeset 761 for trunk/Modules/Finance

Timestamp:

Nov 4, 2015, 9:00:41 AM (9 years ago)

Author:

chronos

Message:

• Fixed: Generation of new invoices.
• Fixed: Presetting values for pairing imported operations from bank account.
• Fixed: Firewall NAT rules error.

Location:

trunk/Modules/Finance

Files:

• Finance.php (modified) (2 diffs)
• Manage.php (modified) (2 diffs)

trunk/Modules/Finance/Finance.php

@@ -124 +124 @@
       $Group = $DbResult->fetch_assoc();
       return($Group);
-    } else die('Finance group not found');
+    } else die('Finance group id '.$Id.' not found in table '.$Table);
   }
 
@@ -167 +167 @@
         $Consumption = 0;
       }
+      $Consumption = 0;
       $this->Database->insert('MemberPayment', array('Member' => $Member['Id'],
           'MonthlyInternet' => $MonthlyInet,

trunk/Modules/Finance/Manage.php

@@ -177 +177 @@
 
         // Load invoice group
-        $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById($InvoiceGroupId, 'FinanceInvoice');
+        $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById($InvoiceGroupId, 'FinanceInvoiceGroup');
         foreach($InvoiceItems as $Index => $Item) {
           $InvoiceItems[$Index]['Price'] = $Item['Price'] * $FinanceGroup['ValueSign'];
@@ -271 +271 @@
     $Row = $DbResult->fetch_row();
     $TotalMemberCash = $Row[0];
-    $Output .= 'Stav pokladny: Členové('.$TotalMemberCash.')';
+    $Output .= 'Stav pokladny: Členové('.round($TotalMemberCash).')<br/>';
 
     $DbResult = $this->Database->query('SELECT SUM(`Product`.`Consumption`) AS `Consumption` FROM `StockSerialNumber` '.