$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;
}
}
global $user;
$mdb2 = getConnection();
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
+
// 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.
- 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.
- 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;
- $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'));
}
// The invoiceableItemsExist determines whether invoiceable records exist in the specified period.
static function invoiceableItemsExist($fields) {
-
- $mdb2 = getConnection();
global $user;
+ $mdb2 = getConnection();
+
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
$client_id = (int) $fields['client_id'];
// Our query is different depending on tracking mode.
if (MODE_TIME == $user->getTrackingMode()) {
// In "time only" tracking mode there is a single user rate.
- $sql = "select count(*) as num from tt_log l, tt_users u
- where l.status = 1 and l.client_id = $client_id and l.invoice_id is NULL
- and l.date >= ".$mdb2->quote($start)." and l.date <= ".$mdb2->quote($end)."
- and l.user_id = u.id
- and l.billable = 1"; // l.billable * u.rate * time_to_sec(l.duration)/3600 > 0 // See explanation below.
+ $sql = "select count(*) as num from tt_log l, tt_users u".
+ " where l.status = 1 and l.client_id = $client_id and l.invoice_id is null".
+ " and l.date >= ".$mdb2->quote($start)." and l.date <= ".$mdb2->quote($end).
+ " and l.user_id = u.id and l.group_id = $group_id and l.org_id = $org_id".
+ " and l.billable = 1"; // l.billable * u.rate * time_to_sec(l.duration)/3600 > 0 // See explanation below.
} else {
// sql part for project id.
if ($project_id) $project_part = " and l.project_id = $project_id";
// When we have projects, rates are defined for each project in tt_user_project_binds table.
- $sql = "select count(*) as num from tt_log l, tt_user_project_binds upb
- where l.status = 1 and l.client_id = $client_id $project_part and l.invoice_id is NULL
- and l.date >= ".$mdb2->quote($start)." and l.date <= ".$mdb2->quote($end)."
- and upb.user_id = l.user_id and upb.project_id = l.project_id
- and l.billable = 1"; // l.billable * upb.rate * time_to_sec(l.duration)/3600 > 0
+ $sql = "select count(*) as num from tt_log l, tt_user_project_binds upb".
+ " where l.status = 1 and l.client_id = $client_id $project_part and l.invoice_id is null".
+ " and l.date >= ".$mdb2->quote($start)." and l.date <= ".$mdb2->quote($end).
+ " and l.group_id = $group_id and l.org_id = $org_id".
+ " and upb.user_id = l.user_id and upb.project_id = l.project_id".
+ " and l.billable = 1"; // l.billable * upb.rate * time_to_sec(l.duration)/3600 > 0
// Users with a lot of clients and projects (Jaro) may forget to set user rates properly.
// Specifically, user rate may be set to 0 on a project, by mistake. This leads to error.no_invoiceable_items
// and increased support cost. Commenting out allows us to include 0 cost items in invoices so that
// sql part for project id.
if ($project_id) $project_part = " and ei.project_id = $project_id";
- $sql = "select count(*) as num from tt_expense_items ei
- where ei.client_id = $client_id $project_part and ei.invoice_id is NULL
- and ei.date >= ".$mdb2->quote($start)." and ei.date <= ".$mdb2->quote($end)."
- and ei.cost <> 0 and ei.status = 1";
+ $sql = "select count(*) as num from tt_expense_items ei".
+ " where ei.client_id = $client_id $project_part and ei.invoice_id is null".
+ " and ei.date >= ".$mdb2->quote($start)." and ei.date <= ".$mdb2->quote($end).
+ " and ei.group_id = $group_id and ei.org_id = $org_id".
+ " and ei.cost <> 0 and ei.status = 1";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
$val = $res->fetchRow();
projects / timetracker.git / blobdiff