'data'=>$include_options,
'empty'=>array(''=>$i18n->getKey('dropdown.all'))));
+if ($user->canManageTeam() && $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'));
$form->addInput(array('type'=>'combobox',
'name'=>'period',
'style'=>'width: 250px;',
- 'data'=>array(INTERVAL_THIS_MONTH=>$i18n->getKey('dropdown.this_month'),
- INTERVAL_LAST_MONTH=>$i18n->getKey('dropdown.last_month'),
- INTERVAL_THIS_WEEK=>$i18n->getKey('dropdown.this_week'),
- INTERVAL_LAST_WEEK=>$i18n->getKey('dropdown.last_week')),
+ 'data'=>array(INTERVAL_THIS_MONTH=>$i18n->getKey('dropdown.current_month'),
+ INTERVAL_LAST_MONTH=>$i18n->getKey('dropdown.previous_month'),
+ INTERVAL_THIS_WEEK=>$i18n->getKey('dropdown.current_week'),
+ INTERVAL_LAST_WEEK=>$i18n->getKey('dropdown.previous_week'),
+ INTERVAL_THIS_DAY=>$i18n->getKey('dropdown.current_day'),
+ INTERVAL_LAST_DAY=>$i18n->getKey('dropdown.previous_day')),
'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
// Add controls for start and end dates.
$form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'start_date'));
// If we have a custom field - add a checkbox for it.
if ($custom_fields && $custom_fields->fields[0])
$form->addInput(array('type'=>'checkbox','name'=>'chcf_1'));
-
+if ($user->canManageTeam() && $user->isPluginEnabled('ps'))
+ $form->addInput(array('type'=>'checkbox','name'=>'chpaid'));
// Add group by control.
$group_by_options['no_grouping'] = $i18n->getKey('form.reports.group_by_no');
$group_by_options['date'] = $i18n->getKey('form.reports.group_by_date');
$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));
- $form->setValueByElement('start_date', $period->getBeginDate());
+ $form->setValueByElement('start_date', $period->getStartDate());
$form->setValueByElement('end_date', $period->getEndDate());
$form->setValueByElement('chclient', '1');
$form->setValueByElement('chinvoice', '0');
$form->setValueByElement('chfinish', '1');
$form->setValueByElement('chnote', '1');
$form->setValueByElement('chcf_1', '0');
+ $form->setValueByElement('chpaid', '0');
$form->setValueByElement('chtotalsonly', '0');
}