holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Timesheet: Fix created was overlapping with status

Browse Source
This commit is contained in:
nathangray 2021-04-13 13:28:56 -06:00
parent bf7770befe
commit 826d9e27cc
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/lang/egw_de.lang
View File

@ -338,6 +338,7 @@ could not contact server. operation timed out! common de Konnte Server nicht kon
create common de Erstellen
create a new table for the application common de Neue Tabelle für die Anwendung anlegen
create link common de Verknüpfung erstellen
created common de Erstellt
created by common de Erstellt von
created by %1 common de Erstellt von %1
creates an english ('en') langfile from label and helptexts (for application in name) common de erzeugt eine englische ('en') Sprachdatei aus den Beschriftungen und Hilfetexten (für die Anwendung in Name)

1
api/lang/egw_en.lang
View File

@ -338,6 +338,7 @@ could not contact server. operation timed out! common en Could not contact serve
create common en Create
create a new table for the application common en Create a new table for the application
create link common en Create link
created common en Created
created by common en Created by
created by %1 common en Created by %1
creates an english ('en') langfile from label and helptexts (for application in name) common en Creates an English ('en') langfile from label and help texts (for application in Name)

18
timesheet/templates/default/edit.xet
View File

@ -134,25 +134,23 @@
</row>
<row class="dialogOperators">
<description value="User" for="ts_owner"/>
<hbox span="2" class="et2_fullWidth">
<menulist>
<menupopup id="ts_owner" no_lang="1"/>
</menulist>
<date-time id="ts_created" readonly="true" align="left"/>
</hbox>
<select id="ts_owner" no_lang="1" span="2"/>
<description value="Status" disabled="@no_ts_status"/>
<menulist span="3">
<menupopup statustext="select a status of the timesheet" id="ts_status" class="et2_fullWidth" empty_label="please select" disabled="@no_ts_status"/>
</menulist>
<description/>
</row>
<row disabled="!@ts_modified" class="dialogOperators">
<row class="dialogOperators">
<description value="Last modified"/>
<hbox span="2" class="et2_fullWidth">
<hbox span="3" class="et2_fullWidth">
<menulist>
<menupopup type="select-account" id="ts_modifier" readonly="true"/>
</menulist>
<date-time id="ts_modified" readonly="true" align="left"/>
<date-time id="ts_modified" readonly="true" align="left" disabled="!@ts_modified"/>
</hbox>
<hbox>
<description value="Created"/>
<date-time id="ts_created" readonly="true" align="left"/>
</hbox>
</row>
<row class="dialogFooterToolbar">