Changeset 719 for trunk/Modules/Finance/Finance.php

Timestamp:

Jan 2, 2015, 11:16:56 PM (10 years ago)

Author:

chronos

Message:

• Added: Support for Hidden items in form types values.
• Added: Support for Filtered items in form types values.
• Modified: FinanceOperation Value splitted to (Direction * Value). Direction can be +1 or -1 depends on if money goes out or in company.
• Added: Menu "Incomes and spends" is now splitted to incomes/spends of bank account or treasury. Direction and document line is filled automatically.

File:

• trunk/Modules/Finance/Finance.php (modified) (8 diffs)

trunk/Modules/Finance/Finance.php

@@ -9 +9 @@
 define('TARIFF_FREE', 7);
 define('INVOICE_DUE_DAYS', 15);
-define('DOC_LINE_INVOICE_OUT', 6);
+define('DOC_LINE_TREASURY_IN', 1);
+define('DOC_LINE_TREASURY_OUT', 2);
 define('DOC_LINE_ACCOUNT_IN', 3);
 define('DOC_LINE_ACCOUNT_OUT', 4);
+define('DOC_LINE_INVOICE_IN', 5);
+define('DOC_LINE_INVOICE_OUT', 6);
 define('VAT_TYPE_BASE', 2);
 
@@ -23 +26 @@
   var $InternetUsers;
   var $SpravaUsers;
-  var $InternetSegmentId = 21;
   var $MaxSpeed;
   var $RealMaxSpeed;
   var $SpeedReserve;
   var $BaseSpeedElement;
-  var $UserIdNetwork = 46;
   var $BaseTariffPrice;
   var $TopTariffPrice;
@@ -34 +35 @@
   var $TotalInternetPaid;
   var $Tariffs;
-  var $ExternalSubject = 96;
   var $MainSubject;
   var $BillingPeriods;
@@ -186 +186 @@
     while($Member = $DbResult->fetch_assoc())
     {
-      $DbResult2 = $this->Database->query('SELECT ((SELECT COALESCE(SUM(Value), 0) FROM FinanceOperation '.
+      $DbResult2 = $this->Database->query('SELECT ((SELECT COALESCE(SUM(-Value*Direction), 0) FROM FinanceOperation '.
           'WHERE Subject='.$Member['Subject'].') + (SELECT COALESCE(SUM(-Value), 0) FROM FinanceInvoice '.
           'WHERE Subject='.$Member['Subject'].')) as Cash');
@@ -277 +277 @@
       'DefaultSortOrder' => 1,
       'Items' => array(
-        'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => ''),
+        'Direction' => array('Type' => 'TFinanceDirection', 'Caption' => 'Směr', 'Default' => '1'),
+        'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => ''),
         'BillCode' => array('Type' => 'String', 'Caption' => 'Označení', 'Default' => ''),
         'Subject' => array('Type' => 'TSubject', 'Caption' => 'Subjekt', 'Default' => ''),
@@ -293 +294 @@
       ),
       'BeforeInsert' => array($this, 'BeforeInsertFinanceOperation'),
+    ));
+    
+    $this->System->FormManager->RegisterClass('FinanceTreasuryIn', $this->System->FormManager->Classes['FinanceOperation']);
+    $this->System->FormManager->Classes['FinanceTreasuryIn']['Title'] = 'Pokladní příjmy';
+    $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['Direction']['Default'] = 1;
+    $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['Direction']['Hidden'] = true;
+    $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['Direction']['Filter'] = true;
+    $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['DocumentLine']['Default'] = DOC_LINE_TREASURY_IN;
+    $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['DocumentLine']['Hidden'] = true;
+    $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['DocumentLine']['Filter'] = true;
+    $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['BankAccount']['Hidden'] = true;
+        
+    $this->System->FormManager->RegisterClass('FinanceTreasuryOut', $this->System->FormManager->Classes['FinanceOperation']);
+    $this->System->FormManager->Classes['FinanceTreasuryOut']['Title'] = 'Pokladní výdeje';
+    $this->System->FormManager->Classes['FinanceTreasuryOut']['Items']['Direction']['Default'] = -1;
+    $this->System->FormManager->Classes['FinanceTreasuryOut']['Items']['Direction']['Hidden'] = true;
+    $this->System->FormManager->Classes['FinanceTreasuryOut']['Items']['Direction']['Filter'] = true;
+    $this->System->FormManager->Classes['FinanceTreasuryOut']['Items']['DocumentLine']['Default'] = DOC_LINE_TREASURY_OUT;
+    $this->System->FormManager->Classes['FinanceTreasuryOut']['Items']['DocumentLine']['Hidden'] = true;
+    $this->System->FormManager->Classes['FinanceTreasuryOut']['Items']['DocumentLine']['Filter'] = true;
+    $this->System->FormManager->Classes['FinanceTreasuryOut']['Items']['BankAccount']['Hidden'] = true;
+    
+    $this->System->FormManager->RegisterClass('FinanceAccountIn', $this->System->FormManager->Classes['FinanceOperation']);
+    $this->System->FormManager->Classes['FinanceAccountIn']['Title'] = 'Příjmy na účet';
+    $this->System->FormManager->Classes['FinanceAccountIn']['Items']['Direction']['Default'] = 1;
+    $this->System->FormManager->Classes['FinanceAccountIn']['Items']['Direction']['Hidden'] = true;
+    $this->System->FormManager->Classes['FinanceAccountIn']['Items']['Direction']['Filter'] = true;
+    $this->System->FormManager->Classes['FinanceAccountIn']['Items']['DocumentLine']['Default'] = DOC_LINE_ACCOUNT_IN;
+    $this->System->FormManager->Classes['FinanceAccountIn']['Items']['DocumentLine']['Hidden'] = true;
+    $this->System->FormManager->Classes['FinanceAccountIn']['Items']['DocumentLine']['Filter'] = true;
+    $this->System->FormManager->Classes['FinanceAccountIn']['Items']['Treasury']['Hidden'] = true;
+    
+    
+    $this->System->FormManager->RegisterClass('FinanceAccountOut', $this->System->FormManager->Classes['FinanceOperation']);
+    $this->System->FormManager->Classes['FinanceAccountOut']['Title'] = 'Výdeje z účtu';
+    $this->System->FormManager->Classes['FinanceAccountOut']['Items']['Direction']['Default'] = -1;
+    $this->System->FormManager->Classes['FinanceAccountOut']['Items']['Direction']['Hidden'] = true;
+    $this->System->FormManager->Classes['FinanceAccountOut']['Items']['Direction']['Filter'] = true;
+    $this->System->FormManager->Classes['FinanceAccountOut']['Items']['DocumentLine']['Default'] = DOC_LINE_ACCOUNT_OUT;
+    $this->System->FormManager->Classes['FinanceAccountOut']['Items']['DocumentLine']['Hidden'] = true;
+    $this->System->FormManager->Classes['FinanceAccountOut']['Items']['DocumentLine']['Filter'] = true;
+    $this->System->FormManager->Classes['FinanceAccountOut']['Items']['Treasury']['Hidden'] = true;
+    
+    $this->System->FormManager->RegisterFormType('TFinanceDirection', array(
+      'Type' => 'Enumeration',
+      'States' => array(-1 => 'Výdej', 1 => 'Příjem'),
     ));
     $this->System->FormManager->RegisterClass('FinanceInvoice', array(
@@ -349 +396 @@
         'TimeCreate' => array('Type' => 'Date', 'Caption' => 'Čas vytvoření', 'Default' => ''),
         'State' => array('Type' => 'Float', 'Caption' => 'Stav', 'Default' => '',
-          'ReadOnly' => true, 'Suffix' => 'Kč', 'SQL' => '(SELECT SUM(`FinanceOperation`.`Value`) FROM `FinanceOperation` '.
+          'ReadOnly' => true, 'Suffix' => 'Kč', 'SQL' => '(SELECT SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`Direction`) FROM `FinanceOperation` '.
           'WHERE `FinanceOperation`.`Treasury`=#Id)'),
         'Operations' => array('Type' => 'TFinanceOperationListTreasury', 'Caption' => 'Operace', 'Default' => ''),
@@ -379 +426 @@
         'LastImportId' => array('Type' => 'String', 'Caption' => 'Id posledního importu', 'Default' => ''),
         'State' => array('Type' => 'Float', 'Caption' => 'Stav', 'Default' => '',
-          'ReadOnly' => true, 'Suffix' => 'Kč', 'SQL' => '(SELECT SUM(`FinanceOperation`.`Value`) FROM `FinanceOperation` '.
+          'ReadOnly' => true, 'Suffix' => 'Kč', 'SQL' => '(SELECT SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`Direction`) FROM `FinanceOperation` '.
           'WHERE `FinanceOperation`.`BankAccount`=#Id)'),
       ),