Mahnbericht: Nach Mahnungsnummer filtern können und diese Anzeigen

diff --git a/SL/DN.pm b/SL/DN.pm
index f3969fc113a66d845af7ec7e63f20d77d5b0f488..e9aa1ecf26889641bf3446727579c7c36dcd3870 100644 (file)
--- a/SL/DN.pm
+++ b/SL/DN.pm
@@ -737,6 +737,11 @@ sub get_dunning {
     push(@values, like($form->{$key}));
   }
 
     push(@values, like($form->{$key}));
   }
 

+  if ($form->{dunning_id}) {
+    $where .= qq| AND da.dunning_id = ?|;
+    push(@values, conv_i($form->{dunning_id}));
+  }
+

   if ($form->{dunning_level}) {
     $where .= qq| AND a.dunning_config_id = ?|;
     push(@values, conv_i($form->{dunning_level}));
   if ($form->{dunning_level}) {
     $where .= qq| AND a.dunning_config_id = ?|;
     push(@values, conv_i($form->{dunning_level}));


@@ -787,6 +792,7 @@ sub get_dunning {
     'duedate'             => [ qw(a.duedate a.invnumber) ],
     'dunning_date'        => [ qw(dunning_date da.dunning_id a.invnumber) ],
     'dunning_duedate'     => [ qw(dunning_duedate da.dunning_id a.invnumber) ],
     'duedate'             => [ qw(a.duedate a.invnumber) ],
     'dunning_date'        => [ qw(dunning_date da.dunning_id a.invnumber) ],
     'dunning_duedate'     => [ qw(dunning_duedate da.dunning_id a.invnumber) ],

+    'dunning_id'          => [ qw(dunning_id a.invnumber) ],

     'salesman'            => [ qw(salesman) ],
     );
 
     'salesman'            => [ qw(salesman) ],
     );
 

diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl
index 9422da3f9234042c6a60f38a5bb33a375913bf35..bc6798c6f13dc2f432995c19d71081d49b2fc25e 100644 (file)
--- a/bin/mozilla/dn.pl
+++ b/bin/mozilla/dn.pl
@@ -34,6 +34,8 @@
 
 use POSIX qw(strftime);
 
 
 use POSIX qw(strftime);
 

+use List::MoreUtils qw(none);
+

 use SL::IS;
 use SL::DN;
 use SL::DB::Department;
 use SL::IS;
 use SL::DN;
 use SL::DB::Department;


@@ -337,7 +339,7 @@ sub show_dunning {
 
   $main::auth->assert('dunning_edit');
 
 
   $main::auth->assert('dunning_edit');
 

-  my @filter_field_list = qw(customer_id customer dunning_level department_id invnumber ordnumber
+  my @filter_field_list = qw(customer_id customer dunning_id dunning_level department_id invnumber ordnumber

                              transdatefrom transdateto dunningfrom dunningto notes showold l_salesman salesman_id);
 
   report_generator_set_default_sort('customername', 1);
                              transdatefrom transdateto dunningfrom dunningto notes showold l_salesman salesman_id);
 
   report_generator_set_default_sort('customername', 1);


@@ -375,6 +377,7 @@ sub show_dunning {
     'transdate'           => { 'text' => $locale->text('Invdate') },
     'duedate'             => { 'text' => $locale->text('Invoice Duedate') },
     'amount'              => { 'text' => $locale->text('Amount') },
     'transdate'           => { 'text' => $locale->text('Invdate') },
     'duedate'             => { 'text' => $locale->text('Invoice Duedate') },
     'amount'              => { 'text' => $locale->text('Amount') },

+    'dunning_id'          => { 'text' => $locale->text('Dunning number') },

     'dunning_date'        => { 'text' => $locale->text('Dunning Date') },
     'dunning_duedate'     => { 'text' => $locale->text('Dunning Duedate') },
     'fee'                 => { 'text' => $locale->text('Total Fees') },
     'dunning_date'        => { 'text' => $locale->text('Dunning Date') },
     'dunning_duedate'     => { 'text' => $locale->text('Dunning Duedate') },
     'fee'                 => { 'text' => $locale->text('Total Fees') },


@@ -384,7 +387,7 @@ sub show_dunning {
   );
 
   $report->set_columns(%column_defs);
   );
 
   $report->set_columns(%column_defs);

-  $report->set_column_order(qw(checkbox dunning_description customername language invnumber transdate
+  $report->set_column_order(qw(checkbox dunning_description dunning_id customername language invnumber transdate

                                duedate amount dunning_date dunning_duedate fee interest salesman));
   $report->set_sort_indicator($form->{sort}, $form->{sortdir});
 
                                duedate amount dunning_date dunning_duedate fee interest salesman));
   $report->set_sort_indicator($form->{sort}, $form->{sortdir});
 


@@ -392,12 +395,12 @@ sub show_dunning {
   my $print_url = sub { build_std_url('action=print_dunning', 'format=pdf', 'media=screen', 'dunning_id='.$_[0]->{dunning_id}, 'language_id=' . $_[0]->{language_id}) };
   my $sort_url  = build_std_url('action=show_dunning', grep { $form->{$_} } @filter_field_list);
 
   my $print_url = sub { build_std_url('action=print_dunning', 'format=pdf', 'media=screen', 'dunning_id='.$_[0]->{dunning_id}, 'language_id=' . $_[0]->{language_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 salesman)) {
+  foreach my $name (qw(dunning_description customername invnumber transdate duedate dunning_date dunning_duedate salesman dunning_id)) {

     my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
     $column_defs{$name}->{link} = $sort_url . "&sort=$name&sortdir=$sortdir";
   }
 
     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 salesman);
+  my %alignment = map { $_ => 'right' } qw(transdate duedate amount dunning_date dunning_duedate fee interest salesman dunning_id);

 
   my ($current_dunning_rows, $previous_dunning_id, $first_row_for_dunning);
 
 
   my ($current_dunning_rows, $previous_dunning_id, $first_row_for_dunning);
 


@@ -423,12 +426,13 @@ sub show_dunning {
     my $row = { };
     foreach my $column (keys %{ $ref }) {
       $row->{$column} = {
     my $row = { };
     foreach my $column (keys %{ $ref }) {
       $row->{$column} = {

-        'data'  => $first_row_for_dunning || (($column ne 'dunning_description') && ($column ne 'customername')) ? $ref->{$column} : '',
+        'data'  => $first_row_for_dunning || (none { $_ eq $column } qw(dunning_description customername dunning_id)) ? $ref->{$column} : '',

 
         'align' => $alignment{$column},
 
         'link'  => (  $column eq 'invnumber'           ? $edit_url->($ref)
                     : $column eq 'dunning_description' ? $print_url->($ref)
 
         'align' => $alignment{$column},
 
         'link'  => (  $column eq 'invnumber'           ? $edit_url->($ref)
                     : $column eq 'dunning_description' ? $print_url->($ref)

+                    : $column eq 'dunning_id'          ? $print_url->($ref)

                     :                                    ''),
       };
     }
                     :                                    ''),
       };
     }

diff --git a/templates/webpages/dunning/search.html b/templates/webpages/dunning/search.html
index 6145f789db35ff3187d7f630a9c22a265d6794d4..0f850b2431e74332f6bc39536a5690df3714ca71 100644 (file)
--- a/templates/webpages/dunning/search.html
+++ b/templates/webpages/dunning/search.html
@@ -47,6 +47,11 @@
        <td colspan="3"><input name="invnumber" size="20"></td>
       </tr>
 
        <td colspan="3"><input name="invnumber" size="20"></td>
       </tr>
 

+      <tr>
+       <th align="right" nowrap>[% 'Dunning number' | $T8 %]</th>
+       <td colspan="3"><input name="dunning_id" size="20"></td>
+      </tr>
+

       <tr>
        <th align="right" nowrap>[% 'Order Number' | $T8 %]</th>
        <td colspan="3"><input name="ordnumber" size="20"></td>
       <tr>
        <th align="right" nowrap>[% 'Order Number' | $T8 %]</th>
        <td colspan="3"><input name="ordnumber" size="20"></td>