projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjusted Work units plugin to count only bullable units.
[timetracker.git]
/
WEB-INF
/
templates
/
reports.tpl
diff --git
a/WEB-INF/templates/reports.tpl
b/WEB-INF/templates/reports.tpl
index
640a55c
..
b57ba84
100644
(file)
--- a/
WEB-INF/templates/reports.tpl
+++ b/
WEB-INF/templates/reports.tpl
@@
-201,13
+201,17
@@
function handleCheckboxes() {
<tr>
<td><b>{$i18n.form.time.billable}</b></td>
<td> </td>
<tr>
<td><b>{$i18n.form.time.billable}</b></td>
<td> </td>
+ {if $user->can('manage_invoices')}
<td><b>{$i18n.label.invoice}</b></td>
<td><b>{$i18n.label.invoice}</b></td>
+ {/if}
</tr>
<tr valign="top">
<td>{$forms.reportForm.include_records.control}</td>
<td> </td>
</tr>
<tr valign="top">
<td>{$forms.reportForm.include_records.control}</td>
<td> </td>
+ {if $user->can('manage_invoices')}
<td>{$forms.reportForm.invoice.control}</td>
</tr>
<td>{$forms.reportForm.invoice.control}</td>
</tr>
+ {/if}
{/if}
{if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))}
<tr>
{/if}
{if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))}
<tr>
@@
-217,7
+221,7
@@
function handleCheckboxes() {
<td>{$forms.reportForm.paid_status.control}</td>
</tr>
{/if}
<td>{$forms.reportForm.paid_status.control}</td>
</tr>
{/if}
-{if $user->can
ManageTeam(
) || $user->isClient()}
+{if $user->can
('view_reports') || $user->can('view_all_reports'
) || $user->isClient()}
<tr>
<td colspan="3"><b>{$i18n.label.users}</b></td>
</tr>
<tr>
<td colspan="3"><b>{$i18n.label.users}</b></td>
</tr>
@@
-244,18
+248,18
@@
function handleCheckboxes() {
<tr>
<td colspan="3">
<table border="0" width="100%">
<tr>
<td colspan="3">
<table border="0" width="100%">
-{if $user->can
ManageTeam(
) || $user->isPluginEnabled('cl') || $user->isPluginEnabled('iv') || $user->isPluginEnabled('ps')}
+{if $user->can
('view_reports') || $user->can('view_all_reports'
) || $user->isPluginEnabled('cl') || $user->isPluginEnabled('iv') || $user->isPluginEnabled('ps')}
<tr>
{if $user->isPluginEnabled('cl')}
<td width="25%"><label>{$forms.reportForm.chclient.control} {$i18n.label.client}</label></td>
{/if}
<tr>
{if $user->isPluginEnabled('cl')}
<td width="25%"><label>{$forms.reportForm.chclient.control} {$i18n.label.client}</label></td>
{/if}
- {if ($user->can
ManageTeam(
) || $user->isClient()) && $user->isPluginEnabled('iv')}
+ {if ($user->can
('manage_invoices'
) || $user->isClient()) && $user->isPluginEnabled('iv')}
<td width="25%"><label>{$forms.reportForm.chinvoice.control} {$i18n.label.invoice}</label></td>
{/if}
<td width="25%"><label>{$forms.reportForm.chinvoice.control} {$i18n.label.invoice}</label></td>
{/if}
- {if ($user->can
ManageTeam(
) && $user->isPluginEnabled('ps'))}
+ {if ($user->can
('manage_invoices'
) && $user->isPluginEnabled('ps'))}
<td width="25%"><label>{$forms.reportForm.chpaid.control} {$i18n.label.paid}</label></td>
{/if}
<td width="25%"><label>{$forms.reportForm.chpaid.control} {$i18n.label.paid}</label></td>
{/if}
- {if $user->can
ManageTeam(
)}
+ {if $user->can
('view_reports') || $user->can('view_all_reports'
)}
<td width="25%"><label>{$forms.reportForm.chip.control} {$i18n.label.ip}</label></td>
{/if}
</tr>
<td width="25%"><label>{$forms.reportForm.chip.control} {$i18n.label.ip}</label></td>
{/if}
</tr>
@@
-280,6
+284,14
@@
function handleCheckboxes() {
<td></td>
{/if}
</tr>
<td></td>
{/if}
</tr>
+{if $user->isPluginEnabled('wu')}
+ <tr>
+ <td></td>
+ <td></td>
+ <td width="25%"><label>{$forms.reportForm.chunits.control} {$i18n.label.work_units}</label></td>
+ <td></td>
+ </tr>
+{/if}
</table>
</td>
</tr>
</table>
</td>
</tr>