if ($options['invoice']=='2') $dropdown_parts .= ' and l.invoice_id is null';
if ($options['timesheet']==TIMESHEET_NOT_ASSIGNED) $dropdown_parts .= ' and l.timesheet_id is null';
if ($options['timesheet']==TIMESHEET_ASSIGNED) $dropdown_parts .= ' and l.timesheet_id is not null';
+ if ($options['approved']=='1') $dropdown_parts .= ' and l.approved = 1';
+ if ($options['approved']=='2') $dropdown_parts .= ' and l.approved = 0';
if ($options['paid_status']=='1') $dropdown_parts .= ' and l.paid = 1';
if ($options['paid_status']=='2') $dropdown_parts .= ' and l.paid = 0';
if ($options['invoice']=='2') $dropdown_parts .= ' and ei.invoice_id is null';
if ($options['timesheet']==TIMESHEET_NOT_ASSIGNED) $dropdown_parts .= ' and ei.timesheet_id is null';
if ($options['timesheet']==TIMESHEET_ASSIGNED) $dropdown_parts .= ' and ei.timesheet_id is not null';
+ if ($options['approved']=='1') $dropdown_parts .= ' and ei.approved = 1';
+ if ($options['approved']=='2') $dropdown_parts .= ' and ei.approved = 0';
if ($options['paid_status']=='1') $dropdown_parts .= ' and ei.paid = 1';
if ($options['paid_status']=='2') $dropdown_parts .= ' and ei.paid = 0';
array_push($fields, "cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost"); // Use project rate for user.
array_push($fields, "null as expense");
}
+ // Add approved.
+ if ($options['show_approved'])
+ array_push($fields, 'l.approved');
// Add paid status.
if ($canViewReports && $options['show_paid'])
array_push($fields, 'l.paid');
array_push($fields, 'ei.name as note');
array_push($fields, 'ei.cost as cost');
array_push($fields, 'ei.cost as expense');
+ // Add approved.
+ if ($options['show_approved'])
+ array_push($fields, 'ei.approved');
// Add paid status.
if ($canViewReports && $options['show_paid'])
array_push($fields, 'ei.paid');
}
}
+ // The markApproved marks a set of records as either approved or unapproved.
+ static function markApproved($time_log_ids, $expense_item_ids, $approved = true) {
+ global $user;
+ $mdb2 = getConnection();
+
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
+
+ $approved_val = (int) $approved;
+ if ($time_log_ids) {
+ $sql = "update tt_log set approved = $approved_val".
+ " where id in(".join(', ', $time_log_ids).") and group_id = $group_id and org_id = $org_id";
+ $affected = $mdb2->exec($sql);
+ if (is_a($affected, 'PEAR_Error')) die($affected->getMessage());
+ }
+ if ($expense_item_ids) {
+ $sql = "update tt_expense_items set approved = $approved_val".
+ " where id in(".join(', ', $expense_item_ids).") and group_id = $group_id and org_id = $org_id";
+ $affected = $mdb2->exec($sql);
+ if (is_a($affected, 'PEAR_Error')) die($affected->getMessage());
+ }
+ }
+
// The markPaid marks a set of records as either paid or unpaid.
static function markPaid($time_log_ids, $expense_item_ids, $paid = true) {
global $user;
$body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.note').'</td>';
if ($options['show_cost'])
$body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.cost').'</td>';
+ if ($options['show_approved'])
+ $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.approved').'</td>';
if ($options['show_paid'])
$body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.paid').'</td>';
if ($options['show_ip'])
$body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.ip').'</td>';
if ($options['show_invoice'])
$body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.invoice').'</td>';
+ if ($options['show_timesheet'])
+ $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.timesheet').'</td>';
$body .= '</tr>';
// Initialize variables to print subtotals.
$body .= ($canViewReports || $isClient) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses'];
$body .= '</td>';
}
+ if ($options['show_approved']) $body .= '<td></td>';
if ($options['show_paid']) $body .= '<td></td>';
if ($options['show_ip']) $body .= '<td></td>';
if ($options['show_invoice']) $body .= '<td></td>';
+ if ($options['show_timesheet']) $body .= '<td></td>';
$body .= '</tr>';
$body .= '<tr><td> </td></tr>';
}
$body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['note']).'</td>';
if ($options['show_cost'])
$body .= '<td style="'.$cellRightAligned.'">'.$record['cost'].'</td>';
+ if ($options['show_approved']) {
+ $body .= '<td style="'.$cellRightAligned.'">';
+ $body .= $record['approved'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
+ $body .= '</td>';
+ }
if ($options['show_paid']) {
$body .= '<td style="'.$cellRightAligned.'">';
$body .= $record['paid'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
}
if ($options['show_invoice'])
$body .= '<td style="'.$cellRightAligned.'">'.htmlspecialchars($record['invoice']).'</td>';
+ if ($options['show_timesheet'])
+ $body .= '<td style="'.$cellRightAligned.'">'.htmlspecialchars($record['timesheet']).'</td>';
$body .= '</tr>';
$prev_date = $record['date'];
$body .= ($canViewReports || $isClient) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses'];
$body .= '</td>';
}
+ if ($options['show_approved']) $body .= '<td></td>';
if ($options['show_paid']) $body .= '<td></td>';
if ($options['show_ip']) $body .= '<td></td>';
if ($options['show_invoice']) $body .= '<td></td>';
+ if ($options['show_timesheet']) $body .= '<td></td>';
$body .= '</tr>';
}
$body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
$body .= '</td>';
}
+ if ($options['show_approved']) $body .= '<td></td>';
if ($options['show_paid']) $body .= '<td></td>';
if ($options['show_ip']) $body .= '<td></td>';
if ($options['show_invoice']) $body .= '<td></td>';
+ if ($options['show_timesheet']) $body .= '<td></td>';
$body .= '</tr>';
$body .= '</table>';
$options['billable'] = $bean->getAttribute('include_records');
$options['invoice'] = $bean->getAttribute('invoice');
$options['paid_status'] = $bean->getAttribute('paid_status');
+ $options['approved'] = $bean->getAttribute('approved');
+ if ($user->isPluginEnabled('ap') && $user->isClient() && !$user->can('view_client_unapproved'))
+ $options['approved'] = 1; // Restrict clients to approved records only.
$options['timesheet'] = $bean->getAttribute('timesheet');
if (is_array($bean->getAttribute('users'))) $options['users'] = join(',', $bean->getAttribute('users'));
$options['period'] = $bean->getAttribute('period');
$options['period_end'] = $bean->getAttribute('end_date');
$options['show_client'] = $bean->getAttribute('chclient');
$options['show_invoice'] = $bean->getAttribute('chinvoice');
+ $options['show_approved'] = $bean->getAttribute('chapproved');
$options['show_paid'] = $bean->getAttribute('chpaid');
$options['show_ip'] = $bean->getAttribute('chip');
$options['show_project'] = $bean->getAttribute('chproject');