X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdn.pl;h=715c4b42a3958c0b5f699506e12b1eeae1b34e41;hb=bc9c4ed3ae02db0257cbff39ec1585aecdec53fd;hp=338d86a2348207c2337948c1b599cc33c9423357;hpb=8c7e44938a661e035f62840e1e177353240ace5d;p=kivitendo-erp.git diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl index 338d86a23..715c4b42a 100644 --- a/bin/mozilla/dn.pl +++ b/bin/mozilla/dn.pl @@ -264,7 +264,7 @@ sub search { $form->{SHOW_DUNNING_LEVELS} = scalar @{ $form->{DUNNING} }; $form->{jsscript} = 1; - $form->{title} = $locale->text('Search Dunning'); + $form->{title} = $locale->text('Dunnings'); $form->{fokus} = "search.customer"; $form->header(); @@ -287,6 +287,8 @@ sub show_dunning { my @filter_field_list = qw(customer_id customer dunning_level department_id invnumber ordnumber transdatefrom transdateto dunningfrom dunningto notes showold); + report_generator_set_default_sort('customername', 1); + DN->get_dunning(\%myconfig, \%$form); if (!$form->{callback}) { @@ -308,9 +310,9 @@ sub show_dunning { $report->set_options('std_column_visibility' => 1, 'title' => $form->{title}); - $report->set_export_options('show_dunning', @filter_field_list); + $report->set_export_options('show_dunning', @filter_field_list, qw(sort sortdir)); - $report->set_columns( + my %column_defs = ( 'checkbox' => { 'text' => '', 'visible' => 'HTML' }, 'dunning_description' => { 'text' => $locale->text('Dunning Level') }, 'customername' => { 'text' => $locale->text('Customername') }, @@ -324,11 +326,19 @@ sub show_dunning { 'interest' => { 'text' => $locale->text('Interest') }, ); + $report->set_columns(%column_defs); $report->set_column_order(qw(checkbox dunning_description customername invnumber transdate duedate amount dunning_date dunning_duedate fee interest)); + $report->set_sort_indicator($form->{sort}, $form->{sortdir}); my $edit_url = build_std_url('script=is.pl', 'action=edit', 'callback') . '&id='; my $print_url = build_std_url('action=print_dunning', 'format=pdf', 'media=screen') . '&dunning_id='; + my $sort_url = build_std_url('action=show_dunning', grep { $form->{$_} } @filter_field_list); + + foreach my $name (qw(dunning_description customername invnumber transdate duedate dunning_date dunning_duedate)) { + my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir}; + $column_defs{$name}->{link} = $sort_url . "&sort=$name&sortdir=$sortdir"; + } my %alignment = map { $_ => 'right' } qw(transdate duedate amount dunning_date dunning_duedate fee interest);