Changeset 75 for www/finance

Timestamp:

Apr 16, 2008, 8:23:03 PM (17 years ago)

Author:

george

Message:

Opraveno: Generování seznamu majetku.
Opraveno: Řazení výpisu operací účastníků od nejnovějšího data.

Location:

www/finance

Files:

• clenove.php (modified) (1 diff)
• manage.php (modified) (2 diffs)

www/finance/clenove.php

@@ -21 +21 @@
     $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');
+      '(SELECT TimeCreation as Time, (-Value) as Value, Text, Bill FROM FinanceClaimsLiabilities WHERE Subject='.$_GET['id'].') ORDER BY Time DESC');
     while($DbRow = $DbResult->fetch_array())
       $Operations[] = $DbRow;

www/finance/manage.php

@@ -182 +182 @@
   {
     //$Database->insert('FinanceSmallAsset', array());
-    $Items[] = array('description' => $Device['name'], 'quantity' => $Device['count'], 'price' => $Device['price']); 
+    $Items[] = array('description' => $Device['name'], 'quantity' => $Device['count'], 'price' => 0); //$Device['price']); 
     $LastId = $Device['id'];
     $TotalPrice += $Device['price'] * $Device['count'];
@@ -204 +204 @@
   {
     //$Database->insert('FinanceSmallAsset', array());
-    $Items[] = array('description' => $Device['name'], 'quantity' => $Device['count'], 'price' => $Device['price']);
+    $Items[] = array('description' => $Device['name'], 'quantity' => $Device['count'], 'price' => 0); //$Device['price']);
     $TotalPrice += $Device['price'] * $Device['count'];
   }
   //print_r($Items);
-  $InvoiceGenerator->CreateBill($Subject, $Items, $Time, $Time);
+  $BillId = $InvoiceGenerator->CreateBill($Subject, $Items, $Time, $Time);
   $DbResult = $Database->query('UPDATE network_devices SET TimeEnlistment = "'.TimeToMysqlDateTime($Time).'" WHERE used <> 0 AND date < "'.TimeToMysqlDateTime($Time).'" AND (id > '.$LastId.')');
   InsertLiability($Subject, 0, $Time, $BillId, 'Nákup infrastruktury', $Time);