Changeset 761

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

Files:

• Application/Version.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (1 diff)
• Modules/Finance/Finance.php (modified) (2 diffs)
• Modules/Finance/Manage.php (modified) (2 diffs)
• Modules/FinanceBankAPI/FinanceBankAPI.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/Generators/FirewallNAT.php (modified) (1 diff)
• Modules/Scheduler/Scheduler.php (modified) (1 diff)
• Modules/Subject/Subject.php (modified) (1 diff)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 760; // Subversion revision
+$Revision = 761; // Subversion revision
 $DatabaseRevision = 759; // SQL structure revision
 $ReleaseTime = strtotime('2015-10-26');

trunk/Common/Setup/Updates.php

@@ -1583 +1583 @@
   $Manager->Execute('ALTER TABLE `Scheduler` ADD `Duration` INT NOT NULL AFTER `Period`;');
 }
+
+/*
+function UpdateTo761($Manager)
+{
+  $Manager->Execute('INSERT INTO `MACAddress` (SELECT "" AS `Id`,`MAC` AS `Value` FROM `NetworkSignal` GROUP BY `MAC`)');
+  $Manager->Execute('ALTER TABLE `NetworkSignal` ADD `Address` INT NOT NULL AFTER `MAC`;');
+  $Manager->Execute('UPDATE `NetworkSignal` SET `Address`=(SELECT `Id` FROM `MACAddress` WHERE `MACAddress`.`Value`=`NetworkSignal`.`MAC`)');
+}
+*/
 
 class Updates

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` '.

trunk/Modules/FinanceBankAPI/FinanceBankAPI.php

@@ -86 +86 @@
     $Preset = array(
       'presetTime' => $Item['Time'],
-      'presetValue' => $Item['Value'],
+      'presetValueUser' => abs($Item['Value']),
       'presetTaxable' => 1,
       'presetText' => $Item['Description'],
       'presetNetwork' => 1,
       'presetBankAccount' => $Item['BankAccount'],
-      'presetDocumentLine' => $FinanceGroup['DocumentLine']);
+      'presetGroup' => $FinanceGroup['Id']);
     return($Preset);
   }

trunk/Modules/NetworkConfigRouterOS/Generators/FirewallNAT.php

@@ -119 +119 @@
 // Redirect unregistred clients to free access activation page
 $Items[] = array('chain' => 'dstnat', 'dst-address' => '!10.145.0.0/16',
-  'src-address-list' => 'unregistred', 'in-interface' => $LocalInterface,
+  'src-address-list' => 'unregistred', 'in-interface' => $LocalInterface, 'protocol' => 'tcp',
   'action' => 'dst-nat', 'to-addresses' => '10.145.64.8', 'to-ports' => 82, 'comment' => 'Redirect_unregistred');
 

trunk/Modules/Scheduler/Scheduler.php

@@ -82 +82 @@
         $Duration = $StopTime - $StartTime;
         $this->Database->update('Scheduler', 'Id='.$DbRow['Id'],
-          array('Log' => $Output, 'LastExecutedTime' => TimeToMysqlDateTime($StartTime)));
+          array('Log' => $Output, 'LastExecutedTime' => TimeToMysqlDateTime($StartTime),
+            'Duration' => $Duration));
         if($DbRow['Period'] != '') {
           if($DbRow['ScheduledTime'] == '') $NewScheduledTime = $StartTime + $DbRow['Period'];

trunk/Modules/Subject/Subject.php

@@ -36 +36 @@
         'Invoices' => array('Type' => 'TFinanceInvoiceListSubject', 'Caption' => 'Faktury', 'Default' => ''),
         'Payment' => array('Type' => 'Float', 'Caption' => 'Placení', 'Default' => '',
-          'ReadOnly' => true, 'Suffix' => 'Kč', 'SQL' => 'IFNULL((SELECT SUM(`FinanceOperation`.`Value`) FROM `FinanceOperation` '.
+          'ReadOnly' => true, 'Suffix' => 'Kč', 'SQL' => 'ROUND(IFNULL((SELECT SUM(`FinanceOperation`.`Value`) FROM `FinanceOperation` '.
           'WHERE `FinanceOperation`.`Subject`=#Id), 0) - IFNULL((SELECT SUM(`FinanceInvoice`.`Value`) FROM `FinanceInvoice` '.
-          'WHERE `FinanceInvoice`.`Subject`=#Id), 0)'),
-        'BankAccounts' => array('Type' => 'TFinanceBankAccountListSubject', 'Caption' => 'Bankovní účety', 'Default' => ''),
+          'WHERE `FinanceInvoice`.`Subject`=#Id), 0))'),
+        'BankAccounts' => array('Type' => 'TFinanceBankAccountListSubject', 'Caption' => 'Bankovní účty', 'Default' => ''),
       ),
     ));