Changeset 747

Timestamp:

Sep 21, 2015, 12:12:26 AM (9 years ago)

Author:

chronos

Message:

• Modified: Removed columns ValueSign and Direction from FinanceOperation and FinanceInvoice tables. For both tables Value field will be computed as sum from items multiplied by ValueSign of selected group.

This solves problem with inconsistency between invoice and invoice items values and inconsistency between selected document line and incorrect positive or negative values.

Location:

trunk

Files:

• Application/FormClasses.php (modified) (2 diffs)
• Application/System.php (modified) (1 diff)
• Application/Version.php (modified) (1 diff)
• Common/Form/Form.php (modified) (2 diffs)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/Finance/Bill.php (modified) (3 diffs)
• Modules/Finance/Finance.php (modified) (17 diffs)
• Modules/Finance/Import.php (modified) (2 diffs)
• Modules/Finance/Manage.php (modified) (4 diffs)
• Modules/Finance/UserState.php (modified) (2 diffs)
• Modules/FinanceBankAPI/FileImport.php (modified) (3 diffs)
• Modules/IS/IS.php (modified) (5 diffs)
• Modules/Meteostation/Meteostation.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/Generators/Common.php (modified) (1 diff)
• Modules/News/NewsPage.php (modified) (1 diff)
• Modules/Subject/Subject.php (modified) (2 diffs)

trunk/Application/FormClasses.php

@@ -52 +52 @@
     'Items' => array(
       'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => ''),
-      'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => ''),      
+      'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => ''),
     ),
   ),
@@ -78 +78 @@
         'ReadOnly' => true),
       'Income' => array('Type' => 'Integer', 'Caption' => 'Příjmy', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
-        'SQL' => '(SELECT ROUND(SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`ValueSign`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Time` <= `DateEnd`) '.
-        'AND (`FinanceOperation`.`Time` >= `DateStart`) AND (`FinanceOperation`.`ValueSign` = 1))'),
+        '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 (`FinanceOperationGroup`.`ValueSign` = 1))'),
       'Spending' => array('Type' => 'Integer', 'Caption' => 'Výdaje', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
-        'SQL' => '(SELECT -ROUND(SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`ValueSign`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Time` <= `DateEnd`) '.
-        'AND (`FinanceOperation`.`Time` >= `DateStart`) AND (`FinanceOperation`.`ValueSign` = -1))'),
+        '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 (`FinanceOperationGroup`.`ValueSign` = -1))'),
       'OperationBalance' => array('Type' => 'Integer', 'Caption' => 'Zisk', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
-        'SQL' => '(SELECT ROUND(SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`ValueSign`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Time` <= `DateEnd`) '.
+        '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` * `FinanceOperation`.`ValueSign`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Time` <= `DateEnd`) '.
-        'AND (`FinanceOperation`.`Time` >= `DateStart`) AND (`FinanceOperation`.`Taxable` = 1) AND (`FinanceOperation`.`ValueSign` = 1))'),
+        '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`.`Taxable` = 1) AND (`FinanceOperationGroup`.`ValueSign` = 1))'),
       'TaxSpending' => array('Type' => 'Integer', 'Caption' => 'Daňové výdaje', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
-        'SQL' => '(SELECT -ROUND(SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`ValueSign`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Time` <= `DateEnd`) '.
-        'AND (`FinanceOperation`.`Time` >= `DateStart`) AND (`FinanceOperation`.`Taxable` = 1) AND (`FinanceOperation`.`ValueSign` = -1))'),
+        '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`.`Taxable` = 1) AND (`FinanceOperationGroup`.`ValueSign` = -1))'),
       'TaxBase' => array('Type' => 'Integer', 'Caption' => 'Základ daně', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
-        'SQL' => '(SELECT ROUND(SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`ValueSign`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Time` <= `DateEnd`) '.
+        'SQL' => '(SELECT ROUND(SUM(`FinanceOperation`.`Value`)) FROM `FinanceOperation` '.
+        'WHERE (`FinanceOperation`.`Time` <= `DateEnd`) '.
         'AND (`FinanceOperation`.`Time` >= `DateStart`) AND (`FinanceOperation`.`Taxable` = 1))'),
       'Claims' => array('Type' => 'Integer', 'Caption' => 'Pohledávky', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
-        'SQL' => '(SELECT ROUND(SUM(`FinanceInvoice`.`Value` * `FinanceInvoice`.`ValueSign`)) FROM `FinanceInvoice` WHERE (`FinanceInvoice`.`Time` <= `DateEnd`) '.
-        'AND (`FinanceInvoice`.`Time` >= `DateStart`) AND (`FinanceInvoice`.`ValueSign` = 1))'),
+        'SQL' => '(SELECT ROUND(SUM(`FinanceInvoice`.`Value`)) FROM `FinanceInvoice` '.
+        'LEFT JOIN `FinanceInvoiceGroup` ON `FinanceInvoiceGroup`.`Id`=`FinanceInvoice`.`Group` '.
+        'WHERE (`FinanceInvoice`.`Time` <= `DateEnd`) '.
+        'AND (`FinanceInvoice`.`Time` >= `DateStart`) AND (`FinanceInvoiceGroup`.`ValueSign` = 1))'),
       'Liabilities' => array('Type' => 'Integer', 'Caption' => 'Závazky', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
-        'SQL' => '(SELECT -ROUND(SUM(`FinanceInvoice`.`Value` * `FinanceInvoice`.`ValueSign`)) FROM `FinanceInvoice` WHERE (`FinanceInvoice`.`Time` <= `DateEnd`) '.
-        'AND (`FinanceInvoice`.`Time` >= `DateStart`) AND (`FinanceInvoice`.`ValueSign` = -1))'),
+        'SQL' => '(SELECT -ROUND(SUM(`FinanceInvoice`.`Value`)) FROM `FinanceInvoice` '.
+        'LEFT JOIN `FinanceInvoiceGroup` ON `FinanceInvoiceGroup`.`Id`=`FinanceInvoice`.`Group` '.
+        'WHERE (`FinanceInvoice`.`Time` <= `DateEnd`) '.
+        'AND (`FinanceInvoice`.`Time` >= `DateStart`) AND (`FinanceInvoiceGroup`.`ValueSign` = -1))'),
       'InvoiceBalance' => array('Type' => 'Integer', 'Caption' => 'Fakturační rozdíl', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
-        'SQL' => '(SELECT ROUND(SUM(`FinanceInvoice`.`Value` * `FinanceInvoice`.`ValueSign`)) FROM `FinanceInvoice` WHERE (`FinanceInvoice`.`Time` <= `DateEnd`) '.
+        'SQL' => '(SELECT ROUND(SUM(`FinanceInvoice`.`Value`)) FROM `FinanceInvoice` WHERE (`FinanceInvoice`.`Time` <= `DateEnd`) '.
         'AND (`FinanceInvoice`.`Time` >= `DateStart`))'),
     ),

trunk/Application/System.php

@@ -20 +20 @@
   /** @var AppModuleManager */
   var $ModuleManager;
+  /** @var FormManager */
+  var $FormManager;
+  /** @var Config */
+  var $ConfigManager;
   var $PathItems;
   var $RootURLFolder;

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 742; // Subversion revision
-$DatabaseRevision = 742; // SQL structure revision
-$ReleaseTime = strtotime('2015-07-05');
+$Revision = 747; // Subversion revision
+$DatabaseRevision = 747; // SQL structure revision
+$ReleaseTime = strtotime('2015-09-19');

trunk/Common/Form/Form.php

@@ -1 +1 @@
 <?php
 
-include_once(dirname(__FILE__).'/../Database.php');
 include_once(dirname(__FILE__).'/Types/Type.php');
 
@@ -232 +231 @@
     foreach($this->Definition['Items'] as $Index => $Item)
     {
-      if(!array_key_exists('ReadOnly', $Item)) $Item['ReadOnly'] = false;
-      if($Item['ReadOnly'] == false)
+      if(array_key_exists($Index, $this->Values))
       if(!array_key_exists($Item['Type'], $this->FormManager->FormTypes) or
       (array_key_exists($Item['Type'], $this->FormManager->FormTypes) and

trunk/Common/Setup/Updates.php

@@ -1489 +1489 @@
 }
 
+function UpdateTo748($Manager)
+{
+  $Manager->Execute('ALTER TABLE `FinanceOperation` ADD `ValueUser` FLOAT NOT NULL AFTER `Value`;');
+  $Manager->Execute('UPDATE `FinanceOperation` SET `ValueUser`=`Value`');
+  $Manager->Execute('UPDATE `FinanceOperation` SET `Value`=`ValueUser`*`ValueSign`');
+  $Manager->Execute('UPDATE `FinanceOperation` SET `Group`=1 WHERE (`ValueSign`=1) AND (`Cash`=1)');
+  $Manager->Execute('UPDATE `FinanceOperation` SET `Group`=2 WHERE (`ValueSign`=-1) AND (`Cash`=1)');
+  $Manager->Execute('UPDATE `FinanceOperation` SET `Group`=3 WHERE (`ValueSign`=1) AND (`Cash`=0)');
+  $Manager->Execute('UPDATE `FinanceOperation` SET `Group`=4 WHERE (`ValueSign`=-1) AND (`Cash`=0)');
+  $Manager->Execute('ALTER TABLE `FinanceOperation` DROP `Direction`, DROP `ValueSign`;');
+
+  // SELECT FinanceInvoice.* FROM `FinanceInvoice` LEFT JOIN FinanceInvoiceGroup ON FinanceInvoiceGroup.Id=FinanceInvoice.Group WHERE FinanceInvoice.ValueSign != FinanceInvoiceGroup.ValueSign
+  $Manager->Execute('UPDATE `FinanceInvoice` SET `Group`=1 WHERE (`ValueSign`=-1)');
+  $Manager->Execute('UPDATE `FinanceInvoice` SET `Group`=2 WHERE (`ValueSign`=1)');
+  $Manager->Execute('UPDATE `FinanceInvoice` SET `Value`=`Value`*`ValueSign`');
+  $Manager->Execute('ALTER TABLE `FinanceInvoice` DROP `Direction`, DROP `ValueSign`;');
+  // Check manual vs. calculated value from items
+  // SELECT * FROM (SELECT `FinanceInvoice`.`Id`, ((SELECT SUM(`Price` * `Quantity`) FROM `FinanceInvoiceItem` WHERE `FinanceInvoiceItem`.`FinanceInvoice`=`FinanceInvoice`.`Id`) * `FinanceInvoiceGroup`.`ValueSign`) AS `Sum`,`FinanceInvoice`.`Value` FROM `FinanceInvoice` LEFT JOIN `FinanceInvoiceGroup` ON `FinanceInvoiceGroup`.`Id`=`FinanceInvoice`.`Group`) AS `T` WHERE `Sum` != `Value`
+}
 
 class Updates
@@ -1557 +1576 @@
       735 => array('Revision' => 736, 'Function' => 'UpdateTo736'),
       736 => array('Revision' => 739, 'Function' => 'UpdateTo739'),
-          739 => array('Revision' => 740, 'Function' => 'UpdateTo740'),
+      739 => array('Revision' => 740, 'Function' => 'UpdateTo740'),
       740 => array('Revision' => 741, 'Function' => 'UpdateTo741'),
       741 => array('Revision' => 742, 'Function' => 'UpdateTo742'),
+      742 => array('Revision' => 748, 'Function' => 'UpdateTo748'),
     ));
   }

trunk/Modules/Finance/Bill.php

@@ -52 +52 @@
   function GenerateHTML()
   {
-    $DbResult = $this->Database->select('FinanceInvoice', '*', '`Id`='.$this->InvoiceId);
+    $DbResult = $this->Database->query('SELECT `FinanceInvoice`.*, `FinanceInvoiceGroup`.`Direction` FROM `FinanceInvoice` '.
+      'LEFT JOIN `FinanceInvoiceGroup` ON `FinanceInvoiceGroup`.`Id`=`FinanceInvoice`.`Group` '.
+      'WHERE `FinanceInvoice`.`Id`='.$this->InvoiceId);
     $Invoice = $DbResult->fetch_assoc();
 
@@ -79 +81 @@
 
     // If direction is in => switch sides
-    if($Invoice['Direction'] == FINANCE_DIRECTION_OUT) 
-    {           
+    if($Invoice['Direction'] == FINANCE_DIRECTION_OUT)
+    {
     }
     else if($Invoice['Direction'] == FINANCE_DIRECTION_IN)
@@ -151 +153 @@
   function GenerateHTML()
   {
-    $DbResult = $this->Database->select('FinanceOperation', '*', '`Id`='.$this->OperationId);
+    $DbResult = $this->Database->query('SELECT `FinanceOperation`.*, `FinanceOperationGroup`.`Direction` FROM `FinanceOperation` '.
+      'LEFT JOIN `FinanceOperationGroup` ON `FinanceOperationGroup`.`Id`=`FinanceOperation`.`Group` '.
+      'WHERE `FinanceOperation`.`Id`='.$this->OperationId);
     $Operation = $DbResult->fetch_assoc();
 

trunk/Modules/Finance/Finance.php

@@ -109 +109 @@
   }
 
+  function GetNextDocumentLineNumberId($Id, $FinanceYear = 0)
+  {
+    $Code = $this->GetNextDocumentLineNumber($Id, $FinanceYear);
+    $this->Database->insert('DocumentLineCode', array('DocumentLine' => $Id, 'Name' => $Code));
+    return $this->Database->insert_id;
+  }
+
   function GetFinanceGroupById($Id, $Table)
   {
@@ -125 +132 @@
     while($Member = $DbResult->fetch_assoc())
     {
-      $DbResult2 = $this->Database->query('SELECT ((SELECT COALESCE(SUM(`Value` * `ValueSign`), 0) FROM `FinanceOperation` '.
-          'WHERE `Subject`='.$Member['Subject'].') - (SELECT COALESCE(SUM(`Value` * `ValueSign`), 0) FROM `FinanceInvoice` '.
+      $DbResult2 = $this->Database->query('SELECT ((SELECT COALESCE(SUM(`Value`), 0) FROM `FinanceOperation` '.
+          'WHERE `Subject`='.$Member['Subject'].') - (SELECT COALESCE(SUM(`Value`), 0) FROM `FinanceInvoice` '.
           'WHERE `Subject`='.$Member['Subject'].')) AS `Cash`');
       $Cash = $DbResult2->fetch_row();
@@ -220 +227 @@
         'Cash' => array('Type' => 'Boolean', 'Caption' => 'Hotově', 'Default' => ''),
         'Taxable' => array('Type' => 'Boolean', 'Caption' => 'Zdanitelné', 'Default' => ''),
-        'Direction' => array('Type' => 'TFinanceDirection', 'Caption' => 'Směr', 'Default' => '0'),
-        'ValueSign' => array('Type' => 'TFinanceValueSign', 'Caption' => 'Znaménko', 'Default' => '1'),
-        'Value' => array('Type' => 'Integer', 'Caption' => 'Částka', 'Default' => '0', 'Suffix' => 'Kč'),
+        'Value' => array('Type' => 'Integer', 'Caption' => 'Částka absolutní', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true),
+        'ValueUser' => array('Type' => 'Integer', 'Caption' => 'Částka', 'Default' => '0', 'Suffix' => 'Kč'),
         'File' => array('Type' => 'TFile', 'Caption' => 'Doklad', 'Default' => '', 'Null' => true),
         'Text' => array('Type' => 'String', 'Caption' => 'Popis', 'Default' => ''),
@@ -232 +238 @@
       ),
       'BeforeInsert' => array($this, 'BeforeInsertFinanceOperation'),
+      'AfterInsert' => array($this, 'AfterInsertFinanceOperation'),
+      'BeforeModify' => array($this, 'BeforeModifyFinanceOperation'),
     ));
 
@@ -243 +251 @@
     $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['Cash']['Filter'] = false;
     $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['BankAccount']['Hidden'] = true;
+    $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['Value']['Hidden'] = true;
 
     $this->System->FormManager->RegisterClass('FinanceTreasuryOut', $this->System->FormManager->Classes['FinanceOperation']);
@@ -253 +262 @@
     $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['Cash']['Filter'] = false;
     $this->System->FormManager->Classes['FinanceTreasuryOut']['Items']['BankAccount']['Hidden'] = true;
+    $this->System->FormManager->Classes['FinanceTreasuryOut']['Items']['Value']['Hidden'] = true;
 
     $this->System->FormManager->RegisterClass('FinanceAccountIn', $this->System->FormManager->Classes['FinanceOperation']);
@@ -263 +273 @@
     $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['Cash']['Filter'] = false;
     $this->System->FormManager->Classes['FinanceAccountIn']['Items']['Treasury']['Hidden'] = true;
+    $this->System->FormManager->Classes['FinanceAccountIn']['Items']['Value']['Hidden'] = true;
 
     $this->System->FormManager->RegisterClass('FinanceAccountOut', $this->System->FormManager->Classes['FinanceOperation']);
@@ -273 +284 @@
     $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['Cash']['Filter'] = false;
     $this->System->FormManager->Classes['FinanceAccountOut']['Items']['Treasury']['Hidden'] = true;
+    $this->System->FormManager->Classes['FinanceAccountOut']['Items']['Value']['Hidden'] = true;
 
     $this->System->FormManager->RegisterClass('FinanceOperationGroup', array(
@@ -311 +323 @@
         'TimeDue' => array('Type' => 'Date', 'Caption' => 'Čas splatnosti', 'Default' => ''),
         'TimePayment' => array('Type' => 'Date', 'Caption' => 'Čas zaplacení', 'Default' => '', 'Null' => true),
-        'Direction' => array('Type' => 'TFinanceDirection', 'Caption' => 'Směr', 'Default' => '0'),
-        'ValueSign' => array('Type' => 'TFinanceValueSign', 'Caption' => 'Znaménko', 'Default' => '1'),
-        'Value' => array('Type' => 'Integer', 'Caption' => 'Částka', 'Default' => '0', 'Suffix' => 'Kč'),
-        'File' => array('Type' => 'TFile', 'Caption' => 'Doklad', 'Default' => '', 'Null' => true),
+        'Value' => array('Type' => 'Integer', 'Caption' => 'Částka absolutní', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true),
+        'ValueUser' => array('Type' => 'Integer', 'Caption' => 'Částka', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
+          'SQL' => 'SELECT SUM(CEIL(`Price`*`Quantity`)) FROM `FinanceInvoiceItem` WHERE `FinanceInvoiceItem`.`FinanceInvoice`=#Id'),
         'Generate' => array('Type' => 'Boolean', 'Caption' => 'Generovat', 'Default' => ''),
         'PeriodFrom' => array('Type' => 'Date', 'Caption' => 'Období od', 'Default' => '', 'Null' => true),
@@ -325 +336 @@
           'WHERE `FinanceInvoiceOperationRel`.`Invoice`=#Id)'),
       ),
-      'BeforeInsert' => array($this, 'BeforeInsertFinanceOperation'),
+      'BeforeInsert' => array($this, 'BeforeInsertFinanceInvoice'),
+      'AfterInsert' => array($this, 'AfterInsertFinanceInvoice'),
+      'BeforeModify' => array($this, 'BeforeModifyFinanceInvoice'),
     ));
     $this->System->FormManager->RegisterClass('FinanceInvoiceIn', $this->System->FormManager->Classes['FinanceInvoice']);
@@ -332 +345 @@
     $this->System->FormManager->Classes['FinanceInvoiceIn']['Items']['Group']['Hidden'] = true;
     $this->System->FormManager->Classes['FinanceInvoiceIn']['Items']['Group']['Filter'] = true;
+    $this->System->FormManager->Classes['FinanceInvoiceIn']['Items']['Value']['Hidden'] = true;
 
     $this->System->FormManager->RegisterClass('FinanceInvoiceOut', $this->System->FormManager->Classes['FinanceInvoice']);
@@ -338 +352 @@
     $this->System->FormManager->Classes['FinanceInvoiceOut']['Items']['Group']['Hidden'] = true;
     $this->System->FormManager->Classes['FinanceInvoiceOut']['Items']['Group']['Filter'] = true;
+    $this->System->FormManager->Classes['FinanceInvoiceOut']['Items']['Value']['Hidden'] = true;
 
     $this->System->FormManager->RegisterClass('FinanceInvoiceGroup', array(
@@ -346 +361 @@
         'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => '0'),
         'ValueSign' => array('Type' => 'TFinanceValueSign', 'Caption' => 'Znaménko hodnoty', 'Default' => '0'),
-        'Direction' => array('Type' => 'TFinanceDirection', 'Caption' => 'Směr', 'Default' => '0'),
+        'Direction' => array('Type' => 'TFinanceDirection', 'Caption' => 'Směr', 'Default' => '0'),
       ),
     ));
@@ -377 +392 @@
           'ReadOnly' => true, 'SQL' => 'CEIL(`Price` * `Quantity`)'),
       ),
+      'AfterInsert' => array($this, 'AfterInsertFinanceInvoiceItem'),
+      'AfterModify' => array($this, 'AfterModifyFinanceInvoiceItem'),
+      'AfterDelete' => array($this, 'AfterModifyFinanceInvoiceItem'),
     ));
     $this->System->FormManager->RegisterClass('FinanceTreasury', array(
@@ -386 +404 @@
         '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` * `FinanceOperation`.`ValueSign`) FROM `FinanceOperation` '.
+          'ReadOnly' => true, 'Suffix' => 'Kč', 'SQL' => '(SELECT SUM(`FinanceOperation`.`Value`) FROM `FinanceOperation` '.
           'WHERE `FinanceOperation`.`Treasury`=#Id)'),
         'Operations' => array('Type' => 'TFinanceOperationListTreasury', 'Caption' => 'Operace', 'Default' => ''),
@@ -417 +435 @@
         '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` * `FinanceOperation`.`ValueSign`) FROM `FinanceOperation` '.
+          'ReadOnly' => true, 'Suffix' => 'Kč', 'SQL' => '(SELECT SUM(`FinanceOperation`.`Value`) FROM `FinanceOperation` '.
           'WHERE `FinanceOperation`.`BankAccount`=#Id)'),
         'AutoImport' => array('Type' => 'Boolean', 'Caption' => 'Automaticky stahovat z banky', 'Default' => ''),
@@ -551 +569 @@
       else $Year = date("Y", $Form->Values['ValidFrom']);
     $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById($Form->Values['Group'], 'FinanceOperationGroup');
-    $Form->Values['BillCode'] = $this->System->Modules['Finance']->GetNextDocumentLineNumber($FinanceGroup['DocumentLine'], $Year);
+    $Form->Values['BillCode'] = $this->System->Modules['Finance']->GetNextDocumentLineNumberId($FinanceGroup['DocumentLine'], $Year);
+    return($Form->Values);
+  }
+
+  function AfterInsertFinanceOperation($Form, $Id)
+  {
+    $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById($Form->Values['Group'], 'FinanceOperationGroup');
+    $this->Database->query('UPDATE `'.$Form->Definition['Table'].'` SET `Value`= '.
+      ($Form->Values['ValueUser'] * $FinanceGroup['ValueSign']).' WHERE `Id`='.$Id);
+    return($Form->Values);
+  }
+
+  function BeforeModifyFinanceOperation($Form, $Id)
+  {
+    $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById($Form->Values['Group'], 'FinanceOperationGroup');
+    $this->Database->query('UPDATE `'.$Form->Definition['Table'].'` SET `Value`= '.
+      ($Form->Values['ValueUser'] * $FinanceGroup['ValueSign']).' WHERE `Id`='.$Id);
+    return($Form->Values);
+  }
+
+  function BeforeInsertFinanceInvoice($Form)
+  {
+    if(array_key_exists('Time', $Form->Values)) $Year = date("Y", $Form->Values['Time']);
+      else $Year = date("Y", $Form->Values['ValidFrom']);
+    $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById($Form->Values['Group'], 'FinanceInvoiceGroup');
+    $Form->Values['BillCode'] = $this->System->Modules['Finance']->GetNextDocumentLineNumberId($FinanceGroup['DocumentLine'], $Year);
+    return($Form->Values);
+  }
+
+  function AfterInsertFinanceInvoice($Form, $Id)
+  {
+    $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById($Form->Values['Group'], 'FinanceInvoiceGroup');
+    $DbResult = $this->Database->query(str_replace('#Id', $Id, $Form->Definition['Items']['ValueUser']['SQL']));
+    $DbRow = $DbResult->fetch_row();
+    $Sum = $DbRow[0];
+
+    $this->Database->query('UPDATE `'.$Form->Definition['Table'].'` SET `Value`= '.
+      ($Sum * $FinanceGroup['ValueSign']).' WHERE `Id`='.$Id);
+    return($Form->Values);
+  }
+
+  function BeforeModifyFinanceInvoice($Form, $Id)
+  {
+    $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById($Form->Values['Group'], 'FinanceInvoiceGroup');
+    $DbResult = $this->Database->query(str_replace('#Id', $Id, $Form->Definition['Items']['ValueUser']['SQL']));
+    $DbRow = $DbResult->fetch_row();
+    $Sum = $DbRow[0];
+    $this->Database->query('UPDATE `'.$Form->Definition['Table'].'` SET `Value`= '.
+      ($Sum * $FinanceGroup['ValueSign']).' WHERE `Id`='.$Id);
+    return($Form->Values);
+  }
+
+  function AfterInsertFinanceInvoiceItem($Form, $Id)
+  {
+    $ParentForm = new Form($this->System->FormManager);
+    $ParentForm->SetClass('FinanceInvoice');
+    $ParentForm->LoadValuesFromDatabase($Form->Values['FinanceInvoice']);
+    $this->AfterInsertFinanceInvoice($ParentForm, $Form->Values['FinanceInvoice']);
+    return($Form->Values);
+  }
+
+  function AfterModifyFinanceInvoiceItem($Form, $Id)
+  {
+    $ParentForm = new Form($this->System->FormManager);
+    $ParentForm->SetClass('FinanceInvoice');
+    $ParentForm->LoadValuesFromDatabase($Form->Values['FinanceInvoice']);
+    $this->BeforeModifyFinanceInvoice($ParentForm, $Form->Values['FinanceInvoice']);
     return($Form->Values);
   }

trunk/Modules/Finance/Import.php

@@ -120 +120 @@
   }
 
-  function InsertMoney($Subject, $Value, $ValueSign, $Cash, $Taxable, $Time, $Text, $Group)
+  function InsertMoney($Subject, $Value, $Cash, $Taxable, $Time, $Text, $Group)
   {
     $Year = date('Y', $Time);
-    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($Group['DocumentLine'], $Year);
+    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumberId($Group['DocumentLine'], $Year);
     // TODO: Fixed BankAccount=1, allow to select bank account for import
     $this->Database->insert('FinanceOperation', array('Text' => $Text,
-      'Subject' => $Subject, 'Cash' => $Cash, 'Value' => $Value, 'ValueSign' => $ValueSign,
+      'Subject' => $Subject, 'Cash' => $Cash, 'ValueUser' => $Value, 'Value' => $Value * $Group['ValueSign'],
       'Time' => TimeToMysqlDateTime($Time), 'Taxable' => $Taxable, 'BillCode' => $BillCode,
       'BankAccount' => 1, 'Group' => $Group['Id']));
+    // TODO: Update Value
   }
 
@@ -146 +147 @@
       $Date = explode('-', $_POST['Date'.$I]);
       $Date = mktime(0, 0, 0, $Date[1], $Date[2], $Date[0]);
-      $this->InsertMoney($_POST['Subject'.$I], Abs($_POST['Money'.$I]), $FinanceGroup['ValueSign'],
+      $this->InsertMoney($_POST['Subject'.$I], Abs($_POST['Money'.$I]),
         0, $_POST['Taxable'.$I], $Date, $_POST['Text'.$I], $FinanceGroup);
       $Output .= $I.', ';

trunk/Modules/Finance/Manage.php

@@ -100 +100 @@
   }
 
-  function InsertInvoice($Subject, $TimeCreation, $TimeDue, $ValueSign, $Items,
-  $Group, $PeriodFrom, $PeriodTo, $Direction)
+  function InsertInvoice($Subject, $TimeCreation, $TimeDue, $Items,
+    $Group, $PeriodFrom, $PeriodTo)
   {
     global $LastInsertTime;
 
     $Year = date('Y', $TimeCreation);
-    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($Group['DocumentLine'], $Year);
+    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumberId($Group['DocumentLine'], $Year);
     $SumValue = 0;
     foreach($Items as $Item) {
@@ -113 +113 @@
     $this->Database->insert('FinanceInvoice', array(
       'Subject' => $Subject, 'Time' => TimeToMysqlDateTime($TimeCreation),
-      'TimeDue' => TimeToMysqlDateTime($TimeDue), 'Value' => $SumValue,
-      'ValueSign' => $ValueSign, 'BillCode' => $BillCode, 'Direction' => $Direction,
+      'TimeDue' => TimeToMysqlDateTime($TimeDue), 'Value' => $SumValue * $Group['ValueSign'],
+      'BillCode' => $BillCode,
       'PeriodFrom' => TimeToMysqlDate($PeriodFrom), 'PeriodTo' => TimeToMysqlDate($PeriodTo),
-      'Generate' => 1, 'Group' => $FinanceGroup['Id']));
+      'Generate' => 1, 'Group' => $Group['Id']));
     $InvoiceId = $this->Database->insert_id;
     foreach($Items as $Item)
@@ -185 +185 @@
           $Output .= $TimePeriodText.': '.$MonthlyTotal.' * '.$Period['MonthCount'].' = '.$PayPerPeriod.'<br />';
           $this->InsertInvoice($Member['Subject'], time(), time() + 3600 * 24 * INVOICE_DUE_DAYS,
-            $FinanceGroup['ValueSign'], $InvoiceItems, $FinanceGroup, $Period['From'], 
-                $Period['To'], $FinanceGroup['Direction']);
+            $InvoiceItems, $FinanceGroup, $Period['From'],
+            $Period['To']);
 
           $Output .= $this->SendPaymentEmail($Member['Id']);
@@ -358 +358 @@
         '<th style="border-style: solid; border-width: 1px; padding: 1px 5px 1px 5px; text-align: center; font-weight: bold;">Popis</th>'.
         '<th style="border-style: solid; border-width: 1px; padding: 1px 5px 1px 5px; text-align: center; font-weight: bold;">Částka [Kč]</th></tr>'."\n";
-      $DbResult = $this->Database->query('SELECT T1.* FROM ((SELECT `Text`, `Time`, (`Value`*`ValueSign`) AS `Value`, `File` FROM `FinanceOperation` WHERE (`Subject`='.$Member['Subject'].')) UNION ALL '.
+      $DbResult = $this->Database->query('SELECT T1.* FROM ((SELECT `Text`, `Time`, `Value`, `File` FROM `FinanceOperation` WHERE (`Subject`='.$Member['Subject'].')) UNION ALL '.
         '(SELECT (SELECT GROUP_CONCAT(`Description` SEPARATOR ", ") FROM `FinanceInvoiceItem` '.
         'WHERE `FinanceInvoiceItem`.`FinanceInvoice` = `FinanceInvoice`.`Id`) AS `Text`, '.
-        '`Time`, -(`Value`*`ValueSign`) AS `Value`, `File` FROM `FinanceInvoice` WHERE (`Subject`='.
+        '`Time`, -`Value`, `File` FROM `FinanceInvoice` WHERE (`Subject`='.
         $Member['Subject'].')) ORDER BY `Time` DESC) AS `T1` WHERE (`T1`.`Time` > "'.$Member['BillingPeriodLastDate'].'")');
       while($DbRow = $DbResult->fetch_assoc())

trunk/Modules/Finance/UserState.php

@@ -9 +9 @@
   function ShowFinanceOperation($Subject)
   {
-    $UserOperationTableQuery = '((SELECT `Text`, `Time`, (`Value`*`ValueSign`) AS `Value`, `File`, `BillCode`, NULL AS `PeriodFrom`, NULL AS `PeriodTo` '.
+    $UserOperationTableQuery = '((SELECT `Text`, `Time`, `Value`, `File`, `BillCode`, NULL AS `PeriodFrom`, NULL AS `PeriodTo` '.
       'FROM `FinanceOperation` WHERE (`Subject`='.$Subject['Id'].')) UNION ALL '.
       '(SELECT (SELECT GROUP_CONCAT(`Description` SEPARATOR ",") FROM `FinanceInvoiceItem` WHERE `FinanceInvoice`=`FinanceInvoice`.`Id`) AS `Text`, '.
-      '`Time`, -(`Value`*`ValueSign`) AS `Value`, `File`, `BillCode`, `PeriodFrom`, `PeriodTo` FROM `FinanceInvoice` WHERE (`Subject`='.$Subject['Id'].')))';
+      '`Time`, -`Value`, `File`, `BillCode`, `PeriodFrom`, `PeriodTo` FROM `FinanceInvoice` WHERE (`Subject`='.$Subject['Id'].')))';
 
     $Output = '<div style="text-align:center">Výpis finančních operací</div>';
@@ -105 +105 @@
 
     // Account state
-    $UserOperationTableQuery = '((SELECT `Text`, `Time`, (`Value`*`ValueSign`) AS `Value`, `File`, `BillCode`, NULL AS `PeriodFrom`, NULL AS `PeriodTo` '.
+    $UserOperationTableQuery = '((SELECT `Text`, `Time`, `Value`, `File`, `BillCode`, NULL AS `PeriodFrom`, NULL AS `PeriodTo` '.
       'FROM `FinanceOperation` WHERE (`Subject`='.$Subject['Id'].')) UNION ALL '.
       '(SELECT (SELECT GROUP_CONCAT(`Description` SEPARATOR ",") FROM `FinanceInvoiceItem` WHERE `FinanceInvoice`=`FinanceInvoice`.`Id`) AS `Text`, '.
-      '`Time`, -(`Value`*`ValueSign`) AS `Value`, `File`, `BillCode`, `PeriodFrom`, `PeriodTo` FROM `FinanceInvoice` WHERE (`Subject`='.$Subject['Id'].')) ORDER BY `Time` DESC) AS `T1`';
+      '`Time`, -`Value`, `File`, `BillCode`, `PeriodFrom`, `PeriodTo` FROM `FinanceInvoice` WHERE (`Subject`='.$Subject['Id'].')) ORDER BY `Time` DESC) AS `T1`';
     $DbResult = $this->Database->query('SELECT SUM(`T1`.`Value`) AS `Total` FROM '.$UserOperationTableQuery);
     $DbRow = $DbResult->fetch_array();

trunk/Modules/FinanceBankAPI/FileImport.php

@@ -40 +40 @@
           }
           $Year = date('Y', MysqlDateToTime($DbRow['Time']));
-          $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($FinanceGroup['DocumentLine'], $Year);
+          $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumberId($FinanceGroup['DocumentLine'], $Year);
           $DbResult3 = $this->Database->insert('FinanceOperation', array('Subject' => $DbRow2['Id'], 'Cash' => 0,
-            'Value' => Abs($DbRow['Value']), 'ValueSign' => $FinanceGroup['ValueSign'], 'Taxable' => 1, 'BankAccount' => $DbRow['BankAccount'], 'Network' => 1,
+            'Value' => Abs($DbRow['Value']), 'Taxable' => 1, 'BankAccount' => $DbRow['BankAccount'], 'Network' => 1,
             'Time' => $DbRow['Time'], 'Text' => $DbRow['Description'], 'BillCode' => $BillCode, 'Group' => $FinanceGroup['Id']));
           $this->Database->update('FinanceBankImport', 'Id='.$DbRow['Id'], array('FinanceOperation' => $this->Database->insert_id));
@@ -136 +136 @@
   }
 
-  function InsertMoney($Subject, $Value, $ValueSign, $Cash, $Taxable, $Time, $Text, $Group)
+  function InsertMoney($Subject, $Value, $Cash, $Taxable, $Time, $Text, $Group)
   {
     $Year = date('Y', $Time);
-    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($Group['DocumentLine'], $Year);
+    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumberId(
+      $Group['DocumentLine'], $Year);
     $this->Database->insert('FinanceOperation', array('Text' => $Text,
-      'Subject' => $Subject, 'Cash' => $Cash, 'Value' => $Value, 'ValueSign' => $ValueSign,
+      'Subject' => $Subject, 'Cash' => $Cash, 'ValueUser' => $Value, 'Value' => $Value * $Group['ValueSign'],
       'Time' => TimeToMysqlDateTime($Time), 'Taxable' => $Taxable, 'BillCode' => $BillCode));
   }
@@ -153 +154 @@
     {
       if($_POST['Money'.$I] >= 0) {
-        $FinanceGroup = $Finance->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_IN, 'FinanceOperationGroup');
+        $FinanceGroup = $Finance->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_IN,
+          'FinanceOperationGroup');
       } else {
-        $FinanceGroup = $Finance->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_OUT, 'FinanceOperationGroup');
+        $FinanceGroup = $Finance->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_OUT,
+          'FinanceOperationGroup');
       }
       $Date = explode('-', $_POST['Date'.$I]);
       $Date = mktime(0, 0, 0, $Date[1], $Date[2], $Date[0]);
-      $this->InsertMoney($_POST['Subject'.$I], Abs($_POST['Money'.$I]), $FinanceGroup['ValueSign'],
+      $this->InsertMoney($_POST['Subject'.$I], Abs($_POST['Money'.$I]),
         0, $_POST['Taxable'.$I], $Date, $_POST['Text'.$I], $FinanceGroup);
       $Output .= $I.', ';

trunk/Modules/IS/IS.php

@@ -101 +101 @@
     $Output .= 'Registrovaných zařízení: '.$DbRow['0'].'<br/>';
 
-    $DbResult = $this->Database->select('FinanceOperation', 'SUM(`Value` * `ValueSign`)', '1');
+    $DbResult = $this->Database->select('FinanceOperation', 'SUM(`Value`)', '1');
     $DbRow = $DbResult->fetch_row();
     $Output .= 'Stav placení: '.$DbRow['0'].'<br/>';
@@ -187 +187 @@
         try {
           $Form->Validate();
+          if(array_key_exists('BeforeModify', $Form->Definition))
+          {
+            $Class = $Form->Definition['BeforeModify'][0];
+            $Method = $Form->Definition['BeforeModify'][1];
+            $Form->Values = $Class->$Method($Form, $Id);
+          }
           $this->LogChange($Form, 'Edit', $Id, $Id);
           $Form->SaveValuesToDatabase($Id);
           $Output .= $this->SystemMessage('Úprava položky', 'Položka upravena');
           $Output .= $this->ShowView($Table, $Id);
+          if(array_key_exists('AfterModify', $Form->Definition))
+          {
+            $Class = $Form->Definition['AfterModify'][0];
+            $Method = $Form->Definition['AfterModify'][1];
+            $Form->Values = $Class->$Method($Form, $Id);
+          }
         } catch (Exception $E)
         {
@@ -237 +249 @@
       try {
         $Form = new Form($this->System->FormManager);
+        $Form->SetClass($Table);
+        $Form->LoadValuesFromDatabase($Id);
         $this->ShortTitle .= ' - '.$Form->Definition['Title'].' odstranění';
-        $Form->SetClass($Table);
         $this->LogChange($Form, 'Delete', 0, $Id);
         $this->Database->delete($Table, '`Id`='.$Id);
         $Output .= $this->SystemMessage('Smazání položky', 'Položka odstraněna');
+        if(array_key_exists('AfterDelete', $Form->Definition))
+        {
+          $Class = $Form->Definition['AfterDelete'][0];
+          $Method = $Form->Definition['AfterDelete'][1];
+          $Class->$Method($Form, $Id);
+        }
       } catch (Exception $E)
       {
-        $Output .= $this->SystemMessage('Smazání položky', 'Položku se nepodařilo smazat. Pravděpodobně na ni závisejí další položky.');
+        $Output .= $this->SystemMessage('Smazání položky', 'Položku se nepodařilo smazat. Pravděpodobně na ni závisejí další položky.<br/>'.$E->getMessage());
       }
     } else $Output .= $this->SystemMessage('Smazání položky', 'Položka nenalezena');
@@ -270 +289 @@
             $Class = $Form->Definition['BeforeInsert'][0];
             $Method = $Form->Definition['BeforeInsert'][1];
-            $this->Values = $Class->$Method($Form);
+            $Form->Values = $Class->$Method($Form);
           }
           $Form->Validate();
@@ -282 +301 @@
             $Class = $Form->Definition['AfterInsert'][0];
             $Method = $Form->Definition['AfterInsert'][1];
-            $this->Values = $Class->$Method($Form);
+            $Form->Values = $Class->$Method($Form, $Id);
           }
           // Add action to update caller form

trunk/Modules/Meteostation/Meteostation.php

@@ -1 +1 @@
 <?php
-
-include_once(dirname(__FILE__).'/../../Common/Image.php');
-include_once(dirname(__FILE__).'/../../Common/Global.php');
 
 class PageMeteo extends Page

trunk/Modules/NetworkConfigRouterOS/Generators/Common.php

@@ -1 +1 @@
 <?php
-
-include_once(dirname(__FILE__).'/../../../Common/NetworkAddress.php');
 
 function GetMarkByComment($Comment)

trunk/Modules/News/NewsPage.php

@@ -1 +1 @@
 <?php
-
-include_once(dirname(__FILE__).'/../../Common/RSS.php');
 
 class PageNews extends Page

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` * `FinanceOperation`.`ValueSign`) FROM `FinanceOperation` '.
-          'WHERE `FinanceOperation`.`Subject`=#Id), 0) - IFNULL((SELECT SUM(`FinanceInvoice`.`Value` * `FinanceInvoice`.`ValueSign`) FROM `FinanceInvoice` '.
+          'ReadOnly' => true, 'Suffix' => 'Kč', 'SQL' => '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' => ''),
@@ -57 +57 @@
         'Id' => array('Type' => 'TSubject', 'Caption' => 'Subjekt', 'Default' => '', 'ReadOnly' => true),
         'Income' => array('Type' => 'Integer', 'Caption' => 'Příjmy', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
-          'SQL' => '(SELECT ROUND(SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`ValueSign`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Subject` = TX.`Id`) '.
-          'AND (`FinanceOperation`.`ValueSign` = 1))'),
+          'SQL' => '(SELECT ROUND(SUM(`FinanceOperation`.`Value`)) FROM `FinanceOperation` '.
+            'LEFT JOIN `FinanceOperationGroup` ON `FinanceOperationGroup`.`Id`=`FinanceOperation`.`Group` '.
+            'WHERE (`FinanceOperation`.`Subject` = TX.`Id`) '.
+            'AND (`FinanceOperationGroup`.`ValueSign` = 1))'),
         'Spending' => array('Type' => 'Integer', 'Caption' => 'Výdaje', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
-          'SQL' => '(SELECT -ROUND(SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`ValueSign`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Subject` = TX.`Id`) '.
-          'AND (`FinanceOperation`.`ValueSign` = -1))'),
+          'SQL' => '(SELECT -ROUND(SUM(`FinanceOperation`.`Value`)) FROM `FinanceOperation` '.
+            'LEFT JOIN `FinanceOperationGroup` ON `FinanceOperationGroup`.`Id`=`FinanceOperation`.`Group` '.
+            'WHERE (`FinanceOperation`.`Subject` = TX.`Id`) '.
+            'AND (`FinanceOperationGroup`.`ValueSign` = -1))'),
         'OperationBalance' => array('Type' => 'Integer', 'Caption' => 'Zisk', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
-          'SQL' => '(SELECT ROUND(SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`ValueSign`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Subject` = TX.`Id`) '.
+          'SQL' => '(SELECT ROUND(SUM(`FinanceOperation`.`Value`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Subject` = TX.`Id`) '.
           ')'),
       ),