X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/988dcb3947c5e0d347f1002dbee2ff5c5c56e1db..2bfbf9aa34b4e672ceba72003e294a0a6c5c7972:/reports.php diff --git a/reports.php b/reports.php index 69e74235..710de524 100644 --- a/reports.php +++ b/reports.php @@ -122,6 +122,16 @@ $form->addInput(array('type'=>'combobox', 'data'=>$include_options, 'empty'=>array(''=>$i18n->getKey('dropdown.all')))); +if ($user->isPluginEnabled('ps')) { + $form->addInput(array('type'=>'combobox', + 'name'=>'paid_status', + 'style'=>'width: 250px;', + 'data'=>array('1'=>$i18n->getKey('dropdown.paid'),'2'=>$i18n->getKey('dropdown.not_paid')), + 'empty'=>array(''=>$i18n->getKey('dropdown.all')) + )); +} + + // Add invoiced / not invoiced selector. $invoice_options = array('1'=>$i18n->getKey('form.reports.include_invoiced'), '2'=>$i18n->getKey('form.reports.include_not_invoiced')); @@ -221,7 +231,7 @@ $form->addInput(array('type'=>'submit','name'=>'btn_generate','value'=>$i18n->ge $bean = new ActionForm('reportBean', $form, $request); // At this point form values are obtained from session if they are there. -if (($request->getMethod() == 'GET') && !$bean->isSaved()) { +if ($request->isGet() && !$bean->isSaved()) { // No previous form data were found in session. Use the following default values. $form->setValueByElement('users', array_keys($user_list)); $period = new Period(INTERVAL_THIS_MONTH, new DateAndTime($user->date_format));