Resuming refactoring of invoices for subgroups.

[timetracker.git] / WEB-INF / lib / ttInvoiceHelper.class.php

diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index 3e29e0e04b6b9fa4e727fe58af71fe38d737d1d7..93d272b43fea5ba92f0e84b956fc04f115ff6b68 100644 (file)
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -184,7 +184,7 @@ class ttInvoiceHelper {
       $dt = new DateAndTime(DB_DATEFORMAT);
       while ($val = $res->fetchRow()) {
         $dt->parseVal($val['date']);
       $dt = new DateAndTime(DB_DATEFORMAT);
       while ($val = $res->fetchRow()) {
         $dt->parseVal($val['date']);

-        $val['date'] = $dt->toString($user->date_format);
+        $val['date'] = $dt->toString($user->getDateFormat());

         $result[] = $val;
       }
     }
         $result[] = $val;
       }
     }


@@ -196,30 +196,42 @@ class ttInvoiceHelper {
     global $user;
     $mdb2 = getConnection();
 
     global $user;
     $mdb2 = getConnection();
 

+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+

     // Handle custom field log records.
     if ($delete_invoice_items) {
     // Handle custom field log records.
     if ($delete_invoice_items) {

-      $sql = "update tt_custom_field_log set status = NULL where log_id in (select id from tt_log where invoice_id = $invoice_id and status = 1)";
+      $sql = "update tt_custom_field_log set status = null".
+        " where log_id in".
+        " (select id from tt_log where invoice_id = $invoice_id and group_id = $group_id and org_id = $org_id and status = 1)";

       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error')) return false;
     }
 
     // Handle time records.
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error')) return false;
     }
 
     // Handle time records.

-    if ($delete_invoice_items)
-      $sql = "update tt_log set status = NULL where invoice_id = $invoice_id";
-    else
-      $sql = "update tt_log set invoice_id = NULL where invoice_id = $invoice_id";
+    if ($delete_invoice_items) {
+      $sql = "update tt_log set status = null".
+        " where invoice_id = $invoice_id and group_id = $group_id and org_id = $org_id";
+    } else {
+      $sql = "update tt_log set invoice_id = null".
+        " where invoice_id = $invoice_id and group_id = $group_id and org_id = $org_id";
+    }

     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Handle expense items.
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Handle expense items.

-    if ($delete_invoice_items)
-      $sql = "update tt_expense_items set status = NULL where invoice_id = $invoice_id";
-    else
-      $sql = "update tt_expense_items set invoice_id = NULL where invoice_id = $invoice_id";
+    if ($delete_invoice_items) {
+      $sql = "update tt_expense_items set status = null".
+        " where invoice_id = $invoice_id and group_id = $group_id and org_id = $org_id";
+    } else {
+      $sql = "update tt_expense_items set invoice_id = null".
+        " where invoice_id = $invoice_id and group_id = $group_id and org_id = $org_id";
+    }

     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 

-    $sql = "update tt_invoices set status = NULL where id = $invoice_id and group_id = ".$user->getGroup();
+    $sql = "update tt_invoices set status = null".
+      " where id = $invoice_id and group_id = $group_id and org_id = $org_id";

     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }