X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdn.pl;h=132286fbd6293227acb16c625b3ce4837457fd9d;hb=d4a434e1deba2695ef4d4a3fc0d51ac1b2044fb0;hp=07830aabcfcf17d8c35d6f4f6ed00512f84b03f3;hpb=dde9d68d7704edcaa4334356cec15ef7ce4f380f;p=kivitendo-erp.git

diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl
index 07830aabc..132286fbd 100644
--- a/bin/mozilla/dn.pl
+++ b/bin/mozilla/dn.pl
@@ -42,12 +42,18 @@ require "bin/mozilla/common.pl";
 require "bin/mozilla/reportgenerator.pl";
 require "bin/mozilla/io.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;
 
-  $auth->assert('config');
+  $main::auth->assert('config');
 
   DN->get_config(\%myconfig, \%$form);
   $form->get_lists('charts' => { 'key'       => 'ALL_CHARTS',
@@ -77,13 +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;
 
-  $auth->assert('dunning_edit');
+  $main::auth->assert('dunning_edit');
 
   # setup customer selection
   $form->all_vc(\%myconfig, "customer", "AR");
@@ -92,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;
@@ -101,13 +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();
 
-  $auth->assert('dunning_edit');
+  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');
@@ -118,7 +132,7 @@ sub show_invoices {
     if ($row->{next_dunning_config_id}) {
       map { $_->{SELECTED} = $_->{id} == $row->{next_dunning_config_id} } @{ $row->{DUNNING_CONFIG } };
     }
-    map { $row->{$_} = $form->format_amount(\%myconfig, $row->{$_} * 1, -2) } qw(amount fee interest);
+    map { $row->{$_} = $form->format_amount(\%myconfig, $row->{$_} * 1, -2) } qw(amount open_amount fee interest);
   }
 
   $form->get_lists('printers'  => 'printers',
@@ -138,13 +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;
 
-  $auth->assert('config');
+  $main::auth->assert('config');
 
   for my $i (1 .. $form->{rowcount}) {
     if ($form->{"dunning_description_$i"} ne "") {
@@ -158,20 +176,24 @@ sub save {
   DN->save_config(\%myconfig, \%$form);
   # saving the history
   if(!exists $form->{addition} && $form->{id} ne "") {
-  	$form->{snumbers} = qq|dunning_id_| . $form->{"dunning_id"};
+    $form->{snumbers} = qq|dunning_id_| . $form->{"dunning_id"};
     $form->{addition} = "SAVED FOR DUNNING";
-  	$form->save_history($form->dbconnect(\%myconfig));
+    $form->save_history;
   }
   # /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;
 
-  $auth->assert('dunning_edit');
+  $main::auth->assert('dunning_edit');
 
   my $active=1;
   my @rows = ();
@@ -200,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);
       }
     }
 
@@ -213,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);
     }
   }
 
@@ -223,9 +245,9 @@ sub save_dunning {
 
   # saving the history
   if(!exists $form->{addition} && $form->{id} ne "") {
-  	$form->{snumbers} = qq|dunning_id_| . $form->{"dunning_id"};
+    $form->{snumbers} = qq|dunning_id_| . $form->{"dunning_id"};
     $form->{addition} = "DUNNING STARTED";
-  	$form->save_history($form->dbconnect(\%myconfig));
+    $form->save_history;
   }
   # /saving the history
 
@@ -234,28 +256,36 @@ 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();
 
-  $auth->assert('dunning_edit');
+  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;
 
-  $auth->assert('dunning_edit');
+  $main::auth->assert('dunning_edit');
 
   $form->get_lists("customers"   => "ALL_CUSTOMERS",
-                   "departments" => "ALL_DEPARTMENTS");
+                   "departments" => "ALL_DEPARTMENTS",
+                   "salesmen"     => "ALL_SALESMEN");
 
   DN->get_config(\%myconfig, \%$form);
 
@@ -264,8 +294,9 @@ 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->{salesman_labels} = sub { $_[0]->{"name"} || $_[0]->{"login"} };
 
   $form->header();
 
@@ -275,17 +306,22 @@ 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      = $::request->{cgi};
 
-  $auth->assert('dunning_edit');
+  $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 l_salesman salesman_id);
 
   report_generator_set_default_sort('customername', 1);
 
@@ -310,7 +346,7 @@ 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));
 
   my %column_defs         =  (
     'checkbox'            => { 'text' => '', 'visible' => 'HTML' },
@@ -324,23 +360,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)) {
+  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);
 
@@ -350,7 +387,7 @@ sub show_dunning {
 
   my $i = 0;
 
-  foreach $ref (@{ $form->{DUNNINGS} }) {
+  foreach my $ref (@{ $form->{DUNNINGS} }) {
     $i++;
 
     if ($previous_dunning_id != $ref->{dunning_id}) {
@@ -396,14 +433,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();
 
-  $auth->assert('dunning_edit');
+  my $form     = $main::form;
+
+  $main::auth->assert('dunning_edit');
 
   $form->{rowcount}     = 1;
   $form->{selected_1}   = 1;
@@ -411,13 +450,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;
 
-  $auth->assert('dunning_edit');
+  $main::auth->assert('dunning_edit');
 
   $form->{title} = $locale->text('Print dunnings');
 
@@ -447,11 +490,11 @@ sub print_multiple {
     $form->redirect($locale->text('Could not print dunning.'));
   }
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub continue {
-  call_sub($form->{nextsub});
+  call_sub($main::form->{nextsub});
 }
 
 # end of main