Changeset 740

Timestamp:

Jul 3, 2015, 11:36:07 PM (9 years ago)

Author:

chronos

Message:

• Modified: Changed Direction column of FinanceOperation and Invoices to more general ValueSign.
• FinanceOperationGroup and InvoiceGroup tables introduced and operations and invoices are now linked directly

to group id instead of DocumentLine.

Location:

trunk

Files:

• Application/FormClasses.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/Finance/Bill.php (modified) (3 diffs)
• Modules/Finance/Finance.php (modified) (10 diffs)
• Modules/Finance/Import.php (modified) (2 diffs)
• Modules/Finance/Manage.php (modified) (4 diffs)
• Modules/Finance/UserState.php (modified) (2 diffs)
• Modules/Finance/Zivnost.php (modified) (11 diffs)
• Modules/FinanceBankAPI/FileImport.php (modified) (3 diffs)
• Modules/FinanceBankAPI/FinanceBankAPI.php (modified) (2 diffs)
• Modules/IS/IS.php (modified) (2 diffs)
• Modules/NetworkConfigLinux/Generators/DNS.php (modified) (1 diff)
• Modules/Subject/Subject.php (modified) (2 diffs)

trunk/Application/FormClasses.php

@@ -68 +68 @@
         'ReadOnly' => true),
       'Income' => array('Type' => 'Integer', 'Caption' => 'Příjmy', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
-        'SQL' => '(SELECT ROUND(SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`Direction`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Time` <= `DateEnd`) '.
-        'AND (`FinanceOperation`.`Time` >= `DateStart`) AND (`FinanceOperation`.`Direction` = 1))'),
+        'SQL' => '(SELECT ROUND(SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`ValueSign`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Time` <= `DateEnd`) '.
+        'AND (`FinanceOperation`.`Time` >= `DateStart`) AND (`FinanceOperation`.`ValueSign` = 1))'),
       'Spending' => array('Type' => 'Integer', 'Caption' => 'Výdaje', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
-        'SQL' => '(SELECT -ROUND(SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`Direction`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Time` <= `DateEnd`) '.
-        'AND (`FinanceOperation`.`Time` >= `DateStart`) AND (`FinanceOperation`.`Direction` = -1))'),
+        'SQL' => '(SELECT -ROUND(SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`ValueSign`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Time` <= `DateEnd`) '.
+        'AND (`FinanceOperation`.`Time` >= `DateStart`) AND (`FinanceOperation`.`ValueSign` = -1))'),
       'OperationBalance' => array('Type' => 'Integer', 'Caption' => 'Zisk', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
-        'SQL' => '(SELECT ROUND(SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`Direction`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Time` <= `DateEnd`) '.
+        'SQL' => '(SELECT ROUND(SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`ValueSign`)) 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`.`Direction`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Time` <= `DateEnd`) '.
-        'AND (`FinanceOperation`.`Time` >= `DateStart`) AND (`FinanceOperation`.`Taxable` = 1) AND (`FinanceOperation`.`Direction` = 1))'),
+        '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))'),
       'TaxSpending' => array('Type' => 'Integer', 'Caption' => 'Daňové výdaje', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
-        'SQL' => '(SELECT -ROUND(SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`Direction`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Time` <= `DateEnd`) '.
-        'AND (`FinanceOperation`.`Time` >= `DateStart`) AND (`FinanceOperation`.`Taxable` = 1) AND (`FinanceOperation`.`Direction` = -1))'),
+        '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))'),
       'TaxBase' => array('Type' => 'Integer', 'Caption' => 'Základ daně', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
-        'SQL' => '(SELECT ROUND(SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`Direction`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Time` <= `DateEnd`) '.
+        'SQL' => '(SELECT ROUND(SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`ValueSign`)) 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`.`Direction`)) FROM `FinanceInvoice` WHERE (`FinanceInvoice`.`Time` <= `DateEnd`) '.
-        'AND (`FinanceInvoice`.`Time` >= `DateStart`) AND (`FinanceInvoice`.`Direction` = 1))'),
+        'SQL' => '(SELECT ROUND(SUM(`FinanceInvoice`.`Value` * `FinanceInvoice`.`ValueSign`)) FROM `FinanceInvoice` WHERE (`FinanceInvoice`.`Time` <= `DateEnd`) '.
+        'AND (`FinanceInvoice`.`Time` >= `DateStart`) AND (`FinanceInvoice`.`ValueSign` = 1))'),
       'Liabilities' => array('Type' => 'Integer', 'Caption' => 'Závazky', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
-        'SQL' => '(SELECT -ROUND(SUM(`FinanceInvoice`.`Value` * `FinanceInvoice`.`Direction`)) FROM `FinanceInvoice` WHERE (`FinanceInvoice`.`Time` <= `DateEnd`) '.
-        'AND (`FinanceInvoice`.`Time` >= `DateStart`) AND (`FinanceInvoice`.`Direction` = -1))'),
+        'SQL' => '(SELECT -ROUND(SUM(`FinanceInvoice`.`Value` * `FinanceInvoice`.`ValueSign`)) FROM `FinanceInvoice` WHERE (`FinanceInvoice`.`Time` <= `DateEnd`) '.
+        'AND (`FinanceInvoice`.`Time` >= `DateStart`) AND (`FinanceInvoice`.`ValueSign` = -1))'),
       'InvoiceBalance' => array('Type' => 'Integer', 'Caption' => 'Fakturační rozdíl', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
-        'SQL' => '(SELECT ROUND(SUM(`FinanceInvoice`.`Value` * `FinanceInvoice`.`Direction`)) FROM `FinanceInvoice` WHERE (`FinanceInvoice`.`Time` <= `DateEnd`) '.
+        'SQL' => '(SELECT ROUND(SUM(`FinanceInvoice`.`Value` * `FinanceInvoice`.`ValueSign`)) FROM `FinanceInvoice` WHERE (`FinanceInvoice`.`Time` <= `DateEnd`) '.
         'AND (`FinanceInvoice`.`Time` >= `DateStart`))'),
     ),

trunk/Common/Setup/Updates.php

@@ -1354 +1354 @@
   `Address` varchar(255) NOT NULL,
   `Domain` int(11) NOT NULL,
-  `Sequence` int(11) NOT NULL
+  `Sequence` int(11) NOT NULL,
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;');
 
@@ -1362 +1362 @@
   $Manager->Execute('ALTER TABLE `NetworkDomainServer`
 ADD CONSTRAINT `NetworkDomainServer_ibfk_1` FOREIGN KEY (`Domain`) REFERENCES `NetworkDomain` (`Id`);');
-
+}
+
+function UpdateTo740($Manager)
+{
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `FinanceInvoiceGroup` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) NOT NULL,
+  `DocumentLine` int(11) NOT NULL,
+  `ValueSign` int(11) NOT NULL,
+  PRIMARY KEY (`Id`),
+  KEY `DocumentLine` (`DocumentLine`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;');
+  $Manager->Execute('ALTER TABLE `FinanceInvoiceGroup`
+ADD CONSTRAINT `FinanceInvoiceGroup_ibfk_1` FOREIGN KEY (`DocumentLine`) REFERENCES `DocumentLine` (`Id`);');
+  $Manager->Execute('INSERT INTO `FinanceInvoiceGroup` (`Id`, `Name`, `DocumentLine`, `ValueSign`) VALUES
+(1, "Přijaté faktury", 5, -1),
+(2, "Vydané faktury", 6, 1);');
+
+  // Transform FinanceInvoice.DocumentLine reference to FinanceInvoiceGroup
+  $Manager->Execute('ALTER TABLE `FinanceInvoice` ADD `Group` INT NULL AFTER `Id`;');
+  $Manager->Execute('ALTER TABLE `FinanceInvoice` ADD INDEX(`Group`);');
+  $Manager->Execute('ALTER TABLE `FinanceInvoice` ADD FOREIGN KEY (`Group`) REFERENCES `FinanceInvoiceGroup`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
+  $Manager->Execute('UPDATE `FinanceInvoice` SET `Group`=1 WHERE `DocumentLine`=5');
+  $Manager->Execute('UPDATE `FinanceInvoice` SET `Group`=2 WHERE `DocumentLine`=6');
+  $Manager->Execute('ALTER TABLE `FinanceInvoice` DROP FOREIGN KEY `FinanceInvoice_ibfk_3`;');
+  $Manager->Execute('ALTER TABLE `FinanceInvoice` DROP `DocumentLine`;');
+
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `FinanceOperationGroup` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) NOT NULL,
+  `DocumentLine` int(11) NOT NULL,
+  `ValueSign` int(11) NOT NULL,
+  PRIMARY KEY (`Id`),
+  KEY `DocumentLine` (`DocumentLine`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;');
+  $Manager->Execute('ALTER TABLE `FinanceOperationGroup`
+ADD CONSTRAINT `FinanceOperationGroup_ibfk_1` FOREIGN KEY (`DocumentLine`) REFERENCES `DocumentLine` (`Id`);');
+  $Manager->Execute('INSERT INTO `FinanceOperationGroup` (`Id`, `Name`, `DocumentLine`, `ValueSign`) VALUES
+(1, "Příjem do pokladny", 1, 1),
+(2, "Výdej z pokladny", 2, -1),
+(3, "Příjem na účet", 3, 1),
+(4, "Výdej z účtu", 4, -1),
+(5, "Nezařazené (ručně vyčistit)", 1, 1);');
+
+  // Transform FinanceOperation.DocumentLine reference to FinanceOperationGroup
+  $Manager->Execute('ALTER TABLE `FinanceOperation` ADD `Group` INT NULL AFTER `Id`;');
+  $Manager->Execute('ALTER TABLE `FinanceOperation` ADD INDEX (`Group`);');
+  $Manager->Execute('ALTER TABLE `FinanceOperation` ADD FOREIGN KEY (`Group`) REFERENCES `FinanceOperationGroup`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
+  $Manager->Execute('UPDATE `FinanceOperation` SET `Group`=1 WHERE `DocumentLine`=1');
+  $Manager->Execute('UPDATE `FinanceOperation` SET `Group`=2 WHERE `DocumentLine`=2');
+  $Manager->Execute('UPDATE `FinanceOperation` SET `Group`=3 WHERE `DocumentLine`=3');
+  $Manager->Execute('UPDATE `FinanceOperation` SET `Group`=4 WHERE `DocumentLine`=4');
+  $Manager->Execute('UPDATE `FinanceOperation` SET `Group`=5 WHERE `DocumentLine`=10');
+  $Manager->Execute('UPDATE `FinanceOperation` SET `Group`=5 WHERE `DocumentLine`=5');
+  $Manager->Execute('ALTER TABLE `FinanceOperation` DROP FOREIGN KEY `FinanceOperation_ibfk_6`;');
+  $Manager->Execute('ALTER TABLE `FinanceOperation` DROP `DocumentLine`;');
+
+  $Manager->Execute('ALTER TABLE `FinanceInvoice` CHANGE `Direction` `ValueSign` INT(11) NOT NULL;');
+  $Manager->Execute('ALTER TABLE `FinanceOperation` CHANGE `Direction` `ValueSign` INT(11) NOT NULL;');
 }
 

trunk/Modules/Finance/Bill.php

@@ -79 +79 @@
 
     // If negative value => switch sides
-    if($Invoice['Direction'] == -1)
+    if($Invoice['ValueSign'] == -1)
     {
       $Subject = $SubjectTo;
@@ -162 +162 @@
 
     $BooleanText = array('Ne', 'Ano');
-    if($Operation['Direction'] == -1)
+    if($Operation['ValueSign'] == -1)
     $Desc = array(
       'Type' => 'VÝDAJOVÝ',
@@ -168 +168 @@
       'Target' => 'Vydáno komu',
     );
-    else if($Operation['Direction'] == 1)
+    else if($Operation['ValueSign'] == 1)
     $Desc = array(
       'Type' => 'PŘÍJMOVÝ',

trunk/Modules/Finance/Finance.php

@@ -10 +10 @@
 define('TARIFF_FREE', 7);
 define('INVOICE_DUE_DAYS', 15);
-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('OPERATION_GROUP_TREASURY_IN', 1);
+define('OPERATION_GROUP_TREASURY_OUT', 2);
+define('OPERATION_GROUP_ACCOUNT_IN', 3);
+define('OPERATION_GROUP_ACCOUNT_OUT', 4);
+define('INVOICE_GROUP_IN', 1);
+define('INVOICE_GROUP_OUT', 2);
 define('VAT_TYPE_BASE', 2);
 
@@ -108 +108 @@
   }
 
+  function GetFinanceGroupById($Id, $Table)
+  {
+    $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE `Id`= '.$Id);
+    if($DbResult->num_rows == 1) {
+      $Group = $DbResult->fetch_assoc();
+      return($Group);
+    } else die('Finance group not found');
+  }
+
   function RecalculateMemberPayment()
   {
@@ -115 +124 @@
     while($Member = $DbResult->fetch_assoc())
     {
-      $DbResult2 = $this->Database->query('SELECT ((SELECT COALESCE(SUM(Value*Direction), 0) FROM FinanceOperation '.
-          'WHERE Subject='.$Member['Subject'].') - (SELECT COALESCE(SUM(Value*Direction), 0) FROM FinanceInvoice '.
-          'WHERE Subject='.$Member['Subject'].')) AS Cash');
+      $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` '.
+          'WHERE `Subject`='.$Member['Subject'].')) AS `Cash`');
       $Cash = $DbResult2->fetch_row();
       $Cash = $Cash[0];
@@ -204 +213 @@
       'DefaultSortOrder' => 1,
       'Items' => array(
-        'Direction' => array('Type' => 'TFinanceOperationDirection', 'Caption' => 'Směr', 'Default' => '1'),
-        'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => ''),
-        'BillCode' => array('Type' => 'String', 'Caption' => 'Označení', 'Default' => ''),
+        'Group' => array('Type' => 'TFinanceOperationGroup', 'Caption' => 'Skupina', 'Default' => ''),
+        'BillCode' => array('Type' => 'String', 'Caption' => 'Označení', 'Default' => '', 'ReadOnly' => true),
         'Subject' => array('Type' => 'TSubject', 'Caption' => 'Subjekt', 'Default' => ''),
         'Time' => array('Type' => 'Date', 'Caption' => 'Čas realizace', 'Default' => ''),
         'Cash' => array('Type' => 'Boolean', 'Caption' => 'Hotově', 'Default' => ''),
         'Taxable' => array('Type' => 'Boolean', 'Caption' => 'Zdanitelné', 'Default' => ''),
+        'ValueSign' => array('Type' => 'TFinanceOperationValueSign', 'Caption' => 'Znaménko', 'Default' => '1'),
         'Value' => array('Type' => 'Integer', 'Caption' => 'Částka', 'Default' => '0', 'Suffix' => 'Kč'),
         'File' => array('Type' => 'TFile', 'Caption' => 'Doklad', 'Default' => '', 'Null' => true),
@@ -225 +234 @@
     $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']['Group']['Default'] = OPERATION_GROUP_TREASURY_IN;
+    $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['Group']['Hidden'] = true;
+    $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['Group']['Filter'] = true;
+    $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['Cash']['Default'] = 1;
+    $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['Cash']['Hidden'] = true;
+    $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['Cash']['Filter'] = false;
     $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']['Group']['Default'] = OPERATION_GROUP_TREASURY_OUT;
+    $this->System->FormManager->Classes['FinanceTreasuryOut']['Items']['Group']['Hidden'] = true;
+    $this->System->FormManager->Classes['FinanceTreasuryOut']['Items']['Group']['Filter'] = true;
+    $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['Cash']['Default'] = 1;
+    $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['Cash']['Hidden'] = true;
+    $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['Cash']['Filter'] = false;
     $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']['Group']['Default'] = OPERATION_GROUP_ACCOUNT_IN;
+    $this->System->FormManager->Classes['FinanceAccountIn']['Items']['Group']['Hidden'] = true;
+    $this->System->FormManager->Classes['FinanceAccountIn']['Items']['Group']['Filter'] = true;
+    $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['Cash']['Default'] = 0;
+    $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['Cash']['Hidden'] = true;
+    $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['Cash']['Filter'] = false;
     $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']['Group']['Default'] = OPERATION_GROUP_ACCOUNT_OUT;
+    $this->System->FormManager->Classes['FinanceAccountOut']['Items']['Group']['Hidden'] = true;
+    $this->System->FormManager->Classes['FinanceAccountOut']['Items']['Group']['Filter'] = true;
+    $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['Cash']['Default'] = 0;
+    $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['Cash']['Hidden'] = true;
+    $this->System->FormManager->Classes['FinanceTreasuryIn']['Items']['Cash']['Filter'] = false;
     $this->System->FormManager->Classes['FinanceAccountOut']['Items']['Treasury']['Hidden'] = true;
 
-    $this->System->FormManager->RegisterFormType('TFinanceOperationDirection', array(
+    $this->System->FormManager->RegisterClass('FinanceOperationGroup', array(
+      'Title' => 'Skupina finančních operací',
+      'Table' => 'FinanceOperationGroup',
+      'Items' => array(
+        'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => '0'),
+        'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => '0'),
+        'ValueSign' => array('Type' => 'TFinanceInvoiceValueSign', 'Caption' => 'Znaménko hodnoty', 'Default' => '0'),
+      ),
+    ));
+    $this->System->FormManager->RegisterFormType('TFinanceOperationGroup', array(
+      'Type' => 'Reference',
+      'Table' => 'FinanceOperationGroup',
+      'Id' => 'Id',
+      'Name' => 'Name',
+      'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterFormType('TFinanceOperationValueSign', array(
       'Type' => 'Enumeration',
-      'States' => array(-1 => 'Výdej', 1 => 'Příjem'),
+      'States' => array(-1 => 'Mínus', 1 => 'Plus'),
     ));
     $this->System->FormManager->RegisterClass('FinanceInvoice', array(
@@ -274 +298 @@
       'DefaultSortOrder' => 1,
       'Items' => array(
-        'Direction' => array('Type' => 'TFinanceInvoiceDirection', 'Caption' => 'Směr', 'Default' => '1'),
-        'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => ''),
-        'BillCode' => array('Type' => 'String', 'Caption' => 'Označení', 'Default' => ''),
+        'Group' => array('Type' => 'TFinanceInvoiceGroup', 'Caption' => 'Skupina', 'Default' => ''),
+        'BillCode' => array('Type' => 'String', 'Caption' => 'Označení', 'Default' => '', 'ReadOnly' => true),
         'Subject' => array('Type' => 'TSubject', 'Caption' => 'Subjekt', 'Default' => ''),
         'Time' => array('Type' => 'Date', 'Caption' => 'Čas vytvoření', 'Default' => ''),
         'TimeDue' => array('Type' => 'Date', 'Caption' => 'Čas splatnosti', 'Default' => ''),
         'TimePayment' => array('Type' => 'Date', 'Caption' => 'Čas zaplacení', 'Default' => '', 'Null' => true),
+        'ValueSign' => array('Type' => 'TFinanceInvoiceValueSign', 'Caption' => 'Znaménko', 'Default' => '1'),
         'Value' => array('Type' => 'Integer', 'Caption' => 'Částka', 'Default' => '0', 'Suffix' => 'Kč'),
         'File' => array('Type' => 'TFile', 'Caption' => 'Doklad', 'Default' => '', 'Null' => true),
@@ -297 +321 @@
     $this->System->FormManager->RegisterClass('FinanceInvoiceIn', $this->System->FormManager->Classes['FinanceInvoice']);
     $this->System->FormManager->Classes['FinanceInvoiceIn']['Title'] = 'Přijaté faktury';
-    $this->System->FormManager->Classes['FinanceInvoiceIn']['Items']['Direction']['Default'] = -1;
-    $this->System->FormManager->Classes['FinanceInvoiceIn']['Items']['Direction']['Hidden'] = true;
-    $this->System->FormManager->Classes['FinanceInvoiceIn']['Items']['Direction']['Filter'] = true;
-    $this->System->FormManager->Classes['FinanceInvoiceIn']['Items']['DocumentLine']['Default'] = DOC_LINE_INVOICE_IN;
-    $this->System->FormManager->Classes['FinanceInvoiceIn']['Items']['DocumentLine']['Hidden'] = true;
-    $this->System->FormManager->Classes['FinanceInvoiceIn']['Items']['DocumentLine']['Filter'] = true;
+    $this->System->FormManager->Classes['FinanceInvoiceIn']['Items']['Group']['Default'] = INVOICE_GROUP_IN;
+    $this->System->FormManager->Classes['FinanceInvoiceIn']['Items']['Group']['Hidden'] = true;
+    $this->System->FormManager->Classes['FinanceInvoiceIn']['Items']['Group']['Filter'] = true;
 
     $this->System->FormManager->RegisterClass('FinanceInvoiceOut', $this->System->FormManager->Classes['FinanceInvoice']);
     $this->System->FormManager->Classes['FinanceInvoiceOut']['Title'] = 'Vydané faktury';
-    $this->System->FormManager->Classes['FinanceInvoiceOut']['Items']['Direction']['Default'] = 1;
-    $this->System->FormManager->Classes['FinanceInvoiceOut']['Items']['Direction']['Hidden'] = true;
-    $this->System->FormManager->Classes['FinanceInvoiceOut']['Items']['Direction']['Filter'] = true;
-    $this->System->FormManager->Classes['FinanceInvoiceOut']['Items']['DocumentLine']['Default'] = DOC_LINE_INVOICE_OUT;
-    $this->System->FormManager->Classes['FinanceInvoiceOut']['Items']['DocumentLine']['Hidden'] = true;
-    $this->System->FormManager->Classes['FinanceInvoiceOut']['Items']['DocumentLine']['Filter'] = true;
-
-    $this->System->FormManager->RegisterFormType('TFinanceInvoiceDirection', array(
+    $this->System->FormManager->Classes['FinanceInvoiceOut']['Items']['Group']['Default'] = INVOICE_GROUP_OUT;
+    $this->System->FormManager->Classes['FinanceInvoiceOut']['Items']['Group']['Hidden'] = true;
+    $this->System->FormManager->Classes['FinanceInvoiceOut']['Items']['Group']['Filter'] = true;
+
+    $this->System->FormManager->RegisterFormType('TFinanceInvoiceValueSign', array(
         'Type' => 'Enumeration',
-        'States' => array(-1 => 'Příjem', 1 => 'Výdej'),
+        'States' => array(-1 => 'Mínus', 1 => 'Plus'),
+    ));
+
+    $this->System->FormManager->RegisterClass('FinanceInvoiceGroup', array(
+      'Title' => 'Skupina faktur',
+      'Table' => 'FinanceInvoiceGroup',
+      'Items' => array(
+        'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => '0'),
+        'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => '0'),
+        'ValueSign' => array('Type' => 'TFinanceInvoiceValueSign', 'Caption' => 'Znaménko hodnoty', 'Default' => '0'),
+      ),
+    ));
+    $this->System->FormManager->RegisterFormType('TFinanceInvoiceGroup', array(
+        'Type' => 'Reference',
+        'Table' => 'FinanceInvoiceGroup',
+        'Id' => 'Id',
+        'Name' => 'Name',
+        'Filter' => '1',
     ));
 
@@ -347 +382 @@
         '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`.`Direction`) FROM `FinanceOperation` '.
+          'ReadOnly' => true, 'Suffix' => 'Kč', 'SQL' => '(SELECT SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`ValueSign`) FROM `FinanceOperation` '.
           'WHERE `FinanceOperation`.`Treasury`=#Id)'),
         'Operations' => array('Type' => 'TFinanceOperationListTreasury', 'Caption' => 'Operace', 'Default' => ''),
@@ -378 +413 @@
         '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`.`Direction`) FROM `FinanceOperation` '.
+          'ReadOnly' => true, 'Suffix' => 'Kč', 'SQL' => '(SELECT SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`ValueSign`) FROM `FinanceOperation` '.
           'WHERE `FinanceOperation`.`BankAccount`=#Id)'),
         'AutoImport' => array('Type' => 'Boolean', 'Caption' => 'Automaticky stahovat z banky', 'Default' => ''),
@@ -511 +546 @@
     if(array_key_exists('Time', $Form->Values)) $Year = date("Y", $Form->Values['Time']);
       else $Year = date("Y", $Form->Values['ValidFrom']);
-    $DocumentLine = $Form->Values['DocumentLine'];
-    $Form->Values['BillCode'] = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine, $Year);
+    $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById($Form->Values['Group'], 'FinanceOperationGroup');
+    $Form->Values['BillCode'] = $this->System->Modules['Finance']->GetNextDocumentLineNumber($FinanceGroup['DocumentLine'], $Year);
     return($Form->Values);
   }

trunk/Modules/Finance/Import.php

@@ -120 +120 @@
   }
 
-  function InsertMoney($Subject, $Value, $Direction, $Cash, $Taxable, $Time, $Text, $DocumentLine)
+  function InsertMoney($Subject, $Value, $ValueSign, $Cash, $Taxable, $Time, $Text, $Group)
   {
     $Year = date('Y', $Time);
-    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine, $Year);
+    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($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, 'Direction' => $Direction,
+      'Subject' => $Subject, 'Cash' => $Cash, 'Value' => $Value, 'ValueSign' => $ValueSign,
       'Time' => TimeToMysqlDateTime($Time), 'Taxable' => $Taxable, 'BillCode' => $BillCode,
-      'BankAccount' => 1));
+      'BankAccount' => 1, 'Group' => $Group['Id']));
   }
 
@@ -139 +139 @@
     for($I = $_POST['ItemCount'] - 1; $I >= 0 ; $I--)
     {
-      // TODO: Use links to database records instead of contants
       if($_POST['Money'.$I] < 0) {
-        $DocumentLine = 4;
-        $Direction = -1;
+        $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_OUT, 'FinanceOperationGroup');
       } else {
-        $DocumentLine = 3;
-        $Direction = 1;
+        $FinanceGroup = $this->System->Modules['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]), $Direction, 0, $_POST['Taxable'.$I], $Date, $_POST['Text'.$I], $DocumentLine);
+      $this->InsertMoney($_POST['Subject'.$I], Abs($_POST['Money'.$I]), $FinanceGroup['ValueSign'],
+        0, $_POST['Taxable'.$I], $Date, $_POST['Text'.$I], $FinanceGroup);
       $Output .= $I.', ';
       $this->System->ModuleManager->Modules['Log']->NewRecord('Finance', 'NewPaymentInserted');

trunk/Modules/Finance/Manage.php

@@ -100 +100 @@
   }
 
-  function InsertInvoice($Subject, $TimeCreation, $TimeDue, $Direction, $Items,
-  $DocumentLine, $PeriodFrom, $PeriodTo)
+  function InsertInvoice($Subject, $TimeCreation, $TimeDue, $ValueSign, $Items,
+  $Group, $PeriodFrom, $PeriodTo)
   {
     global $LastInsertTime;
 
     $Year = date('Y', $TimeCreation);
-    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine, $Year);
+    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($Group['DocumentLine'], $Year);
     $SumValue = 0;
-    foreach($Items as $Item)
+    foreach($Items as $Item) {
       $SumValue = $SumValue + ceil($Item['Price'] * $Item['Quantity']);
+    }
     $this->Database->insert('FinanceInvoice', array(
       'Subject' => $Subject, 'Time' => TimeToMysqlDateTime($TimeCreation),
       'TimeDue' => TimeToMysqlDateTime($TimeDue), 'Value' => $SumValue,
-      'Direction' => $Direction, 'BillCode' => $BillCode,
+      'ValueSign' => $ValueSign, 'BillCode' => $BillCode,
       'PeriodFrom' => TimeToMysqlDate($PeriodFrom), 'PeriodTo' => TimeToMysqlDate($PeriodTo),
-      'Generate' => 1, 'DocumentLine' => $DocumentLine));
+      'Generate' => 1, 'Group' => $FinanceGroup['Id']));
     $InvoiceId = $this->Database->insert_id;
     foreach($Items as $Item)
@@ -166 +167 @@
         // We can't produce negative invoice except storno invoice.
         // TODO: In case of negative invoice it is not sufficient to reverse invoicing direction
-        // Other subject should invoice only possitive items. Negative items should be somehow removed.
+        // Other subject should invoice only positive items. Negative items should be somehow removed.
         if($MonthlyTotal >= 0) {
-          $DocumentLine = DOC_LINE_INVOICE_OUT;
-          $Direction = 1; // Standard out invoice
+          $InvoiceGroupId = INVOICE_GROUP_OUT;
         } else {
-          $DocumentLine = DOC_LINE_INVOICE_IN;
-          $Direction = -1; // In case of negative total value generate reverse invoice for other subject
-          foreach($InvoiceItems as $Index => $Item)
-          $InvoiceItems[$Index]['Price'] = -$Item['Price'];
+          $InvoiceGroupId = INVOICE_GROUP_IN;
+        }
+
+        // Load invoice group
+        $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById($InvoiceGroupId, 'FinanceInvoice');
+        foreach($InvoiceItems as $Index => $Item) {
+          $InvoiceItems[$Index]['Price'] = $Item['Price'] * $FinanceGroup['ValueSign'];
         }
 
@@ -182 +185 @@
           $Output .= $TimePeriodText.': '.$MonthlyTotal.' * '.$Period['MonthCount'].' = '.$PayPerPeriod.'<br />';
           $this->InsertInvoice($Member['Subject'], time(), time() + 3600 * 24 * INVOICE_DUE_DAYS,
-            $Direction, $InvoiceItems, $DocumentLine, $Period['From'], $Period['To']);
+            $FinanceGroup['ValueSign'], $InvoiceItems, $FinanceGroup, $Period['From'], $Period['To']);
 
           $Output .= $this->SendPaymentEmail($Member['Id']);
@@ -354 +357 @@
         '<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`*`Direction`) AS `Value`, `File` FROM `FinanceOperation` WHERE (`Subject`='.$Member['Subject'].')) UNION ALL '.
+      $DbResult = $this->Database->query('SELECT T1.* FROM ((SELECT `Text`, `Time`, (`Value`*`ValueSign`) AS `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`*`Direction`) AS `Value`, `File` FROM `FinanceInvoice` WHERE (`Subject`='.
+        '`Time`, -(`Value`*`ValueSign`) AS `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`*`Direction`) AS `Value`, `File`, `BillCode`, NULL AS `PeriodFrom`, NULL AS `PeriodTo` '.
+    $UserOperationTableQuery = '((SELECT `Text`, `Time`, (`Value`*`ValueSign`) AS `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`*`Direction`) AS `Value`, `File`, `BillCode`, `PeriodFrom`, `PeriodTo` FROM `FinanceInvoice` WHERE (`Subject`='.$Subject['Id'].')))';
+      '`Time`, -(`Value`*`ValueSign`) AS `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`*`Direction`) AS `Value`, `File`, `BillCode`, NULL AS `PeriodFrom`, NULL AS `PeriodTo` '.
+    $UserOperationTableQuery = '((SELECT `Text`, `Time`, (`Value`*`ValueSign`) AS `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`*`Direction`) AS `Value`, `File`, `BillCode`, `PeriodFrom`, `PeriodTo` FROM `FinanceInvoice` WHERE (`Subject`='.$Subject['Id'].')) ORDER BY `Time` DESC) AS `T1`';
+      '`Time`, -(`Value`*`ValueSign`) AS `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/Finance/Zivnost.php

@@ -11 +11 @@
   {
     $Balance = array();
-    $DbResult = $this->Database->query('SELECT SUM(Value) FROM FinanceOperation WHERE (Time < "'.TimeToMysqlDateTime($StartTime).'") AND (Time >= "'.TimeToMysqlDateTime($this->StartEvidence).'") AND (Taxable = 1) AND (Direction = 1)');
+    $DbResult = $this->Database->query('SELECT SUM(Value) FROM FinanceOperation WHERE (Time < "'.TimeToMysqlDateTime($StartTime).'") AND (Time >= "'.TimeToMysqlDateTime($this->StartEvidence).'") AND (Taxable = 1) AND (ValueSign = 1)');
     $Row = $DbResult->fetch_array();
     $Balance['Income']['Start'] = $Row[0] + 0;
-    $DbResult = $this->Database->query('SELECT SUM(Value) FROM FinanceOperation WHERE (Time <= "'.TimeToMysqlDateTime($EndTime).'") AND (Time >= "'.TimeToMysqlDateTime($this->StartEvidence).'") AND (Taxable = 1) AND (Direction = 1)');
+    $DbResult = $this->Database->query('SELECT SUM(Value) FROM FinanceOperation WHERE (Time <= "'.TimeToMysqlDateTime($EndTime).'") AND (Time >= "'.TimeToMysqlDateTime($this->StartEvidence).'") AND (Taxable = 1) AND (ValueSign = 1)');
     //echo('SELECT SUM(Value) FROM FinanceCashFlow WHERE Time <= "'.TimeToMysqlDateTime($EndTime).'" AND Value > 0 AND Taxable = 1'.'<br />');
     $Row = $DbResult->fetch_array();
     $Balance['Income']['End'] = $Row[0] + 0;
 
-    $DbResult = $this->Database->query('SELECT -SUM(Value*Direction) FROM FinanceOperation WHERE (Time < "'.TimeToMysqlDateTime($StartTime).'") AND (Time >= "'.TimeToMysqlDateTime($this->StartEvidence).'") AND (Taxable = 1) AND (Direction = -1)');
+    $DbResult = $this->Database->query('SELECT -SUM(Value*ValueSign) FROM FinanceOperation WHERE (Time < "'.TimeToMysqlDateTime($StartTime).'") AND (Time >= "'.TimeToMysqlDateTime($this->StartEvidence).'") AND (Taxable = 1) AND (ValueSign = -1)');
     $Row = $DbResult->fetch_array();
     $Balance['Spend']['Start'] = $Row[0] + 0;
-    $DbResult = $this->Database->query('SELECT -SUM(Value*Direction) FROM FinanceOperation WHERE (Time <= "'.TimeToMysqlDateTime($EndTime).'") AND (Time >= "'.TimeToMysqlDateTime($this->StartEvidence).'") AND (Taxable = 1) AND (Direction = -1)');
+    $DbResult = $this->Database->query('SELECT -SUM(Value*ValueSign) FROM FinanceOperation WHERE (Time <= "'.TimeToMysqlDateTime($EndTime).'") AND (Time >= "'.TimeToMysqlDateTime($this->StartEvidence).'") AND (Taxable = 1) AND (ValueSign = -1)');
           //echo('SELECT -SUM(Value) FROM FinanceCashFlow WHERE Time <= "'.TimeToMysqlDateTime($EndTime).'" AND Value < 0 AND Taxable = 1'.'<br />');
     $Row = $DbResult->fetch_array();
     $Balance['Spend']['End'] = $Row[0] + 0;
 
-    $DbResult = $this->Database->query('SELECT SUM(Value*Direction) FROM FinanceInvoice WHERE (Time < "'.TimeToMysqlDateTime($StartTime).'") AND (Time >= "'.TimeToMysqlDateTime($this->StartEvidence).'") AND (Direction = 1)');
+    $DbResult = $this->Database->query('SELECT SUM(Value*ValueSign) FROM FinanceInvoice WHERE (Time < "'.TimeToMysqlDateTime($StartTime).'") AND (Time >= "'.TimeToMysqlDateTime($this->StartEvidence).'") AND (ValueSign = 1)');
     $Row = $DbResult->fetch_array();
     $Balance['Claims']['Start'] = $Row[0] + 0;
-    $DbResult = $this->Database->query('SELECT SUM(Value*Direction) FROM FinanceInvoice WHERE (Time <= "'.TimeToMysqlDateTime($EndTime).'") AND (Time >= "'.TimeToMysqlDateTime($this->StartEvidence).'") AND (Direction = 1)');
+    $DbResult = $this->Database->query('SELECT SUM(Value*ValueSign) FROM FinanceInvoice WHERE (Time <= "'.TimeToMysqlDateTime($EndTime).'") AND (Time >= "'.TimeToMysqlDateTime($this->StartEvidence).'") AND (ValueSign = 1)');
     $Row = $DbResult->fetch_array();
     $Balance['Claims']['End'] = $Row[0] + 0;
 
-    $DbResult = $this->Database->query('SELECT -SUM(Value*Direction) FROM FinanceInvoice WHERE (Time < "'.TimeToMysqlDateTime($StartTime).'") AND (Time >= "'.TimeToMysqlDateTime($this->StartEvidence).'") AND (Direction = -1)');
+    $DbResult = $this->Database->query('SELECT -SUM(Value*ValueSign) FROM FinanceInvoice WHERE (Time < "'.TimeToMysqlDateTime($StartTime).'") AND (Time >= "'.TimeToMysqlDateTime($this->StartEvidence).'") AND (ValueSign = -1)');
     $Row = $DbResult->fetch_array();
     $Balance['Liabilities']['Start'] = $Row[0] + 0;
-    $DbResult = $this->Database->query('SELECT -SUM(Value*Direction) FROM FinanceInvoice WHERE (Time <= "'.TimeToMysqlDateTime($EndTime).'") AND (Time >= "'.TimeToMysqlDateTime($this->StartEvidence).'") AND (Direction = -1)');
+    $DbResult = $this->Database->query('SELECT -SUM(Value*ValueSign) FROM FinanceInvoice WHERE (Time <= "'.TimeToMysqlDateTime($EndTime).'") AND (Time >= "'.TimeToMysqlDateTime($this->StartEvidence).'") AND (ValueSign = -1)');
     $Row = $DbResult->fetch_array();
     $Balance['Liabilities']['End'] = $Row[0] + 0;
@@ -144 +144 @@
         $Output .= '<tr><th>Čas</th><th>Kód</th><th>Subjekt</th><th>Text</th><th>Hodnota [Kč]</th><th>Daňový</th><th>Hotovost</th></tr>';
         $DbResult = $this->Database->query('SELECT * FROM FinanceOperation LEFT JOIN Subject ON Subject.Id = FinanceOperation.Subject '.
-          'WHERE (Direction = 1) AND (FinanceOperation.Time >= "'.$Year['DateStart'].'") AND (FinanceOperation.Time <= "'.$Year['DateEnd'].'") ORDER BY Time');
+          'WHERE (ValueSign = 1) AND (FinanceOperation.Time >= "'.$Year['DateStart'].'") AND (FinanceOperation.Time <= "'.$Year['DateEnd'].'") ORDER BY Time');
         while($Row = $DbResult->fetch_array())
         {
@@ -174 +174 @@
         $Output .= '<tr><th>Čas</th><th>Kód</th><th>Subjekt</th><th>Text</th><th>Hodnota [Kč]</th><th>Daňový</th><th>Hotovost</th></tr>';
         $DbResult = $this->Database->query('SELECT * FROM FinanceOperation LEFT JOIN Subject ON Subject.Id = FinanceOperation.Subject '.
-          'WHERE (Direction = -1) AND (FinanceOperation.Time >= "'.$Year['DateStart'].'") AND (FinanceOperation.Time <= "'.$Year['DateEnd'].'") ORDER BY Time');
+          'WHERE (ValueSign = -1) AND (FinanceOperation.Time >= "'.$Year['DateStart'].'") AND (FinanceOperation.Time <= "'.$Year['DateEnd'].'") ORDER BY Time');
         while($Row = $DbResult->fetch_array())
         {
@@ -204 +204 @@
         $DbResult = $this->Database->query('SELECT *, (SELECT GROUP_CONCAT(Description SEPARATOR ",") FROM FinanceInvoiceItem WHERE FinanceInvoiceItem.FinanceInvoice = FinanceInvoice.Id) AS Text '.
           'FROM FinanceInvoice JOIN Subject ON Subject.Id = FinanceInvoice.Subject '.
-          'WHERE (Direction = 1) AND (FinanceInvoice.Time >= "'.$Year['DateStart'].
+          'WHERE (ValueSign = 1) AND (FinanceInvoice.Time >= "'.$Year['DateStart'].
           '") AND (FinanceInvoice.Time <= "'.$Year['DateEnd'].'") ORDER BY Time');
         while($Row = $DbResult->fetch_array())
@@ -210 +210 @@
           if($Row['TimePayment'] == '0000-00-00 00:00:00') $Row['TimePayment'] = '&nbsp;';
           $Output .= '<tr><td>'.HumanDate($Row['Time']).'</td><td>'.$Row['BillCode'].
-            '</td><td>'.$Row['Name'].'</td><td>'.$Row['Text'].'</td><td>'.($Row['Value'] * $Row['Direction']).'</td></tr>';
+            '</td><td>'.$Row['Name'].'</td><td>'.$Row['Text'].'</td><td>'.($Row['Value'] * $Row['ValueSign']).'</td></tr>';
           $Total += $Row['Value'];
         }
@@ -227 +227 @@
         $DbResult = $this->Database->query('SELECT *, (SELECT GROUP_CONCAT(Description SEPARATOR ",") FROM FinanceInvoiceItem WHERE FinanceInvoiceItem.FinanceInvoice = FinanceInvoice.Id) AS Text '.
           'FROM FinanceInvoice JOIN Subject ON Subject.Id = FinanceInvoice.Subject '.
-          'WHERE (Direction = -1) AND (FinanceInvoice.Time >= "'.$Year['DateStart'].
+          'WHERE (ValueSign = -1) AND (FinanceInvoice.Time >= "'.$Year['DateStart'].
           '") AND (FinanceInvoice.Time <= "'.$Year['DateEnd'].'") ORDER BY Time');
         while($Row = $DbResult->fetch_array())
@@ -234 +234 @@
           $Row['Value'] = $Row['Value'] * -1;
           $Output .= '<tr><td>'.HumanDate($Row['Time']).'</td><td>'.$Row['BillCode'].
-            '</td><td>'.$Row['Name'].'</td><td>'.$Row['Text'].'</td><td>'.($Row['Value'] * $Row['Direction']).'</td></tr>';
+            '</td><td>'.$Row['Name'].'</td><td>'.$Row['Text'].'</td><td>'.($Row['Value'] * $Row['ValueSign']).'</td></tr>';
           $Total += $Row['Value'];
         }
@@ -245 +245 @@
         $Output .= '<tr><th>Jméno</th><th>Závazky [Kč]</th><th>Pohledávky [Kč]</th><th>Příjmy [Kč]</th><th>Výdaje [Kč]</th><th>Stav účtu</th><th>Starý systém</th></tr>';
         $DbResult = $this->Database->query('SELECT Id, Name, 0 AS Cash, '.
-        '(SELECT SUM(T1.Value*T1.Direction) FROM FinanceInvoice AS T1 WHERE (T1.Subject = Subject.Id) AND (T1.Direction = 1)) as Claims, '.
-        '(SELECT SUM(T2.Value*T2.Direction) FROM FinanceInvoice AS T2 WHERE (T2.Subject = Subject.Id) AND (T2.Direction = 1) AND (TimePayment IS NULL)) as OpenedClaims, '.
-        '(SELECT -SUM(T3.Value*T3.Direction) FROM FinanceInvoice AS T3 WHERE (T3.Subject = Subject.Id) AND (T3.Direction = -1)) as Liabilities, '.
-        '(SELECT -SUM(T4.Value*T4.Direction) FROM FinanceInvoice AS T4 WHERE (T4.Subject = Subject.Id) AND (T4.Direction = -1) AND (TimePayment IS NULL)) AS OpenedLiabilities, '.
-        '(SELECT SUM(T5.Value*T5.Direction) FROM FinanceOperation AS T5 WHERE (T5.Subject = Subject.Id) AND (T5.Direction = 1)) AS Gains, '.
-        '(SELECT SUM(T6.Value*T6.Direction) FROM FinanceOperation AS T6 WHERE (T6.Subject = Subject.Id) AND (T6.Direction = -1)) AS Spends '.
+        '(SELECT SUM(T1.Value*T1.ValueSign) FROM FinanceInvoice AS T1 WHERE (T1.Subject = Subject.Id) AND (T1.ValueSign = 1)) as Claims, '.
+        '(SELECT SUM(T2.Value*T2.ValueSign) FROM FinanceInvoice AS T2 WHERE (T2.Subject = Subject.Id) AND (T2.ValueSign = 1) AND (TimePayment IS NULL)) as OpenedClaims, '.
+        '(SELECT -SUM(T3.Value*T3.ValueSign) FROM FinanceInvoice AS T3 WHERE (T3.Subject = Subject.Id) AND (T3.ValueSign = -1)) as Liabilities, '.
+        '(SELECT -SUM(T4.Value*T4.ValueSign) FROM FinanceInvoice AS T4 WHERE (T4.Subject = Subject.Id) AND (T4.ValueSign = -1) AND (TimePayment IS NULL)) AS OpenedLiabilities, '.
+        '(SELECT SUM(T5.Value*T5.ValueSign) FROM FinanceOperation AS T5 WHERE (T5.Subject = Subject.Id) AND (T5.ValueSign = 1)) AS Gains, '.
+        '(SELECT SUM(T6.Value*T6.ValueSign) FROM FinanceOperation AS T6 WHERE (T6.Subject = Subject.Id) AND (T6.ValueSign = -1)) AS Spends '.
         'FROM Subject ORDER BY Name');
         while($Row = $DbResult->fetch_assoc())
@@ -280 +280 @@
         {
           $Output .= '<tr><td>'.HumanDate($Row['Time']).'</td><td>'.$Row['Text'].
-            '</td><td>'.($Row['Value']*$Row['Direction']).'</td><td>'.$Row['BillCode'].'</td></tr>';
+            '</td><td>'.($Row['Value']*$Row['ValueSign']).'</td><td>'.$Row['BillCode'].'</td></tr>';
         }
         $Output .= '</table></td><td style="vertical-align: top;">';
@@ -293 +293 @@
         {
           $Output .= '<tr><td>'.HumanDate($Row['Time']).'</td><td>'.HumanDate($Row['TimePayment']).
-            '</td><td>'.$Row['Text'].'</td><td>'.ceil($Row['Value'] * $Row['Direction']).'</td><td>'.$Row['BillCode'].'</td></tr>';
+            '</td><td>'.$Row['Text'].'</td><td>'.ceil($Row['Value'] * $Row['ValueSign']).'</td><td>'.$Row['BillCode'].'</td></tr>';
         }
         $Output .= '</table></td></tr></table>';
@@ -303 +303 @@
         while($Row = $DbResult->fetch_array())
         {
-          $Output .= '<tr><td>'.$Row['Time'].'</td><td>'.$Row['TimePass'].'</td><td>'.$Row['Direction'].'</td><td>'.($Row['Value']).'</td><td>'.$Row['CashFlowId'].'</td></tr>';
+          $Output .= '<tr><td>'.$Row['Time'].'</td><td>'.$Row['TimePass'].'</td><td>'.$Row['ValueSign'].'</td><td>'.($Row['Value']).'</td><td>'.$Row['CashFlowId'].'</td></tr>';
         }
         $Output .= '</table>';*/
 
-        $DbResult = $this->Database->query('SELECT Id, 0 AS Cash, (SELECT SUM(FinanceInvoice.Value * FinanceInvoice.Direction) '.
+        $DbResult = $this->Database->query('SELECT Id, 0 AS Cash, (SELECT SUM(FinanceInvoice.Value * FinanceInvoice.ValueSign) '.
           'FROM FinanceInvoice WHERE (FinanceInvoice.Subject = Subject.Id) AND '.
-          '(FinanceInvoice.Direction = 1)) as Claims, (SELECT SUM(FinanceInvoice.Value * FinanceInvoice.Direction) '.
+          '(FinanceInvoice.ValueSign = 1)) as Claims, (SELECT SUM(FinanceInvoice.Value * FinanceInvoice.ValueSign) '.
           'FROM FinanceInvoice WHERE (FinanceInvoice.Subject = Subject.Id) AND ('.
-          'FinanceInvoice.Direction = 1) AND (TimePayment IS NULL)) as OpenedClaims, '.
-          '(SELECT SUM(FinanceInvoice.Value * FinanceInvoice.Direction) FROM FinanceInvoice '.
-          'WHERE (FinanceInvoice.Subject = Subject.Id) AND (FinanceInvoice.Direction = -1)) AS '.
+          'FinanceInvoice.ValueSign = 1) AND (TimePayment IS NULL)) as OpenedClaims, '.
+          '(SELECT SUM(FinanceInvoice.Value * FinanceInvoice.ValueSign) FROM FinanceInvoice '.
+          'WHERE (FinanceInvoice.Subject = Subject.Id) AND (FinanceInvoice.ValueSign = -1)) AS '.
           'Liabilities, (SELECT SUM(FinanceInvoice.Value) FROM FinanceInvoice '.
-          'WHERE (FinanceInvoice.Subject = Subject.Id) AND (FinanceInvoice.Direction = -1) '.
+          'WHERE (FinanceInvoice.Subject = Subject.Id) AND (FinanceInvoice.ValueSign = -1) '.
           'AND (TimePayment IS NULL)) AS OpenedLiabilities, '.
-          '(SELECT SUM(FinanceOperation.Value*FinanceOperation.Direction) '.
-          'FROM FinanceOperation WHERE FinanceOperation.Subject = Subject.Id AND FinanceOperation.Direction = 1) '.
-          'AS Gains, (SELECT SUM(FinanceOperation.Value*FinanceOperation.Direction) FROM FinanceOperation WHERE '.
-          'FinanceOperation.Subject = Subject.Id AND FinanceOperation.Direction = -1) as Spends '.
+          '(SELECT SUM(FinanceOperation.Value*FinanceOperation.ValueSign) '.
+          'FROM FinanceOperation WHERE FinanceOperation.Subject = Subject.Id AND FinanceOperation.ValueSign = 1) '.
+          'AS Gains, (SELECT SUM(FinanceOperation.Value*FinanceOperation.ValueSign) FROM FinanceOperation WHERE '.
+          'FinanceOperation.Subject = Subject.Id AND FinanceOperation.ValueSign = -1) as Spends '.
           'FROM Subject WHERE Id='.$_GET['Id']);
         $Row = $DbResult->fetch_array();

trunk/Modules/FinanceBankAPI/FileImport.php

@@ -34 +34 @@
         {
           $DbRow2 = $DbResult2->fetch_assoc();
-          // TODO: Replace constants by links to real database numbers
           if($DbRow['Value'] >= 0) {
-            $DocumentLine = 3; // Receive money
-            $Direction = 1;
+            $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_IN, 'FinanceOperationGroup');
           } else {
-            $DocumentLine = 4; // Send money
-            $Direction = -1;
+            $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_OUT, 'FinanceOperationGroup');
           }
           $Year = date('Y', MysqlDateToTime($DbRow['Time']));
-          $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine, $Year);
+          $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($FinanceGroup['DocumentLine'], $Year);
           $DbResult3 = $this->Database->insert('FinanceOperation', array('Subject' => $DbRow2['Id'], 'Cash' => 0,
-            'Value' => Abs($DbRow['Value']), 'Direction' => $Direction, 'Taxable' => 1, 'BankAccount' => $DbRow['BankAccount'], 'Network' => 1,
-            'Time' => $DbRow['Time'], 'Text' => $DbRow['Description'], 'BillCode' => $BillCode, 'DocumentLine' => $DocumentLine));
+            'Value' => Abs($DbRow['Value']), 'ValueSign' => $FinanceGroup['ValueSign'], '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));
         }
@@ -139 +136 @@
   }
 
-  function InsertMoney($Subject, $Value, $Direction, $Cash, $Taxable, $Time, $Text, $DocumentLine)
+  function InsertMoney($Subject, $Value, $ValueSign, $Cash, $Taxable, $Time, $Text, $Group)
   {
     $Year = date('Y', $Time);
-    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine, $Year);
+    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($Group['DocumentLine'], $Year);
     $this->Database->insert('FinanceOperation', array('Text' => $Text,
-      'Subject' => $Subject, 'Cash' => $Cash, 'Value' => $Value, 'Direction' => $Direction,
+      'Subject' => $Subject, 'Cash' => $Cash, 'Value' => $Value, 'ValueSign' => $ValueSign,
       'Time' => TimeToMysqlDateTime($Time), 'Taxable' => $Taxable, 'BillCode' => $BillCode));
   }
@@ -155 +152 @@
     for($I = $_POST['ItemCount'] - 1; $I >= 0 ; $I--)
     {
-      // TODO: Use links to database records instead of contants
-      if($_POST['Money'.$I] < 0) {
-        $DocumentLine = 4;
-        $Direction = -1;
+      if($_POST['Money'.$I] >= 0) {
+        $FinanceGroup = $Finance->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_IN, 'FinanceOperationGroup');
       } else {
-        $DocumentLine = 3;
-        $Direction = 1;
+        $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]), $Direction, 0, $_POST['Taxable'.$I], $Date, $_POST['Text'.$I], $DocumentLine);
+      $this->InsertMoney($_POST['Subject'.$I], Abs($_POST['Money'.$I]), $FinanceGroup['ValueSign'],
+        0, $_POST['Taxable'.$I], $Date, $_POST['Text'.$I], $FinanceGroup);
       $Output .= $I.', ';
       $this->System->ModuleManager->Modules['Log']->NewRecord('Finance', 'NewPaymentInserted');

trunk/Modules/FinanceBankAPI/FinanceBankAPI.php

@@ -69 +69 @@
   {
     $Preset = array();
-    if($Item['Value'] < 0) $DocumentLine = DOC_LINE_ACCOUNT_OUT;
-       else $DocumentLine = DOC_LINE_ACCOUNT_IN;
+    if($Item['Value'] < 0) $OperationGroupId = OPERATION_GROUP_ACCOUNT_OUT;
+       else $OperationGroupId = OPERATION_GROUP_ACCOUNT_IN;
+    $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById($OperationGroupId, 'FinanceOperationGroup');
+
     $Preset = array(
       'presetTime' => $Item['Time'],
@@ -78 +80 @@
       'presetNetwork' => 1,
       'presetBankAccount' => $Item['BankAccount'],
-      'presetDocumentLine' => $DocumentLine);
+      'presetDocumentLine' => $FinanceGroup['DocumentLine']);
     return($Preset);
   }

trunk/Modules/IS/IS.php

@@ -101 +101 @@
     $Output .= 'Registrovaných zařízení: '.$DbRow['0'].'<br/>';
 
-    $DbResult = $this->Database->select('FinanceOperation', 'SUM(`Value` * `Direction`)', '1');
+    $DbResult = $this->Database->select('FinanceOperation', 'SUM(`Value` * `ValueSign`)', '1');
     $DbRow = $DbResult->fetch_row();
     $Output .= 'Stav placení: '.$DbRow['0'].'<br/>';
@@ -423 +423 @@
     {
       if($TypeFilter != '') $TypeFilter .= ' AND ';
-      $TypeFilter .= '('.$ItemIndex.' = "'.$FormItem['Default'].'")';
+      $TypeFilter .= '(`'.$ItemIndex.'` = "'.$FormItem['Default'].'")';
     }
     if($TypeFilter != '')

trunk/Modules/NetworkConfigLinux/Generators/DNS.php

@@ -1 +1 @@
 <?php
+
+/* This is script for configuration of BIND DNS server.
+ * Use "sudo aptitude install bind9" to install server under Ubuntu
+ */
 
 if(isset($_SERVER['REMOTE_ADDR'])) die();

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`.`Direction`) FROM `FinanceOperation` '.
-          'WHERE `FinanceOperation`.`Subject`=#Id), 0) - IFNULL((SELECT SUM(`FinanceInvoice`.`Value` * `FinanceInvoice`.`Direction`) FROM `FinanceInvoice` '.
+          '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` '.
           '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`.`Direction`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Subject` = TX.`Id`) '.
-          'AND (`FinanceOperation`.`Direction` = 1))'),
+          'SQL' => '(SELECT ROUND(SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`ValueSign`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Subject` = TX.`Id`) '.
+          'AND (`FinanceOperation`.`ValueSign` = 1))'),
         'Spending' => array('Type' => 'Integer', 'Caption' => 'Výdaje', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
-          'SQL' => '(SELECT -ROUND(SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`Direction`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Subject` = TX.`Id`) '.
-          'AND (`FinanceOperation`.`Direction` = -1))'),
+          'SQL' => '(SELECT -ROUND(SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`ValueSign`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Subject` = TX.`Id`) '.
+          'AND (`FinanceOperation`.`ValueSign` = -1))'),
         'OperationBalance' => array('Type' => 'Integer', 'Caption' => 'Zisk', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
-          'SQL' => '(SELECT ROUND(SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`Direction`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Subject` = TX.`Id`) '.
+          'SQL' => '(SELECT ROUND(SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`ValueSign`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Subject` = TX.`Id`) '.
           ')'),
       ),