Changeset 70 for www

Timestamp:

Apr 16, 2008, 6:17:48 PM (17 years ago)

Author:

george

Message:

Přidáno: Skripty pro podporu vedení daňové evidence.

Location:

www/finance

Files:

• bills.php (modified) (1 diff)
• classes.php (added)
• clenove.php (modified) (5 diffs)
• finance.php (added)
• manage.php (added)
• zivnost.php (added)

www/finance/bills.php

@@ -39 +39 @@
       $User['street'].'<br>'.
       $User['psc'].' '.$User['town'].'<br>';
-      if($User['ico'] != 0) $Output .= 'IČO: '.$User['ico'].'<br>';
+      if($User['ico'] != 0) $Output .= 'IČ: '.$User['ico'].'<br>';
       if($User['dic'] != '') $Output .= 'DIČ: '.$User['dic'].'<br>';
       $Output .= 

www/finance/clenove.php

@@ -10 +10 @@
 {
   case 'user':
-    ShowHeader('Seznam členů sítě', 'Seznam členů');
+    ShowHeader('Seznam účastníků sítě', 'Seznam účastníků');
     $DbResult = $Database->query("SELECT *,CONCAT(second_name, ' ', first_name) as fullname FROM users WHERE id=".$UserID);
     $Row2 = $DbResult->fetch_array();
@@ -18 +18 @@
     // Tabulka operaci
     echo('Výpis operací pro účastníka '.$Row2['fullname'].':<br>');
-    echo('<table style="font-size: smaller;" border="1" cellspacing="0" cellpadding="3"><tr><th>Datum</th><th>Změna</th><th>Doklad</th><th>Komentář</th></tr>');
-    $DbResult = $Database->query("SELECT * FROM finance_operations WHERE user=".$_GET['id'].' ORDER BY date DESC');
-    while($Row = $DbResult->fetch_array())
+    echo('<table style="font-size: smaller;" border="1" cellspacing="0" cellpadding="3"><tr><th>Datum</th><th>Popis</th><th>Doklad</th><th>Komentář</th></tr>');
+    $Operations = array();
+    $DbResult = $Database->query('(SELECT Time, Value, Text, Bill FROM FinanceCashFlow WHERE Subject='.$_GET['id'].') UNION ALL '.
+      '(SELECT TimeCreation as Time, (-Value) as Value, Text, Bill FROM FinanceClaimsLiabilities WHERE Subject='.$_GET['id'].') ORDER BY Time');
+    while($DbRow = $DbResult->fetch_array())
+      $Operations[] = $DbRow;
+    foreach($Operations as $Row)
     {
-      if($Row['money'] > 0) $Row['money'] = '+'.$Row['money'];
-      if($Row['bill_id'] > 0) $Invoice = '<a href="?show=bill&amp;id='.$Row['bill_id'].'">PDF</a>'; else $Invoice = '&nbsp;';
-      echo('<tr><td align="right">'.HumanDate($Row['date']).'</td><td>'.$Row['money'].'</td><td>'.$Invoice.'</td><td>'.$Row['comment'].'&nbsp;</td></tr>');
+      if($Row['Value'] > 0) $Row['Value'] = '+'.$Row['Value'];
+      if($Row['Bill'] > 0) $Invoice = '<a href="?show=bill&amp;id='.$Row['Bill'].'">PDF</a>'; else $Invoice = '&nbsp;';
+      echo('<tr><td align="right">'.HumanDate($Row['Time']).'</td><td>'.$Row['Text'].'</td><td>'.$Row['Value'].'</td><td>'.$Invoice.'</td></tr>');
     }
     //echo('<tr><td>&nbsp;</td><td>-'.$Row2['network_device'].'</td><td>Proměnná cena za zařízení</td></tr>
     echo('</table>');
-    echo('<h3><strong>Stav účtu: </strong>'.$Row2['cash'].' Kč</h3><br>');
+    $DbResult = $Database->query('SELECT ((SELECT COALESCE(SUM(Value), 0) FROM FinanceCashFlow WHERE Subject='.$_GET['id'].') + '.
+      '(SELECT COALESCE(SUM(-Value), 0) FROM FinanceClaimsLiabilities WHERE Subject='.$_GET['id'].')) as Total');
+    $DbRow = $DbResult->fetch_array();
+    $Total = $DbRow['Total'];
+    echo('<h3><strong>Stav účtu: </strong>'.$Total.' Kč</h3><br>');
     echo('</td><td valign="top">');
 
@@ -117 +125 @@
     break;
   default:
-    ShowHeader('Seznam členů sítě', 'Seznam členů');
+    ShowHeader('Seznam účastníků sítě', 'Seznam účastníků');
     // Seznam členů
-    echo('Seznam členů:<br>'.
+    echo('Seznam účastníků:<br>'.
     '<table style="font-size: smaller;" border="1" cellspacing="0" cellpadding="3">'.
     '<tr><th>Jméno</th>');
@@ -127 +135 @@
     $TotalMonth = 0;
     $TotalCash = 0;
-    $DbResult = $Database->query("SELECT *,CONCAT(second_name, ' ', first_name) as fullname FROM users WHERE role=2 ORDER BY fullname");
+    $DbResult = $Database->query('SELECT *, CONCAT(users.second_name, " ", users.first_name) as Fullname, (SELECT SUM(FinanceClaimsLiabilities.Value) FROM FinanceClaimsLiabilities WHERE FinanceClaimsLiabilities.Subject = users.id AND FinanceClaimsLiabilities.Value > 0 AND TimePayment IS NULL) as OpenedClaims, (SELECT SUM(FinanceClaimsLiabilities.Value) FROM FinanceClaimsLiabilities WHERE FinanceClaimsLiabilities.Subject = users.id AND FinanceClaimsLiabilities.Value < 0 AND TimePayment IS NULL) as OpenedLiabilities, (SELECT SUM(FinanceCashFlow.Value) FROM FinanceCashFlow WHERE FinanceCashFlow.Subject = users.id AND FinanceCashFlow.Value > 0) as Gains, (SELECT SUM(FinanceCashFlow.Value) FROM FinanceCashFlow WHERE FinanceCashFlow.Subject = users.id AND FinanceCashFlow.Value < 0) as Spends, (SELECT SUM(FinanceAdvances.Value) FROM FinanceAdvances WHERE FinanceAdvances.Subject = users.id AND FinanceAdvances.Direction="In") as AdvancesIn, (SELECT SUM(FinanceAdvances.Value) FROM FinanceAdvances WHERE FinanceAdvances.Subject = users.id AND FinanceAdvances.Direction="Out") as AdvancesOut FROM users WHERE role=2 ORDER BY fullname');
+
+    //$DbResult = $Database->query("SELECT *,CONCAT(second_name, ' ', first_name) as fullname FROM users WHERE role=2 ORDER BY fullname");
     while($Row = $DbResult->fetch_array())
     {
@@ -139 +149 @@
         }
       } 
+      $Row['cash'] = $Row['AdvancesIn'] - $Row['AdvancesOut'] + $Row['OpenedLiabilities'] - $Row['OpenedClaims'];
       $TotalCash += $Row['cash'];
       if($Row['cash'] < 0) $Row['cash'] = '<span style="color: red;">'.$Row['cash'].'</span>';
       $Tarif = $Tarify[$Row['inet_tarif_now']]['name'];
       $PristiTarif = $Tarify[$Row['inet_tarif_next']]['name'];
-      echo('<tr><td><a href="?show=user&amp;id='.$Row['id'].'">'.$Row['fullname'].'</a></td>');
+      echo('<tr><td><a href="?show=user&amp;id='.$Row['id'].'">'.$Row['Fullname'].'</a></td>');
 //<td align="right">'.$Row['network_device'].'</td>
       echo('<td align="right">'.$Monthly.'</td><td align="right">'.$Row['cash'].'</td><td align="center">'.$Tarif.'</td><td align="center">'.$PristiTarif.'</td><td>'.$Row['notice'].'&nbsp;</td></tr>');