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

Timestamp:

Dec 29, 2020, 11:11:12 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Modules dependencies evaluation.
• Modified: Better installation/uninstallation of models in more modules.

File:

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

trunk/Modules/Finance/Finance.php

@@ -277 +277 @@
         'Treasury' => array('Type' => 'TFinanceTreasury', 'Caption' => 'Pokladna', 'Default' => '', 'Null' => true),
         'Generate' => array('Type' => 'Boolean', 'Caption' => 'Generovat', 'Default' => ''),
+        'Balance' => array('Type' => 'Integer', 'Caption' => 'Zůstatek', 'Default' => '', 
+          'ReadOnly' => true, 'SQL' => '(SELECT SUM(`FinanceOperation2`.`Value`) FROM `FinanceOperation` AS `FinanceOperation2` WHERE `FinanceOperation2`.`Time`<`Time`)'),
         'InvoiceRel' => array('Type' => 'TFinanceInvoiceOperationRelListOperation', 'Caption' => 'Zaplacené faktury', 'Default' => ''),
         'InvoiceRelCount' => array('Type' => 'Integer', 'Caption' => 'Faktur',
@@ -289 +291 @@
       ),
     ));
-
+    
     $this->System->FormManager->RegisterClass('FinanceTreasuryIn', $this->System->FormManager->Classes['FinanceOperation']);
     $this->System->FormManager->Classes['FinanceTreasuryIn']['Title'] = 'Pokladní příjmy';
@@ -543 +545 @@
       ),
     ));
+    $this->System->FormManager->RegisterClass('FinanceBankAccountReport', array(
+      'Title' => 'Roční výkaz operací',
+      'Table' => 'FinanceBankAccountReport',
+      'SQL' => 'SELECT Id, DateEnd, DateStart FROM FinanceYear',
+      'DefaultSortColumn' => 'Id',
+      'Items' => array(
+        'Id' => array('Type' => 'TFinanceYear', 'Caption' => 'Rok', 'Default' => '',
+          'ReadOnly' => true),
+        //'Account' => array('Type' => 'TFinanceBankAccount', 'Caption' => 'Bankovní účet', 'Default' => '',
+        //  'ReadOnly' => true),
+        'StartBalance' => array('Type' => 'Integer', 'Caption' => 'Starý zůstatek', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
+          'SQL' => '(SELECT ROUND(SUM(`FinanceOperation`.`Value`)) FROM `FinanceOperation` '.
+          'LEFT JOIN `FinanceOperationGroup` ON `FinanceOperationGroup`.`Id`=`FinanceOperation`.`Group` '.
+          'WHERE (`FinanceOperation`.`Time` <= `DateStart`) AND (`FinanceOperation`.`BankAccount` = 2))'),
+        'EndBalance' => array('Type' => 'Integer', 'Caption' => 'Nový zůstatek', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
+          'SQL' => '(SELECT ROUND(SUM(`FinanceOperation`.`Value`)) FROM `FinanceOperation` '.
+          'LEFT JOIN `FinanceOperationGroup` ON `FinanceOperationGroup`.`Id`=`FinanceOperation`.`Group` '.
+          'WHERE (`FinanceOperation`.`Time` <= `DateEnd`) AND (`FinanceOperation`.`BankAccount` = 2))'),
+        'Change' => array('Type' => 'Integer', 'Caption' => 'Změna', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
+          'SQL' => '(SELECT ROUND(SUM(`FinanceOperation`.`Value`)) FROM `FinanceOperation` '.
+          'LEFT JOIN `FinanceOperationGroup` ON `FinanceOperationGroup`.`Id`=`FinanceOperation`.`Group` '.
+          'WHERE (`FinanceOperation`.`Time` <= `DateEnd`) '.
+          'AND (`FinanceOperation`.`Time` >= `DateStart`) AND (`FinanceOperation`.`BankAccount` = 2))'),
+      ),
+      //'AfterInsert' => array($this, 'AfterInsertFinanceYear'),
+    ));
     $this->System->FormManager->RegisterFormType('TFinanceBankAccount', array(
       'Type' => 'Reference',