Changeset 647 for trunk/Application

Timestamp:

Mar 25, 2014, 7:09:47 PM (11 years ago)

Author:

chronos

Message:

• Přidáno: Podpora pro virtuální tabulky.
• Přidáno: Roční přehledy roků a subjektů.
• Přidáno: Evidence zaměstnanců a mezd v nabídce v IS.

File:

• trunk/Application/FormClasses.php (modified) (2 diffs)

trunk/Application/FormClasses.php

@@ -86 +86 @@
       'Closed' => array('Type' => 'Boolean', 'Caption' => 'Uzavřen', 'Default' => 0),
       'Sequence' => array('Type' => 'TDocumentLineSequenceListYear', 'Caption' => 'Čísleníky', 'Default' => ''),
+    ),
+    //'AfterInsert' => array($this, 'AfterInsertFinanceYear'),
+  ),
+  'FinanceYearReport' => array(
+    'Title' => 'Roční výkaz',
+    'Table' => 'FinanceYearReport',
+    'SQL' => 'SELECT Id, DateEnd, DateStart FROM FinanceYear',
+    'DefaultSortColumn' => 'Id',
+    'Items' => array(
+      'Id' => array('Type' => 'TFinanceYear', 'Caption' => 'Rok', 'Default' => '', 
+        'ReadOnly' => true),
       'Income' => array('Type' => 'Integer', 'Caption' => 'Příjmy', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
         'SQL' => '(SELECT ROUND(SUM(`FinanceOperation`.`Value`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Time` <= `DateEnd`) '.
-        'AND (`FinanceOperation`.`Time` >= `DateStart`) AND (`FinanceOperation`.`Taxable` = 1) AND (`FinanceOperation`.`Value` > 0))'),
+        'AND (`FinanceOperation`.`Time` >= `DateStart`) AND (`FinanceOperation`.`Value` > 0))'),
       'Spending' => array('Type' => 'Integer', 'Caption' => 'Výdaje', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
         'SQL' => '(SELECT -ROUND(SUM(`FinanceOperation`.`Value`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Time` <= `DateEnd`) '.
+        'AND (`FinanceOperation`.`Time` >= `DateStart`) AND (`FinanceOperation`.`Value` < 0))'),
+      'OperationBalance' => array('Type' => 'Integer', 'Caption' => 'Zisk', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
+        'SQL' => '(SELECT ROUND(SUM(`FinanceOperation`.`Value`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Time` <= `DateEnd`) '.
+        'AND (`FinanceOperation`.`Time` >= `DateStart`))'),
+      'TaxIncome' => array('Type' => 'Integer', 'Caption' => 'Daňové příjmy', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
+        'SQL' => '(SELECT ROUND(SUM(`FinanceOperation`.`Value`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Time` <= `DateEnd`) '.
+        'AND (`FinanceOperation`.`Time` >= `DateStart`) AND (`FinanceOperation`.`Taxable` = 1) AND (`FinanceOperation`.`Value` > 0))'),
+      'TaxSpending' => array('Type' => 'Integer', 'Caption' => 'Daňové výdaje', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
+        'SQL' => '(SELECT -ROUND(SUM(`FinanceOperation`.`Value`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Time` <= `DateEnd`) '.
         'AND (`FinanceOperation`.`Time` >= `DateStart`) AND (`FinanceOperation`.`Taxable` = 1) AND (`FinanceOperation`.`Value` < 0))'),
-      'OperationBalance' => array('Type' => 'Integer', 'Caption' => 'Zisk', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
+      'TaxBase' => array('Type' => 'Integer', 'Caption' => 'Základ daně', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
         'SQL' => '(SELECT ROUND(SUM(`FinanceOperation`.`Value`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Time` <= `DateEnd`) '.
         'AND (`FinanceOperation`.`Time` >= `DateStart`) AND (`FinanceOperation`.`Taxable` = 1))'),
@@ -233 +253 @@
     'Filter' => '1',
   ),
+  'TContract' => array(
+    'Type' => 'Reference',
+    'Table' => 'Contract',
+    'Id' => 'Id',
+    'Name' => 'BillCode',
+    'Filter' => '1',
+  ),
+  'TEmployee' => array(
+    'Type' => 'Reference',
+    'Table' => 'Employee',
+    'Id' => 'Id',
+    'Name' => 'CONCAT(FirstName, " ", SecondName)',
+    'Filter' => '1',
+  ),
+  'TEmployeeSalaryList' => array(
+    'Type' => 'ManyToOne',
+    'Table' => 'EmployeeSalary',
+    'Id' => 'Id',
+    'Ref' => 'Employee',
+    'Filter' => '1',
+  ),
   'TMemberListSubject' => array(
     'Type' => 'ManyToOne',