diff --git a/apps/frontend/config/app.yml b/apps/frontend/config/app.yml index 44d6ec1..c069ef2 100644 --- a/apps/frontend/config/app.yml +++ b/apps/frontend/config/app.yml @@ -1,5 +1,5 @@ all: - version: 1.3.6 + version: 1.3.7 user: cultures: [de,en] \ No newline at end of file diff --git a/apps/frontend/modules/timesheet/actions/actions.class.php b/apps/frontend/modules/timesheet/actions/actions.class.php index ff01461..300eb22 100644 --- a/apps/frontend/modules/timesheet/actions/actions.class.php +++ b/apps/frontend/modules/timesheet/actions/actions.class.php @@ -122,6 +122,12 @@ public function executeUpdate($request) $type = $type_query->from('TimeItemType tit') ->where('tit.name=? and tit.account_id=?', array($time_type, $this->getUser()->getAttribute('account_id'))) ->fetchOne(); + + if (!$type) { + $type = $type_query->from('TimeItemType tit') + ->where('tit.default_item=1 and tit.account_id=?', array($time_type, $this->getUser()->getAttribute('account_id'))) + ->fetchOne(); + } $current_value = new TimeLogItem(); diff --git a/lib/vendor/symfony b/lib/vendor/symfony index 52178f1..f97ef41 160000 --- a/lib/vendor/symfony +++ b/lib/vendor/symfony @@ -1 +1 @@ -Subproject commit 52178f14ab89d63fd9daf50b755be8d67274d767 +Subproject commit f97ef41cda2d6e084588e3cf5cbd60c3921e6311 diff --git a/web/css/flexigrid/images/._fhbg.gif b/web/css/flexigrid/images/._fhbg.gif deleted file mode 100644 index d40744c..0000000 Binary files a/web/css/flexigrid/images/._fhbg.gif and /dev/null differ diff --git a/web/css/flexigrid/images/._wbg.gif b/web/css/flexigrid/images/._wbg.gif deleted file mode 100644 index 420ffb3..0000000 Binary files a/web/css/flexigrid/images/._wbg.gif and /dev/null differ