$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();
// createInvoice - marks items for invoice as belonging to it (with its reference number).
static function createInvoice($fields) {
-
- $mdb2 = getConnection();
global $user;
+ $mdb2 = getConnection();
+
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
$name = $fields['name'];
if (!$name) return false;
if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
// Create a new invoice record.
- $sql = "insert into tt_invoices (group_id, org_id, name, date, client_id) values(".
- $user->getGroup().", $user->org_id, ".$mdb2->quote($name).", ".$mdb2->quote($date).", $client_id)";
+ $sql = "insert into tt_invoices (group_id, org_id, name, date, client_id)".
+ " values($group_id, $org_id, ".$mdb2->quote($name).", ".$mdb2->quote($date).", $client_id)";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error')) return false;
// Our update sql is different depending on tracking mode.
if (MODE_TIME == $user->getTrackingMode()) {
// In "time only" tracking mode there is a single user rate.
- $sql = "update tt_log l
- left join tt_users u on (u.id = l.user_id)
- set l.invoice_id = $last_id
- 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.billable = 1"; // l.billable * u.rate * time_to_sec(l.duration)/3600 > 0"; // See explanation below.
+ $sql = "update tt_log l".
+ " left join tt_users u on (u.id = l.user_id)".
+ " set l.invoice_id = $last_id".
+ " where l.status = 1 and l.client_id = $client_id and l.invoice_id is null".
+ " and l.group_id = $group_id and l.org_id = $org_id".
+ " and l.date >= ".$mdb2->quote($start)." and l.date <= ".$mdb2->quote($end).
+ " and l.duration > 0 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.
- $sql = "update tt_log l
- left join tt_user_project_binds upb on (upb.user_id = l.user_id and upb.project_id = l.project_id)
- set l.invoice_id = $last_id
- 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.billable = 1"; // l.billable * upb.rate * time_to_sec(l.duration)/3600 > 0";
+ $sql = "update tt_log l".
+ " left join tt_user_project_binds upb on (upb.user_id = l.user_id and upb.project_id = l.project_id)".
+ " set l.invoice_id = $last_id".
+ " where l.status = 1 and l.client_id = $client_id $project_part and l.invoice_id is null".
+ " and l.group_id = $group_id and l.org_id = $org_id".
+ " and l.date >= ".$mdb2->quote($start)." and l.date <= ".$mdb2->quote($end).
+ " and l.duration > 0 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 project_id = $project_id";
- $sql = "update tt_expense_items set invoice_id = $last_id where client_id = $client_id $project_part and invoice_id is NULL
- and date >= ".$mdb2->quote($start)." and date <= ".$mdb2->quote($end)." and cost <> 0 and status = 1";
+ $sql = "update tt_expense_items set invoice_id = $last_id".
+ " where client_id = $client_id $project_part and invoice_id is null".
+ " and group_id = $group_id and org_id = $org_id".
+ " and date >= ".$mdb2->quote($start)." and date <= ".$mdb2->quote($end)." and cost <> 0 and status = 1";
$affected = $mdb2->exec($sql);
return (!is_a($affected, 'PEAR_Error'));
}
global $user;
global $i18n;
+ $currency = $user->getCurrency();
+ $decimalMark = $user->getDecimalMark();
+
$invoice = ttInvoiceHelper::getInvoice($invoice_id);
$client = ttClientHelper::getClient($invoice['client_id'], true);
$invoice_items = ttInvoiceHelper::getInvoiceItems($invoice_id);
}
$total = $subtotal + $tax;
- $subtotal = htmlspecialchars($user->currency).' '.str_replace('.', $user->decimal_mark, sprintf('%8.2f', round($subtotal, 2)));
- if ($tax) $tax = htmlspecialchars($user->currency).' '.str_replace('.', $user->decimal_mark, sprintf('%8.2f', round($tax, 2)));
- $total = htmlspecialchars($user->currency).' '.str_replace('.', $user->decimal_mark, sprintf('%8.2f', round($total, 2)));
+ $subtotal = htmlspecialchars($currency).' '.str_replace('.', $decimalMark, sprintf('%8.2f', round($subtotal, 2)));
+ if ($tax) $tax = htmlspecialchars($currency).' '.str_replace('.', $decimalMark, sprintf('%8.2f', round($tax, 2)));
+ $total = htmlspecialchars($currency).' '.str_replace('.', $decimalMark, sprintf('%8.2f', round($total, 2)));
- if ('.' != $user->decimal_mark) {
+ if ('.' != $decimalMark) {
foreach ($invoice_items as &$item) {
- $item['cost'] = str_replace('.', $user->decimal_mark, $item['cost']);
+ $item['cost'] = str_replace('.', $decimalMark, $item['cost']);
}
unset($item); // Unset the reference. If we don't, the foreach loop below modifies the array while printing.
// See http://stackoverflow.com/questions/8220399/php-foreach-pass-by-reference-last-element-duplicating-bug
projects / timetracker.git / blobdiff