X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=time_edit.php;h=6628ce342f1fdc14f5aaff4d6b0e047ea4b3df1d;hb=887ff98dde2f444ef7f33b32fc7f550b5833b5e6;hp=854c4463771a6dd1f65eb76e715e0ccc4add85e5;hpb=c51ac80bc7cbb4b2f77b75cd4120b62675aa7014;p=timetracker.git diff --git a/time_edit.php b/time_edit.php index 854c4463..6628ce34 100644 --- a/time_edit.php +++ b/time_edit.php @@ -72,6 +72,8 @@ if ($request->isPost()) { $cl_billable = 1; if ($user->isPluginEnabled('iv')) $cl_billable = $request->getParameter('billable'); + if ($user->isPluginEnabled('ps')) + $cl_paid = $request->getParameter('paid'); } else { $cl_client = $time_rec['client_id']; $cl_project = $time_rec['project_id']; @@ -93,6 +95,7 @@ if ($request->isPost()) { } $cl_billable = $time_rec['billable']; + $cl_paid = $time_rec['paid']; // Add an info message to the form if we are editing an uncompleted record. if (strlen($cl_start) > 0 && $cl_start == $cl_finish && $cl_duration == '0:00') { @@ -203,6 +206,8 @@ if ($custom_fields && $custom_fields->fields[0]) { $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id)); if ($user->isPluginEnabled('iv')) $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable)); +if ($user->canManageTeam() && $user->isPluginEnabled('ps')) + $form->addInput(array('type'=>'checkbox','name'=>'paid','value'=>$cl_paid)); $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_save or btn_copy click. $form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.save'))); $form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.copy'))); @@ -307,7 +312,8 @@ if ($request->isPost()) { 'finish'=>$cl_finish, 'duration'=>$cl_duration, 'note'=>$cl_note, - 'billable'=>$cl_billable)); + 'billable'=>$cl_billable, + 'paid'=>$cl_paid)); // If we have custom fields - update values. if ($res && $custom_fields) { @@ -366,7 +372,8 @@ if ($request->isPost()) { 'finish'=>$cl_finish, 'duration'=>$cl_duration, 'note'=>$cl_note, - 'billable'=>$cl_billable)); + 'billable'=>$cl_billable, + 'paid'=>$cl_paid)); // Insert a custom field if we have it. $res = true;