X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fdn.pl;h=651698c3e53bdf4b7c7732551ae7592f81f7841d;hb=26b68f7e988acbe102b54c40ba205bf1fa74fb10;hp=c3e7966c3fe09e4116aa98563b74146a0cfc9762;hpb=e6e07cb0bb7029db6fdfaa43e8756afd397cfe73;p=kivitendo-erp.git

diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl
index c3e7966c3..651698c3e 100644
--- a/bin/mozilla/dn.pl
+++ b/bin/mozilla/dn.pl
@@ -41,12 +41,19 @@ use SL::ReportGenerator;
 require "bin/mozilla/common.pl";
 require "bin/mozilla/reportgenerator.pl";
 require "bin/mozilla/io.pl";
-require "bin/mozilla/arap.pl";
+
+use strict;
 
 1;
 
 sub edit_config {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   DN->get_config(\%myconfig, \%$form);
   $form->get_lists('charts' => { 'key'       => 'ALL_CHARTS',
@@ -76,11 +83,17 @@ sub edit_config {
   $form->header();
   print $form->parse_html_template("dunning/edit_config");
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub add {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('dunning_edit');
 
   # setup customer selection
   $form->all_vc(\%myconfig, "customer", "AR");
@@ -89,7 +102,7 @@ sub add {
 
   $form->{SHOW_CUSTOMER_SELECTION}      = $form->{all_customer}    && scalar @{ $form->{all_customer} };
   $form->{SHOW_DUNNING_LEVEL_SELECTION} = $form->{DUNNING}         && scalar @{ $form->{DUNNING} };
-  $form->{SHOW_DEPARTMENT_SELECTION}    = $form->{all_departments} && scalar @{ $form->{all_departments} };
+  $form->{SHOW_DEPARTMENT_SELECTION}    = $form->{all_departments} && scalar @{ $form->{all_departments} || [] };
 
   $form->{title}    = $locale->text('Start Dunning Process');
   $form->{jsscript} = 1;
@@ -98,11 +111,17 @@ sub add {
 
   print $form->parse_html_template("dunning/add");
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub show_invoices {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('dunning_edit');
 
   DN->get_invoices(\%myconfig, \%$form);
   $form->{title} = $locale->text('Start Dunning Process');
@@ -122,7 +141,7 @@ sub show_invoices {
   $form->{type}           = 'dunning';
   $form->{rowcount}       = scalar @{ $form->{DUNNINGS} };
   $form->{jsscript}       = 1;
-  $form->{callback}     ||= build_std_url("action=show_invoices", qw(login password customer invnumber ordnumber groupinvoices minamount dunning_level notes));
+  $form->{callback}     ||= build_std_url("action=show_invoices", qw(customer invnumber ordnumber groupinvoices minamount dunning_level notes));
 
   $form->{PRINT_OPTIONS}  = print_options('inline'          => 1,
                                           'no_queue'        => 1,
@@ -133,11 +152,17 @@ sub show_invoices {
   $form->header();
   print $form->parse_html_template("dunning/show_invoices");
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub save {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   for my $i (1 .. $form->{rowcount}) {
     if ($form->{"dunning_description_$i"} ne "") {
@@ -158,11 +183,17 @@ sub save {
   # /saving the history
   $form->redirect($locale->text('Dunning Process Config saved!'));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub save_dunning {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('dunning_edit');
 
   my $active=1;
   my @rows = ();
@@ -191,7 +222,7 @@ sub save_dunning {
       foreach my $level (values %{ $levels }) {
         next unless scalar @{ $level };
 
-        DN->save_dunning(\%myconfig, $form, $level, $userspath, $spool);
+        DN->save_dunning(\%myconfig, $form, $level, $main::userspath, $main::spool);
       }
     }
 
@@ -204,7 +235,7 @@ sub save_dunning {
                       "customer_id"            => $form->{"customer_id_$i"},
                       "next_dunning_config_id" => $form->{"next_dunning_config_id_$i"},
                       "email"                  => $form->{"email_$i"}, } ];
-      DN->save_dunning(\%myconfig, $form, $level, $userspath, $spool);
+      DN->save_dunning(\%myconfig, $form, $level, $main::userspath, $main::spool);
     }
   }
 
@@ -225,21 +256,32 @@ sub save_dunning {
     $form->redirect($locale->text('Dunning Process started for selected invoices!'));
   }
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub set_email {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('dunning_edit');
 
   $form->{"title"} = $locale->text("Set eMail text");
   $form->header();
   print($form->parse_html_template("dunning/set_email"));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub search {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('dunning_edit');
 
   $form->get_lists("customers"   => "ALL_CUSTOMERS",
                    "departments" => "ALL_DEPARTMENTS");
@@ -251,7 +293,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();
@@ -262,15 +304,24 @@ sub search {
 
   print $form->parse_html_template("dunning/search");
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 
 }
 
 sub show_dunning {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+  my $cgi      = $main::cgi;
+
+  $main::auth->assert('dunning_edit');
 
   my @filter_field_list = qw(customer_id customer dunning_level department_id invnumber ordnumber
-                             transdatefrom transdateto dunningfrom dunningto notes showold);
+                             transdatefrom transdateto dunningfrom dunningto notes showold salesman);
+
+  report_generator_set_default_sort('customername', 1);
 
   DN->get_dunning(\%myconfig, \%$form);
 
@@ -293,9 +344,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') },
@@ -307,15 +358,24 @@ sub show_dunning {
     'dunning_duedate'     => { 'text' => $locale->text('Dunning Duedate') },
     'fee'                 => { 'text' => $locale->text('Total Fees') },
     'interest'            => { 'text' => $locale->text('Interest') },
+    'salesman'            => { 'text' => $locale->text('Salesperson'), 'visible' => $form->{l_salesman} ? 1 : 0 },
   );
 
+  $report->set_columns(%column_defs);
   $report->set_column_order(qw(checkbox dunning_description customername invnumber transdate
-                               duedate amount dunning_date dunning_duedate fee interest));
+                               duedate amount dunning_date dunning_duedate fee interest salesman));
+  $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 salesman)) {
+    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);
+  my %alignment = map { $_ => 'right' } qw(transdate duedate amount dunning_date dunning_duedate fee interest salesman);
 
   my ($current_dunning_rows, $previous_dunning_id, $first_row_for_dunning);
 
@@ -325,7 +385,7 @@ sub show_dunning {
 
   my $i = 0;
 
-  foreach $ref (@{ $form->{DUNNINGS} }) {
+  foreach my $ref (@{ $form->{DUNNINGS} }) {
     $i++;
 
     if ($previous_dunning_id != $ref->{dunning_id}) {
@@ -371,12 +431,16 @@ sub show_dunning {
 
   $report->generate_with_headers();
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 
 }
 
 sub print_dunning {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+
+  $main::auth->assert('dunning_edit');
 
   $form->{rowcount}     = 1;
   $form->{selected_1}   = 1;
@@ -384,11 +448,17 @@ sub print_dunning {
 
   print_multiple();
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub print_multiple {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('dunning_edit');
 
   $form->{title} = $locale->text('Print dunnings');
 
@@ -418,7 +488,11 @@ sub print_multiple {
     $form->redirect($locale->text('Could not print dunning.'));
   }
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
+}
+
+sub continue {
+  call_sub($main::form->{nextsub});
 }
 
 # end of main