Changeset 486 for trunk/finance

Timestamp:

Feb 10, 2013, 9:20:06 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Příprava na zrušení tabulek dokladů a jejich převedení na tabulky File a FinanceInvoice.

Location:

trunk/finance

Files:

• bills.php (modified) (1 diff)
• finance.php (modified) (1 diff)
• manage.php (modified) (9 diffs)
• user_state.php (modified) (4 diffs)
• zivnost.php (modified) (7 diffs)

trunk/finance/bills.php

@@ -212 +212 @@
   }
 
-  function CustomGenerate()
-  {
-    global $Database;
-    
-    $DbResult = $this->Database->select('finance_operations', '*', '(date="2008-02-01" AND comment="Poplatek za měsíc Únor") OR '.
-    '(date="2008-01-01" AND comment="Poplatek za měsíc Leden") OR (date="2007-12-01" AND comment="Poplatek za měsíc Prosinec") AND (bill_id = 0)');
-    while($Row = $DbResult->fetch_array())
-    {
-      echo($Row['id']."<br>\n");
-      $Time = MysqlDateToTime($Row['date']);
-      $BillId = $this->CreateBill($Row['user'], array(array('Description' => 'Poplatek za připojení k síti', 'Price' => (-$Row['money']), 'Quantity' => 1)), $Time, $Time + (date("t", time()) - 1) * 24 * 3600);  
-     $this->Database->update('finance_operations', 'id='.$Row['id'], array('bill_id' => $BillId));
-    }
-  }
-
   function ShowPage()
   {

trunk/finance/finance.php

@@ -177 +177 @@
     while($Member = $DbResult->fetch_assoc())
     {
-      $DbResult2 = $this->Database->query('SELECT ((SELECT COALESCE(SUM(Value), 0) FROM FinanceOperation WHERE Subject='.$Member['Subject'].') + (SELECT COALESCE(SUM(-Value), 0) FROM FinanceClaimsLiabilities WHERE Subject='.$Member['Subject'].')) as Cash');
+      $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();
       $Cash = $Cash[0];

trunk/finance/manage.php

@@ -133 +133 @@
       $DbRow = $DbResult->fetch_array();
       $Advances = $DbRow[0];
-      $DbResult = $this->Database->select('FinanceClaimsLiabilities', '*', 'Subject='.$Subject.' AND TimePayment IS NULL AND Value > 0 ORDER BY TimeCreation LIMIT 1');
+      $DbResult = $this->Database->select('FinanceInvoice', '*', 'Subject='.$Subject.
+      ' AND TimePayment IS NULL AND Value > 0 ORDER BY TimeCreation LIMIT 1');
       //echo($Database->error);
       if($DbResult->num_rows > 0)
@@ -140 +141 @@
         if($Advances > $OpenedClaim['Value'])
         {
-          $this->Database->update('FinanceClaimsLiabilities', 'Id='.$OpenedClaim['Id'], array('TimePayment' => TimeToMysqlDateTime($LastInsertTime)));
-          $this->Database->insert('FinanceAdvances', array('Subject' => $OpenedClaim['Subject'], 'Value' => -$OpenedClaim['Value'], 'TimeCreation' => TimeToMysqlDateTime($LastInsertTime), 'CashFlowId' => $OpenedClaim['Id'], 'Direction' => 'In'));
+          $this->Database->update('FinanceInvoice', 'Id='.$OpenedClaim['Id'], 
+            array('TimePayment' => TimeToMysqlDateTime($LastInsertTime)));
+          $this->Database->insert('FinanceAdvances', array('Subject' => 
+            $OpenedClaim['Subject'], 'Value' => -$OpenedClaim['Value'], 
+            'TimeCreation' => TimeToMysqlDateTime($LastInsertTime), 
+            'CashFlowId' => $OpenedClaim['Id'], 'Direction' => 'In'));
           //echo($Database->LastQuery);
         } else break;
@@ -154 +159 @@
 
     $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine);
-    $this->Database->insert('FinanceClaimsLiabilities', array('Text' => $Text, 
+    $this->Database->insert('FinanceInvoice', array( 
       'Subject' => $Subject, 'TimeCreation' => TimeToMysqlDateTime($TimeCreation), 
       'TimeDue' => TimeToMysqlDateTime($TimeDue), 'Value' => $Value, 'BillCode' => $BillCode,
       'PeriodFrom' => TimeToMysqlDate($PeriodFrom), 'PeriodTo' => TimeToMysqlDate($PeriodTo)));
+    $InvoiceId = $this->Database->insert_id;
+    $this->Database->insert('FinanceInvoice', array('FinanceInvoice' => $InvoiceId, 
+      'Description' => $Text, 'Price' => $Value, 'Quantity' => 1, 'VAT' => 0));
     $Output = '.'; //$this->Database->LastQuery.'<br />';
     //$LastInsertTime = $Time;
@@ -253 +261 @@
       $Form->Values['DocumentLine'], NULL, NULL);
     $LastId = $this->Database->insert_id;
-    $DbResult = $this->Database->select('FinanceClaimsLiabilities', 'BillCode', 'Id='.$LastId);
+    $DbResult = $this->Database->select('FinanceInvoice', 'BillCode', 'Id='.$LastId);
     $DbRow = $DbResult->fetch_assoc();
     $Output = $this->SystemMessage('Finance', 'Faktura vložena '.$DbRow['BillCode'].'.');
@@ -360 +368 @@
     $Output .= $Finance->RecalculateSegmentParameters();
     $Output .= $Finance->LoadTariffs();
-    //$InvoiceGenerator->CustomGenerate();
     $Output .= $Finance->RecalculateMemberPayment();
 
@@ -446 +453 @@
           $BillId = $this->System->Modules['Bill']->CreateBill($Member['Subject'], 
             $BillItems, time(), time() + 3600 * 24 * INVOICE_DUE_DAYS, $BillCode, $Period['From'], $Period['To']);
-          $this->Database->insert('FinanceClaimsLiabilities', array('Value' => $PayPerPeriod, 
+          $this->Database->insert('FinanceInvoice', array( 
             'Subject' => $Member['Subject'], 'TimeCreation' => 'NOW()', 
-            'TimeDue' => 'DATE_ADD(NOW(), INTERVAL '.INVOICE_DUE_DAYS.' DAY)', 
-            'Text' => 'Vyúčtování služeb za období '.$TimePeriodText, 
+            'TimeDue' => 'DATE_ADD(NOW(), INTERVAL '.INVOICE_DUE_DAYS.' DAY)',             
             'Bill' => $BillId, 'BillCode' => $BillCode));
+          $InvoiceId = $this->Database->insert_id;
+          $this->Database->insert('FinanceInvoiceItem', array('FinanceInvoice' => $InvoiceId,
+            'Value' => $PayPerPeriod, 'Text' => 'Vyúčtování služeb za období '.$TimePeriodText,
+           'Quantity' => 1, 'VAT' => 0));
+          
           $Output .= $this->SendPaymentEmail($Member['Id']);
           $this->Database->update('Member', 'Id='.$Member['Id'], array('BillingPeriodLastDate' => TimeToMysqlDateTime($Period['To'])));
@@ -531 +542 @@
       //$Member['BillingPeriodLastDate'] = '2009-04-01';
       $DbResult = $this->Database->query('SELECT T1.* FROM ((SELECT Text, Time, Value AS Value, Bill FROM FinanceOperation WHERE (Subject='.$Member['Subject'].')) UNION ALL '.
-      '(SELECT Text, TimeCreation as Time, -Value as Value, Bill FROM FinanceClaimsLiabilities WHERE (Subject='.$Member['Subject'].')) ORDER BY Time DESC) AS T1 WHERE (T1.Time > "'.$Member['BillingPeriodLastDate'].'")');
+      '(SELECT Text, TimeCreation as Time, -Value as Value, Bill FROM FinanceInvoice WHERE (Subject='.$Member['Subject'].')) ORDER BY Time DESC) AS T1 WHERE (T1.Time > "'.$Member['BillingPeriodLastDate'].'")');
       while($DbRow = $DbResult->fetch_assoc())
       {
@@ -550 +561 @@
   function GenerateBills()
   {
-    // FinanceClaimsLiablities
-    $DbResult = $this->Database->query('SELECT * FROM FinanceClaimsLiabilities WHERE (BillCode <> "") AND (Value != 0) AND (Bill = 0)');
+    // FinanceInvoice
+    $DbResult = $this->Database->query('SELECT * FROM FinanceInvoice WHERE (BillCode <> "") AND (Value != 0) AND (Bill = 0)');
     while($Row = $DbResult->fetch_assoc())
     {
@@ -558 +569 @@
         MysqlDateTimeToTime($Row['TimeCreation']), MysqlDateTimeToTime($Row['TimeDue']), 
         $Row['BillCode'], 'invoice', MysqlDateToTime($Row['PeriodFrom']), MysqlDateToTime($Row['PeriodTo']));
-      $this->Database->update('FinanceClaimsLiabilities', 'Id='.$Row['Id'], array('Bill' => $BillId));
+      $this->Database->update('FinanceInvoice', 'Id='.$Row['Id'], array('Bill' => $BillId));
       echo('.');
     }

trunk/finance/user_state.php

@@ -52 +52 @@
       else $SubjectParam = '';
     $Output .= 'Roky: ';
-    $DbResult = $this->Database->query('SELECT * FROM FinanceYear');
+    $DbResult = $this->Database->query('SELECT * FROM FinanceYear WHERE Year >= '.
+      substr($Member['MembershipDate'], 0, strpos($Member['MembershipDate'], '-')));
     while($FinanceYear = $DbResult->fetch_assoc())
     {
@@ -62 +63 @@
     
     // Account state    
-    $UserOperationTableQuery = '((SELECT Text, Time, Value AS Value, Bill, BillCode FROM FinanceOperation WHERE (Subject='.$Subject['Id'].')) UNION ALL '.
-      '(SELECT Text, TimeCreation as Time, -Value as Value, Bill, BillCode FROM FinanceClaimsLiabilities WHERE (Subject='.$Subject['Id'].')) ORDER BY Time DESC) AS T1';
+    $UserOperationTableQuery = '((SELECT Text, Time, Value AS Value, Bill, 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, '.
+      'TimeCreation as Time, -Value as Value, Bill, 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();
@@ -72 +75 @@
     // Tabulka operaci
     $Output .= 'Výpis operací pro subjekt '.$Subject['Name'].':<br />';
-    $Output .= '<table style="font-size: smaller;" class="WideTable"><tr><th>Datum</th><th>Popis</th><th>Částka</th><th>Doklad</th></tr>';
+    $Output .= '<table style="font-size: smaller;" class="WideTable"><tr>'.
+    '<th>Datum</th><th>Popis</th><th>Částka</th><th>Období</th><th>Doklad</th></tr>';
     $Operations = array();
     $DbResult = $this->Database->query('SELECT T1.* FROM '.$UserOperationTableQuery.$YearWhere);
@@ -83 +87 @@
       if($Row['Value'] > 0) $Row['Value'] = '+'.$Row['Value'];
       if($Row['BillCode'] == '') $Row['BillCode'] = 'PDF';
-      if($Row['Bill'] > 0) $Invoice = '<a href="bill.php?Id='.$Row['Bill'].'">'.$Row['BillCode'].'</a>'; else $Invoice = '&nbsp;';
-      $Output .= '<tr><td style="text-align: right;">'.HumanDate($Row['Time']).'</td><td style="text-align: left;">'.$Row['Text'].'</td><td style="text-align: right;">'.$Row['Value'].'</td><td style="text-align: center;">'.$Invoice.'</td></tr>';
+      if($Row['Bill'] > 0) $Invoice = '<a href="bill.php?Id='.$Row['Bill'].'">'.$Row['BillCode'].'</a>'; 
+        else $Invoice = '&nbsp;';
+      if($Row['PeriodFrom'] != '') $Period = HumanDate($Row['PeriodFrom']).' - '.HumanDate($Row['PeriodTo']);
+        else $Period = '&nbsp;';
+      $Output .= '<tr><td style="text-align: right;">'.HumanDate($Row['Time']).'</td>'.
+      '<td style="text-align: left;">'.$Row['Text'].'</td>'.
+      '<td style="text-align: right;">'.$Row['Value'].'</td>'.
+      '<td style="text-align: center;">'.$Period.'</td>'.
+      '<td style="text-align: center;">'.$Invoice.'</td></tr>';
       $SumValue = $SumValue + $Row['Value'];
     }
-    $Output .= '<tr><td style="text-align: right;" colspan="2"><strong>Celkem za rok</strong></td><td style="text-align: right;"><strong>'.$SumValue.'</strong></td><td style="text-align: center;">&nbsp;</td></tr>';
+    $Output .= '<tr><td style="text-align: right;" colspan="2"><strong>Celkem za rok</strong></td>'.
+    '<td style="text-align: right;"><strong>'.$SumValue.'</strong></td>'.
+    '<td style="text-align: center;">&nbsp;</td>'.
+    '<td style="text-align: center;">&nbsp;</td></tr>';
     
     

trunk/finance/zivnost.php

@@ -11 +11 @@
   var $StartEvidence = 0;
 
-  /*function TransformFinance()
-  {
-    //$Database->Query('SELECT user as Subject, date as TimeCreation, date as TimeDue, date as TimePayment, -money as Value, bill_id as Bill, comment as Text FROM `finance_operations` WHERE Comment LIKE "Poplatek za měsíc%" AND date >= "2007-12-01"');
-    //'TRUNCATE TABLE FinanceCashFlow; INSERT INTO FinanceCashFlow (SELECT '' as Id, user as Subject, comment as Text, date as Time, 1 as Taxable, 0 as Cash, money as Value, bill_id as Bill FROM `finance_operations` WHERE comment NOT LIKE "Poplatek za měsíc%" AND date >= "2007-12-01")'
-    // 'UPDATE finance_operations SET date="2007-11-24" WHERE comment="Jednorázový poplatek za společné zařízení"'
-
-    $DbResult = $this->Database->query('SELECT * FROM users WHERE role=2');
-    while($User = $DbResult->fetch_array())
-    {
-      $DbResult2 = $this->Database->query('SELECT SUM(money) FROM finance_operations WHERE user='.$User['id'].' AND date < "2007-12-01"');
-      $Row = $DbResult2->fetch_array();
-      echo($User['second_name'].' '.$User['first_name'].' '.$Row[0].'<br />');
-      //    if($Row[0] > 0) $Database->insert('FinanceCashFlow', array('Text' => 'Přijatá záloha (z období před účetnictvím)', 'Subject' => $User['id'], 'Time' => '2007-01-01', 'Taxable' => 1, 'Cash' => 0, 'Value' => $Row[0], 'Bill' => 0));
-      if($Row[0] < 0) 
-      {
-        $this->Database->insert('FinanceClaimsLiabilities', array('Text' => 'Připojení k síti (z období před účetnictvím)', 'Subject' => $User['id'], 'TimeCreation' => '2007-12-01', 'TimeDue' => '2007-12-14', 'TimePayment' => '', 'Value' => (-$Row[0]), 'Bill' => 0));
-        //echo($Database->LastQuery.'<br />');
-      }
-    }
-  }*/
   function GetTimePeriodBalance($StartTime, $EndTime)
   {
@@ -50 +30 @@
     $Balance['Spend']['End'] = $Row[0] + 0;
 
-    $DbResult = $this->Database->query('SELECT SUM(Value) FROM FinanceClaimsLiabilities WHERE (TimeCreation < "'.TimeToMysqlDateTime($StartTime).'") AND (TimeCreation >= "'.TimeToMysqlDateTime($this->StartEvidence).'") AND (Value > 0)');
+    $DbResult = $this->Database->query('SELECT SUM(Value) FROM FinanceInvoice WHERE (TimeCreation < "'.TimeToMysqlDateTime($StartTime).'") AND (TimeCreation >= "'.TimeToMysqlDateTime($this->StartEvidence).'") AND (Value > 0)');
     $Row = $DbResult->fetch_array();
     $Balance['Claims']['Start'] = $Row[0] + 0;
-    $DbResult = $this->Database->query('SELECT SUM(Value) FROM FinanceClaimsLiabilities WHERE (TimeCreation <= "'.TimeToMysqlDateTime($EndTime).'") AND (TimeCreation >= "'.TimeToMysqlDateTime($this->StartEvidence).'") AND (Value > 0)');
+    $DbResult = $this->Database->query('SELECT SUM(Value) FROM FinanceInvoice WHERE (TimeCreation <= "'.TimeToMysqlDateTime($EndTime).'") AND (TimeCreation >= "'.TimeToMysqlDateTime($this->StartEvidence).'") AND (Value > 0)');
     $Row = $DbResult->fetch_array();
     $Balance['Claims']['End'] = $Row[0] + 0;
 
-    $DbResult = $this->Database->query('SELECT SUM(-Value) FROM FinanceClaimsLiabilities WHERE (TimeCreation < "'.TimeToMysqlDateTime($StartTime).'") AND (TimeCreation >= "'.TimeToMysqlDateTime($this->StartEvidence).'") AND (Value < 0)');
+    $DbResult = $this->Database->query('SELECT SUM(-Value) FROM FinanceInvoice WHERE (TimeCreation < "'.TimeToMysqlDateTime($StartTime).'") AND (TimeCreation >= "'.TimeToMysqlDateTime($this->StartEvidence).'") AND (Value < 0)');
     $Row = $DbResult->fetch_array();
     $Balance['Liabilities']['Start'] = $Row[0] + 0;
-    $DbResult = $this->Database->query('SELECT SUM(-Value) FROM FinanceClaimsLiabilities WHERE (TimeCreation <= "'.TimeToMysqlDateTime($EndTime).'") AND (TimeCreation >= "'.TimeToMysqlDateTime($this->StartEvidence).'") AND (Value < 0)');
+    $DbResult = $this->Database->query('SELECT SUM(-Value) FROM FinanceInvoice WHERE (TimeCreation <= "'.TimeToMysqlDateTime($EndTime).'") AND (TimeCreation >= "'.TimeToMysqlDateTime($this->StartEvidence).'") AND (Value < 0)');
     $Row = $DbResult->fetch_array();
     $Balance['Liabilities']['End'] = $Row[0] + 0;
@@ -227 +207 @@
         $Output .= '<table style="font-size: smaller;" class="WideTable">';
         $Output .= '<tr><th>Čas vystavení</th><th>Kód</th><th>Subjekt</th><th>Text</th><th>Hodnota [Kč]</th></tr>';
-        $DbResult = $this->Database->query('SELECT * FROM FinanceClaimsLiabilities JOIN Subject ON Subject.Id = FinanceClaimsLiabilities.Subject '.
-          'WHERE (Value > 0) AND (FinanceClaimsLiabilities.TimeCreation >= "'.$Year['DateStart'].'") AND (FinanceClaimsLiabilities.TimeCreation <= "'.$Year['DateEnd'].'") ORDER BY TimeCreation');
+        $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 (Value > 0) AND (FinanceInvoice.TimeCreation >= "'.$Year['DateStart'].
+          '") AND (FinanceInvoice.TimeCreation <= "'.$Year['DateEnd'].'") ORDER BY TimeCreation');
         while($Row = $DbResult->fetch_array())
         {
@@ -247 +229 @@
         $Output .= '<table style="font-size: smaller;" class="WideTable">';
         $Output .= '<tr><th>Čas vystavení</th><th>Kód</th><th>Subjekt</th><th>Text</th><th>Hodnota [Kč]</th></tr>';
-        $DbResult = $this->Database->query('SELECT * FROM FinanceClaimsLiabilities JOIN Subject ON Subject.Id = FinanceClaimsLiabilities.Subject '.
-          'WHERE (Value < 0) AND (FinanceClaimsLiabilities.TimeCreation >= "'.$Year['DateStart'].'") AND (FinanceClaimsLiabilities.TimeCreation <= "'.$Year['DateEnd'].'") ORDER BY TimeCreation');
+        $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 (Value < 0) AND (FinanceInvoice.TimeCreation >= "'.$Year['DateStart'].
+          '") AND (FinanceInvoice.TimeCreation <= "'.$Year['DateEnd'].'") ORDER BY TimeCreation');
         while($Row = $DbResult->fetch_array())
         {
@@ -264 +248 @@
         $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) FROM FinanceClaimsLiabilities AS T1 WHERE (T1.Subject = Subject.Id) AND (T1.Value > 0)) as Claims, '.
-        '(SELECT SUM(T2.Value) FROM FinanceClaimsLiabilities AS T2 WHERE (T2.Subject = Subject.Id) AND (T2.Value > 0) AND (TimePayment IS NULL)) as OpenedClaims, '.
-        '(SELECT -SUM(T3.Value) FROM FinanceClaimsLiabilities AS T3 WHERE (T3.Subject = Subject.Id) AND (T3.Value  < 0)) as Liabilities, '.
-        '(SELECT -SUM(T4.Value) FROM FinanceClaimsLiabilities AS T4 WHERE (T4.Subject = Subject.Id) AND (T4.Value < 0) AND (TimePayment IS NULL)) AS OpenedLiabilities, '.
+        '(SELECT SUM(T1.Value) FROM FinanceInvoice AS T1 WHERE (T1.Subject = Subject.Id) AND (T1.Value > 0)) as Claims, '.
+        '(SELECT SUM(T2.Value) FROM FinanceInvoice AS T2 WHERE (T2.Subject = Subject.Id) AND (T2.Value > 0) AND (TimePayment IS NULL)) as OpenedClaims, '.
+        '(SELECT -SUM(T3.Value) FROM FinanceInvoice AS T3 WHERE (T3.Subject = Subject.Id) AND (T3.Value  < 0)) as Liabilities, '.
+        '(SELECT -SUM(T4.Value) FROM FinanceInvoice AS T4 WHERE (T4.Subject = Subject.Id) AND (T4.Value < 0) AND (TimePayment IS NULL)) AS OpenedLiabilities, '.
         '(SELECT SUM(T5.Value) FROM FinanceOperation AS T5 WHERE (T5.Subject = Subject.Id) AND (T5.Value > 0)) AS Gains, '.
         '(SELECT -SUM(T6.Value) FROM FinanceOperation AS T6 WHERE (T6.Subject = Subject.Id) AND (T6.Value < 0)) AS Spends '.
@@ -306 +290 @@
         $Output .= '<table style="font-size: smaller;" border="1" cellspacing="0" cellpadding="3">';
         $Output .= '<tr><th>Datum vytvoření</th><th>Datum zaplacení</th><th>Název</th><th>Hodnota [Kč]</th><th>Doklad</th></tr>';
-        $DbResult = $this->Database->select('FinanceClaimsLiabilities', '*', 'Subject='.$_GET['Id'].' ORDER BY TimeCreation');
+        $DbResult = $this->Database->select('FinanceInvoice', '*, (SELECT GROUP_CONCAT(Description SEPARATOR ",") FROM FinanceInvoiceItem WHERE FinanceInvoiceItem.FinanceInvoice = FinanceInvoice.Id) AS Text', 'Subject='.$_GET['Id'].' ORDER BY TimeCreation');
         while($Row = $DbResult->fetch_array())
         {
@@ -324 +308 @@
         $Output .= '</table>';*/
 
-        $DbResult = $this->Database->query('SELECT Id, 0 AS Cash, (SELECT SUM(FinanceClaimsLiabilities.Value) '.
-          'FROM FinanceClaimsLiabilities WHERE FinanceClaimsLiabilities.Subject = Subject.Id AND '.
-          'FinanceClaimsLiabilities.Value > 0) as Claims, (SELECT SUM(FinanceClaimsLiabilities.Value) '.
-          'FROM FinanceClaimsLiabilities WHERE FinanceClaimsLiabilities.Subject = Subject.Id AND '.
-          'FinanceClaimsLiabilities.Value > 0 AND TimePayment IS NULL) as OpenedClaims, '.
-          '(SELECT SUM(FinanceClaimsLiabilities.Value) FROM FinanceClaimsLiabilities '.
-          'WHERE FinanceClaimsLiabilities.Subject = Subject.Id AND FinanceClaimsLiabilities.Value < 0) AS '.
-          'Liabilities, (SELECT SUM(FinanceClaimsLiabilities.Value) FROM FinanceClaimsLiabilities '.
-          'WHERE FinanceClaimsLiabilities.Subject = Subject.Id AND FinanceClaimsLiabilities.Value < 0 '.
+        $DbResult = $this->Database->query('SELECT Id, 0 AS Cash, (SELECT SUM(FinanceInvoice.Value) '.
+          'FROM FinanceInvoice WHERE FinanceInvoice.Subject = Subject.Id AND '.
+          'FinanceInvoice.Value > 0) as Claims, (SELECT SUM(FinanceInvoice.Value) '.
+          'FROM FinanceInvoice WHERE FinanceInvoice.Subject = Subject.Id AND '.
+          'FinanceInvoice.Value > 0 AND TimePayment IS NULL) as OpenedClaims, '.
+          '(SELECT SUM(FinanceInvoice.Value) FROM FinanceInvoice '.
+          'WHERE FinanceInvoice.Subject = Subject.Id AND FinanceInvoice.Value < 0) AS '.
+          'Liabilities, (SELECT SUM(FinanceInvoice.Value) FROM FinanceInvoice '.
+          'WHERE FinanceInvoice.Subject = Subject.Id AND FinanceInvoice.Value < 0 '.
           'AND TimePayment IS NULL) as OpenedLiabilities, (SELECT SUM(FinanceOperation.Value) '.
           'FROM FinanceOperation WHERE FinanceOperation.Subject = Subject.Id AND FinanceOperation.Value > 0) '.