X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttPredefinedExpenseHelper.class.php;h=27a3a83327eaa931aa67b298a919219421a56dcd;hb=7faef0e6d81444ad3ae10d1a2ce62fa753c80a9f;hp=556bc42f6b1f5c833b359dee940aba91d4e2cc19;hpb=f270b1e143509303e32f65c3dda3fbecaee56c6b;p=timetracker.git

diff --git a/WEB-INF/lib/ttPredefinedExpenseHelper.class.php b/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
index 556bc42f..27a3a833 100644
--- a/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
+++ b/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
@@ -39,7 +39,7 @@ class ttPredefinedExpenseHelper {
     $mdb2 = getConnection();
 
     $sql = "select id, name, cost from tt_predefined_expenses
-      where id = $id and team_id = $user->team_id";
+      where id = $id and group_id = ".$user->getActiveGroup();
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -58,7 +58,7 @@ class ttPredefinedExpenseHelper {
 
     $mdb2 = getConnection();
 
-    $sql = "delete from tt_predefined_expenses where id = $id and team_id = $user->team_id";
+    $sql = "delete from tt_predefined_expenses where id = $id and group_id = ".$user->getActiveGroup();
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -73,14 +73,15 @@ class ttPredefinedExpenseHelper {
 
     $mdb2 = getConnection();
 
-    $team_id = (int) $fields['team_id'];
+    $group_id = $user->getActiveGroup();
+    $org_id = $user->org_id;
     $name = $fields['name'];
     $cost = $fields['cost'];
     if ('.' != $user->decimal_mark)
       $cost = str_replace($user->decimal_mark, '.', $cost);
 
-    $sql = "insert into tt_predefined_expenses (team_id, name, cost)
-      values ($team_id, ".$mdb2->quote($name).", ".$mdb2->quote($cost).")";
+    $sql = "insert into tt_predefined_expenses (group_id, org_id, name, cost)".
+      " values ($group_id, $org_id, ".$mdb2->quote($name).", ".$mdb2->quote($cost).")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -95,15 +96,16 @@ class ttPredefinedExpenseHelper {
 
     $mdb2 = getConnection();
 
+    $group_id = $user->getActiveGroup();
+    $org_id = $user->org_id;
     $predefined_expense_id = (int) $fields['id'];
-    $team_id = (int) $fields['team_id'];
     $name = $fields['name'];
     $cost = $fields['cost'];
     if ('.' != $user->decimal_mark)
       $cost = str_replace($user->decimal_mark, '.', $cost);
 
     $sql = "update tt_predefined_expenses set name = ".$mdb2->quote($name).", cost = ".$mdb2->quote($cost).
-      " where id = $predefined_expense_id and team_id = $team_id";
+      " where id = $predefined_expense_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }