Changeset 275 for trunk/finance

Timestamp:

Jan 24, 2010, 8:05:10 AM (15 years ago)

Author:

george

Message:

• Upraveno: Nově rozšířená tabulka dokladových řad pro podporu oddělených účetních roků.
• Opraveno: Nové volání funkcí pro IPv4 ze skriptů generování nastavení sítě.

File:

• trunk/finance/finance.php (modified) (8 diffs)

trunk/finance/finance.php

@@ -23 +23 @@
   var $ExternalSubject = 96;
   var $MainSubject = 71;
-        var $BillingPeriods;
+  var $BillingPeriods;
   
   function LoadTariffs($Period = 1)
@@ -92 +92 @@
   function LoadMonthParameters($Period = 1) // 0 - now, 1 - next month
   {   
-                $DbResult = $this->Database->query('SELECT * FROM FinanceBillingPeriod');
-                while($BillingPeriod = $DbResult->fetch_assoc())
-                  $this->BillingPeriods[$BillingPeriod['Id']] = $BillingPeriod;
-                
+    $DbResult = $this->Database->query('SELECT * FROM FinanceBillingPeriod');
+    while($BillingPeriod = $DbResult->fetch_assoc())
+      $this->BillingPeriods[$BillingPeriod['Id']] = $BillingPeriod;
+    
     $DbResult = $this->Database->query('SELECT * FROM finance_charge WHERE period='.$Period);
     $Row = $DbResult->fetch_array();
@@ -130 +130 @@
   }
 
-  function GetNextDocumentLineNumber($Id)
+  function GetNextDocumentLineNumber($Id, $FinanceYear = 0)
   {    
-    $DbResult = $this->Database->query('SELECT Shortcut, NextNumber FROM DocumentLine WHERE Id='.$Id);
-    $DbRow = $DbResult->fetch_assoc();
-    $Result = $DbRow['Shortcut'].$DbRow['NextNumber'];
-    $this->Database->query('UPDATE DocumentLine SET NextNumber = NextNumber + 1 WHERE Id='.$Id);
+    if($FinanceYear == 0) 
+    {
+      // Get latest year
+      $DbResult = $this->Database->select('FinanceYear', '*', '1 ORDER BY Year DESC LIMIT 1');
+    } else $DbResult = $this->Database->select('FinanceYear', '*', 'Id='.$FinanceYear);
+    $FinanceYear = $DbResult->fetch_assoc();
+    
+    $DbResult = $this->Database->query('SELECT Shortcut, Id FROM DocumentLine WHERE Id='.$Id);
+    $DocumentLine = $DbResult->fetch_assoc();
+    
+    $DbResult = $this->Database->query('SELECT Shortcut FROM DocumentLineSequence WHERE DocumentLine='.Id.' AND FinanceYear'.$FinanceYear['Id']);
+    $Sequence = $DbResult->fetch_assoc();
+    
+    if($Sequence['YearPrefix'] == 1)
+    {
+      $Result = $DbRow['Shortcut'].$Sequence['NextNumber'].'/'.$FinanceYear['Year'];
+    } else $Result = $DocumentLine['Shortcut'].$Sequence['NextNumber'];
+        
+    $this->Database->query('UPDATE DocumentLineSequence SET NextNumber = NextNumber + 1 WHERE DocumentLine='.$Id.' AND FinanceYear='.$FinanceYear['Id']);
     return($Result);
   }
@@ -149 +164 @@
       $Cash = $DbResult2->fetch_row();
       $Cash = $Cash[0];
-          
+    
       $DbResult2 = $this->Database->query('SELECT SUM(consumption) FROM network_devices WHERE (user='.$Member['Id'].') AND (used = 1)');
       $ConsumptionPlus = $DbResult2->fetch_row();
@@ -166 +181 @@
         $ID = $Device['parent'];
       }
-          
+    
       $Monthly = 0;
       $MonthlyInet = $this->Tariffs[$Member['InternetTariffNextMonth']]['Price'];
@@ -177 +192 @@
       $Monthly = round($Monthly);
       //echo($Row['fullname'].' '.$Row['inet'].' '.$Monthly.'<br>');
-                
+      
       $this->Database->insert('MemberPayment', array('Member' => $Member['Id'], 'NetworkDevice' => $NetworkDevice, 'MonthlyInternet' => $MonthlyInet, 'MonthlyTotal' => $Monthly, 'MonthlyConsumption' => $this->W2Kc($Consumption), 'Cash' => $Cash, 'MonthlyPlus' => $this->W2Kc($ConsumptionPlus)));
     }
-                $this->System->Modules['Log']->NewRecord('Finance', 'RecalculateMemberPayment');        
+    $this->System->Modules['Log']->NewRecord('Finance', 'RecalculateMemberPayment');  
     $this->RecalculateTariffs(1);
     $this->RecalculateTariffs(0);
@@ -189 +204 @@
   {
     $Output = 'Aktualizuji parametry segmentů...<br />';
-    $this->Database->query('UPDATE network_segments SET users = 0, users_overheads = 0');               // Vynulovat počty uživatelů
+    $this->Database->query('UPDATE network_segments SET users = 0, users_overheads = 0');     // Vynulovat počty uživatelů
     $DbResult = $this->Database->query('SELECT * FROM network_segments');
     while($NetworkSegment = $DbResult->fetch_array())
@@ -219 +234 @@
     $Row = $DbResult->fetch_array();
     $DbResult = $this->Database->update('network_segments','id='.$this->InternetSegmentId, array('users' => $Row[0], 'users_overheads' => $Row[0]));
-                $this->System->Modules['Log']->NewRecord('Finance', 'RecalculateSegmentParameters');
+    $this->System->Modules['Log']->NewRecord('Finance', 'RecalculateSegmentParameters');
     return($Output);
   }