-{if (($user->isPluginEnabled('cl') && !($user->isClient() && $user->client_id)) || ($custom_fields && $custom_fields->fields[0] && $custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN))}
-
- {if $user->isPluginEnabled('cl') && !($user->isClient() && $user->client_id)}{$i18n.label.client} | {else} | {/if}
- |
- {if ($custom_fields && $custom_fields->fields[0] && $custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)}{$i18n.label.option} | {else} | {/if}
-
- {$forms.reportForm.client.control} |
- |
- {$forms.reportForm.option.control} |
-
+
+
+{if $show_client}
+ {$i18n.label.client} |
+ {$forms.reportForm.client.control} |
{/if}
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-
- {$i18n.label.project} |
- |
- {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
- {$i18n.label.task} |
- {/if}
-
+{if $show_project}
+ {$i18n.label.project} |
+ {$forms.reportForm.project.control} |
{/if}
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-
- {$forms.reportForm.project.control} |
- |
- {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
- {$forms.reportForm.task.control} |
- {/if}
-
+{if $show_billable}
+ {$i18n.form.time.billable} |
+ {$forms.reportForm.include_records.control} |
{/if}
-{if $user->isPluginEnabled('iv')}
-
- {$i18n.form.time.billable} |
- |
- {$i18n.label.invoice} |
-
-
- {$forms.reportForm.include_records.control} |
- |
- {$forms.reportForm.invoice.control} |
-
+{if $show_paid_status}
+ {$i18n.label.paid_status} |
+ {$forms.reportForm.paid_status.control} |
{/if}
-{if $user->canManageTeam() || $user->isClient()}
+
+ |
+ |
+
+
+{if $show_cf_1_dropdown}
+ {$i18n.label.option} |
+ {$forms.reportForm.option.control} |
+{/if}
+{if $show_task}
+ {$i18n.label.task} |
+ {$forms.reportForm.task.control} |
+{/if}
+{if $show_approved}
+ {$i18n.label.approved} |
+ {$forms.reportForm.approved.control} |
+{/if}
+{if $show_invoice_dropdown}
+ {$i18n.label.invoice} |
+ {$forms.reportForm.invoice.control} |
+{/if}
+{if $show_timesheet_dropdown}
+ {$i18n.label.timesheet} |
+ {$forms.reportForm.timesheet.control} |
+{/if}
+
+ |
+
+{if $show_users}
{$i18n.label.users} |
@@ -236,44 +327,75 @@ function handleCheckboxes() {
-{if $user->isPluginEnabled('cl') || $user->isPluginEnabled('iv')}
- {if $user->isPluginEnabled('cl')}
- |
- {/if}
- {if ($user->canManageTeam() || $user->isClient()) && $user->isPluginEnabled('iv')}
- |
- {/if}
-
+
+
+{if $show_client}
+ |
{/if}
-
- {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}{/if} |
- {if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}{/if} |
- |
-{if ((($user->canManageTeam() || $user->isClient()) || $user->isPluginEnabled('ex')) && defined('COST_ON_REPORTS') && isTrue($smarty.const.COST_ON_REPORTS))}
- |
-{else}
- |
+{if $show_project}
+ |
{/if}
-
-
- {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}{/if} |
- {if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}{/if} |
- |
-{if ($custom_fields && $custom_fields->fields[0])}
- |
-{else}
- |
+{if $show_timesheet_checkbox}
+ |
+{/if}
+{if $show_cf_1_checkbox}
+ |
+{/if}
+
+ |
+
+
+{if $show_start}
+ |
+{/if}
+{if $show_task}
+ |
+{/if}
+{if $show_ip}
+ |
+{/if}
+{if $show_work_units}
+ |
{/if}
+
+ |
+
+
+{if $show_finish}
+ |
+{/if}
+ |
+{if $show_approved}
+ |
+{/if}
+{if $show_invoice_checkbox}
+ |
+{/if}
+
+ |
+
+
+ |
+ |
+{if $show_paid_status}
+ |
+{/if}
+
+ |
|
-
- {$i18n.form.reports.group_by} |
-
+
+ {$i18n.form.reports.group_by} |
- {$forms.reportForm.group_by.control} |
+ {$forms.reportForm.group_by1.control} |
+ {$forms.reportForm.group_by2.control} |
+ {$forms.reportForm.group_by3.control} |
+
+
+ |