$mdb2 = getConnection();
$sql = "select id, name, cost from tt_predefined_expenses
- where id = $id and group_id = ".$user->getActiveGroup();
+ where id = $id and group_id = ".$user->getGroup();
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
$val = $res->fetchRow();
$mdb2 = getConnection();
- $sql = "delete from tt_predefined_expenses where id = $id and group_id = ".$user->getActiveGroup();
+ $sql = "delete from tt_predefined_expenses where id = $id and group_id = ".$user->getGroup();
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error'))
return false;
$mdb2 = getConnection();
- $group_id = $user->getActiveGroup();
+ $group_id = $user->getGroup();
$org_id = $user->org_id;
$name = $fields['name'];
$cost = $fields['cost'];
$mdb2 = getConnection();
- $group_id = $user->getActiveGroup();
+ $group_id = $user->getGroup();
$org_id = $user->org_id;
$predefined_expense_id = (int) $fields['id'];
$name = $fields['name'];
$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 group_id = $group_id"; // TODO: add org_id when possible.
+ " 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'));
}