X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=WEB-INF%2Ftemplates%2Ftime.tpl;h=f82897d2a9f285a565951c28998fb7d201931dac;hb=566ab32f690c6e281a85c79345af95dca9a97898;hp=f532be42491ba36ee4849a566b4ca020a8be084a;hpb=16cbd33bec16854f1b6a4caf4ac24ededc8326f3;p=timetracker.git
diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index f532be42..f82897d2 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -18,10 +18,10 @@
-{if $on_behalf_control}
+{if $user_dropdown}
{$i18n.label.user}: |
- {$forms.timeRecordForm.onBehalfUser.control} |
+ {$forms.timeRecordForm.user.control} |
{/if}
{if $user->isPluginEnabled('cl')}
@@ -66,7 +66,7 @@
{if (($smarty.const.TYPE_DURATION == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
{$i18n.label.duration}: |
- {$forms.timeRecordForm.duration.control} {if $user->decimal_mark == ','}{str_replace('.', ',', $i18n.form.time.duration_format)}{else}{$i18n.form.time.duration_format}{/if} |
+ {$forms.timeRecordForm.duration.control} {if $user->getDecimalMark() == ','}{str_replace('.', ',', $i18n.form.time.duration_format)}{else}{$i18n.form.time.duration_format}{/if} |
{/if}
@@ -130,7 +130,7 @@
| {if ($record.duration == '0:00' && $record.start <> '')}{$i18n.form.time.uncompleted}{else}{$record.duration}{/if} |
{if $record.comment}{$record.comment|escape}{else} {/if} |
- {if $record.invoice_id}
+ {if $record.timesheet_id || $record.invoice_id}
{else}
{$i18n.label.edit}
@@ -149,7 +149,7 @@
|
-{if $time_records}
+