Merge branch '2016.11' into 2016.11-develop

diff --git a/tine20/Timetracker/js/TimesheetEditDialog.js b/tine20/Timetracker/js/TimesheetEditDialog.js
index acf3f71..7965af7 100644 (file)
--- a/tine20/Timetracker/js/TimesheetEditDialog.js
+++ b/tine20/Timetracker/js/TimesheetEditDialog.js
@@ -103,14 +103,10 @@ Tine.Timetracker.TimesheetEditDialog = Ext.extend(Tine.widgets.dialog.EditDialog
             // clearable depends on timeaccount is_billable as well (changed by ps / 2009-09-01, behaviour was inconsistent)
             notClearable = notClearable || timeaccount.data.is_billable == "0" || timeaccount.get('is_billable') == "0";
         }
-
-        if (notBillable) {
-            this.getForm().findField('is_billable').setValue(false);
-        }
-
+        
         this.getForm().findField('is_billable').setDisabled(notBillable);
         this.getForm().findField('is_cleared').setDisabled(notClearable);
-
+        
         if (this.record.id == 0 && timeaccount) {
             // set is_billable for new records according to the timeaccount setting
             this.getForm().findField('is_billable').setValue(timeaccount.data.is_billable);