Merge pull request #38 from uklawitter/master

Current Version Diff
thaberkern · Mar 19, 2014 · 8ebb865 · 8ebb865
2 parents 5b4ea88 + 5fcd928
commit 8ebb865
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git 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]
diff --git 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
diff --git a/web/css/flexigrid/images/._fhbg.gif b/web/css/flexigrid/images/._fhbg.gif
diff --git a/web/css/flexigrid/images/._wbg.gif b/web/css/flexigrid/images/._wbg.gif