Sprache bei Mahnungen

[mfinanz.git] / SL / DN.pm

diff --git a/SL/DN.pm b/SL/DN.pm
index 758ddf4faecffb258c02b6cbd78f98cd6611032c..6d00f438afe1b8d9732fa53e7d6f1857ba1c3c37 100644 (file)
--- a/SL/DN.pm
+++ b/SL/DN.pm
@@ -36,10 +36,15 @@ package DN;
 
 use SL::Common;
 use SL::DBUtils;
 
 use SL::Common;
 use SL::DBUtils;

+use SL::GenericTranslations;

 use SL::IS;
 use SL::Mailer;
 use SL::MoreCommon;
 use SL::Template;
 use SL::IS;
 use SL::Mailer;
 use SL::MoreCommon;
 use SL::Template;

+use SL::DB::Printer;
+use SL::DB::Language;
+
+use strict;

 
 sub get_config {
   $main::lxdebug->enter_sub();
 
 sub get_config {
   $main::lxdebug->enter_sub();


@@ -61,12 +66,9 @@ sub get_config {
   }
 
   $query =
   }
 
   $query =

-    qq|SELECT
-         dunning_create_invoices_for_fees, dunning_ar_amount_fee,
-         dunning_ar_amount_interest,       dunning_ar
+    qq|SELECT dunning_ar_amount_fee, dunning_ar_amount_interest, dunning_ar

        FROM defaults|;
        FROM defaults|;

-  ($form->{create_invoices_for_fees}, $form->{AR_amount_fee},
-   $form->{AR_amount_interest},       $form->{AR}           ) = selectrow_query($form, $dbh, $query);
+  ($form->{AR_amount_fee}, $form->{AR_amount_interest}, $form->{AR}) = selectrow_query($form, $dbh, $query);

 
   $dbh->disconnect();
 
 
   $dbh->disconnect();
 


@@ -93,7 +95,8 @@ sub save_config {
                  $form->{"email_subject_$i"}, $form->{"email_body_$i"},
                  $form->{"template_$i"}, $form->{"fee_$i"}, $form->{"interest_rate_$i"},
                  $form->{"active_$i"} ? 't' : 'f', $form->{"auto_$i"} ? 't' : 'f', $form->{"email_$i"} ? 't' : 'f',
                  $form->{"email_subject_$i"}, $form->{"email_body_$i"},
                  $form->{"template_$i"}, $form->{"fee_$i"}, $form->{"interest_rate_$i"},
                  $form->{"active_$i"} ? 't' : 'f', $form->{"auto_$i"} ? 't' : 'f', $form->{"email_$i"} ? 't' : 'f',

-                 $form->{"email_attachment_$i"} ? 't' : 'f', conv_i($form->{"payment_terms_$i"}), conv_i($form->{"terms_$i"}));
+                 $form->{"email_attachment_$i"} ? 't' : 'f', conv_i($form->{"payment_terms_$i"}), conv_i($form->{"terms_$i"}),
+                 $form->{"create_invoices_for_fees_$i"} ? 't' : 'f');

       if ($form->{"id_$i"}) {
         $query =
           qq|UPDATE dunning_config SET
       if ($form->{"id_$i"}) {
         $query =
           qq|UPDATE dunning_config SET


@@ -101,7 +104,8 @@ sub save_config {
                email_subject = ?, email_body = ?,
                template = ?, fee = ?, interest_rate = ?,
                active = ?, auto = ?, email = ?,
                email_subject = ?, email_body = ?,
                template = ?, fee = ?, interest_rate = ?,
                active = ?, auto = ?, email = ?,

-               email_attachment = ?, payment_terms = ?, terms = ?
+               email_attachment = ?, payment_terms = ?, terms = ?,
+               create_invoices_for_fees = ?

              WHERE id = ?|;
         push(@values, conv_i($form->{"id_$i"}));
       } else {
              WHERE id = ?|;
         push(@values, conv_i($form->{"id_$i"}));
       } else {


@@ -109,8 +113,8 @@ sub save_config {
           qq|INSERT INTO dunning_config
                (dunning_level, dunning_description, email_subject, email_body,
                 template, fee, interest_rate, active, auto, email,
           qq|INSERT INTO dunning_config
                (dunning_level, dunning_description, email_subject, email_body,
                 template, fee, interest_rate, active, auto, email,

-                email_attachment, payment_terms, terms)
-             VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
+                email_attachment, payment_terms, terms, create_invoices_for_fees)
+             VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;

       }
       do_query($form, $dbh, $query, @values);
     }
       }
       do_query($form, $dbh, $query, @values);
     }


@@ -121,14 +125,8 @@ sub save_config {
     }
   }
 
     }
   }
 

-  $query  = qq|UPDATE defaults SET dunning_create_invoices_for_fees = ?|;
-  @values = ($form->{create_invoices_for_fees} ? 't' : 'f');
-
-  if ($form->{create_invoices_for_fees}) {
-    $query .= qq|, dunning_ar_amount_fee = ?, dunning_ar_amount_interest = ?, dunning_ar = ?|;
-    push @values, conv_i($form->{AR_amount_fee}), conv_i($form->{AR_amount_interest}), conv_i($form->{AR});
-  }
-
+  $query  = qq|UPDATE defaults SET dunning_ar_amount_fee = ?, dunning_ar_amount_interest = ?, dunning_ar = ?|;
+  @values = (conv_i($form->{AR_amount_fee}), conv_i($form->{AR_amount_interest}), conv_i($form->{AR}));

   do_query($form, $dbh, $query, @values);
 
   $dbh->commit();
   do_query($form, $dbh, $query, @values);
 
   $dbh->commit();


@@ -144,19 +142,20 @@ sub create_invoice_for_fees {
 
   my ($query, @values, $sth, $ref);
 
 
   my ($query, @values, $sth, $ref);
 

-  $query =
-    qq|SELECT
-         dunning_create_invoices_for_fees, dunning_ar_amount_fee,
-         dunning_ar_amount_interest, dunning_ar
-       FROM defaults|;
-  ($form->{create_invoices_for_fees}, $form->{AR_amount_fee},
-   $form->{AR_amount_interest},       $form->{AR}           ) = selectrow_query($form, $dbh, $query);
+  $query = qq|SELECT dcfg.create_invoices_for_fees
+              FROM dunning d
+              LEFT JOIN dunning_config dcfg ON (d.dunning_config_id = dcfg.id)
+              WHERE d.dunning_id = ?|;
+  my ($create_invoices_for_fees) = selectrow_query($form, $dbh, $query, $dunning_id);

 
 

-  if (!$form->{create_invoices_for_fees}) {
+  if (!$create_invoices_for_fees) {

     $main::lxdebug->leave_sub();
     return;
   }
 
     $main::lxdebug->leave_sub();
     return;
   }
 

+  $query = qq|SELECT dunning_ar_amount_fee, dunning_ar_amount_interest, dunning_ar FROM defaults|;
+  ($form->{AR_amount_fee}, $form->{AR_amount_interest}, $form->{AR}) = selectrow_query($form, $dbh, $query);
+

   $query =
     qq|SELECT
          fee,
   $query =
     qq|SELECT
          fee,


@@ -204,6 +203,7 @@ sub create_invoice_for_fees {
   }
 
   my ($ar_id) = selectrow_query($form, $dbh, qq|SELECT nextval('glid')|);
   }
 
   my ($ar_id) = selectrow_query($form, $dbh, qq|SELECT nextval('glid')|);

+  my $curr = $form->get_default_currency($myconfig);

 
   $query =
     qq|INSERT INTO ar (id,          invnumber, transdate, gldate, customer_id,
 
   $query =
     qq|INSERT INTO ar (id,          invnumber, transdate, gldate, customer_id,


@@ -226,7 +226,7 @@ sub create_invoice_for_fees {
          ?,                     -- netamount
          0,                     -- paid
          -- duedate:
          ?,                     -- netamount
          0,                     -- paid
          -- duedate:

-         (SELECT duedate FROM dunning WHERE dunning_id = ?),
+         (SELECT duedate FROM dunning WHERE dunning_id = ? LIMIT 1),

          'f',                   -- invoice
          ?,                     -- curr
          ?,                     -- notes
          'f',                   -- invoice
          ?,                     -- curr
          ?,                     -- notes


@@ -239,7 +239,7 @@ sub create_invoice_for_fees {
              $amount,
              $amount,
              $dunning_id,       # duedate
              $amount,
              $amount,
              $dunning_id,       # duedate

-             (split m/:/, $myconfig->{currency})[0], # currency
+             $curr,             # default currency

              sprintf($main::locale->text('Automatically created invoice for fee and interest for dunning %s'), $dunning_id), # notes
              $form->{login});   # employee_id
   do_query($form, $dbh, $query, @values);
              sprintf($main::locale->text('Automatically created invoice for fee and interest for dunning %s'), $dunning_id), # notes
              $form->{login});   # employee_id
   do_query($form, $dbh, $query, @values);


@@ -271,7 +271,7 @@ sub create_invoice_for_fees {
 sub save_dunning {
   $main::lxdebug->enter_sub();
 
 sub save_dunning {
   $main::lxdebug->enter_sub();
 

-  my ($self, $myconfig, $form, $rows, $userspath, $spool, $sendmail) = @_;
+  my ($self, $myconfig, $form, $rows) = @_;

   # connect to database
   my $dbh = $form->dbconnect_noauto($myconfig);
 
   # connect to database
   my $dbh = $form->dbconnect_noauto($myconfig);
 


@@ -291,7 +291,7 @@ sub save_dunning {
                (SELECT SUM(fee)
                 FROM dunning_config
                 WHERE dunning_level <= (SELECT dunning_level FROM dunning_config WHERE id = ?)),
                (SELECT SUM(fee)
                 FROM dunning_config
                 WHERE dunning_level <= (SELECT dunning_level FROM dunning_config WHERE id = ?)),

-               (SELECT (amount - paid) * (current_date - transdate) FROM ar WHERE id = ?)
+               (SELECT (amount - paid) * (current_date - duedate) FROM ar WHERE id = ?)

                  * (SELECT interest_rate FROM dunning_config WHERE id = ?)
                  / 360,
                current_date,
                  * (SELECT interest_rate FROM dunning_config WHERE id = ?)
                  / 360,
                current_date,


@@ -366,7 +366,7 @@ sub send_email {
     return;
   }
 
     return;
   }
 

-  my $template     = PlainTextTemplate->new(undef, $form, $myconfig);
+  my $template     = SL::Template::create(type => 'PlainText', form => $form, myconfig => $myconfig);

   my $mail         = Mailer->new();
   $mail->{from}    = $myconfig->{email};
   $mail->{to}      = $ref->{recipient};
   my $mail         = Mailer->new();
   $mail->{from}    = $myconfig->{email};
   $mail->{to}      = $ref->{recipient};


@@ -405,15 +405,54 @@ sub set_template_options {
     $form->{printer_code} = "_" . $form->{printer_code};
   }
 
     $form->{printer_code} = "_" . $form->{printer_code};
   }
 

-  $form->{IN}  = "$form->{formname}$form->{language}$form->{printer_code}.html";
-  $form->{pdf} = 1;
+  my $extension = 'html';
+  if ($form->{format} eq 'postscript') {
+    $form->{postscript}   = 1;
+    $extension            = 'tex';

 
 

-  if ($form->{"format"} =~ /opendocument/) {
-    $form->{IN} =~ s/html$/odt/;
-  } else {
-    $form->{IN} =~ s/html$/tex/;
+  } elsif ($form->{"format"} =~ /pdf/) {
+    $form->{pdf}          = 1;
+    $extension            = $form->{'format'} =~ m/opendocument/i ? 'odt' : 'tex';
+
+  } elsif ($form->{"format"} =~ /opendocument/) {
+    $form->{opendocument} = 1;
+    $extension            = 'odt';
+  } elsif ($form->{"format"} =~ /excel/) {
+    $form->{excel} = 1;
+    $extension            = 'xls';

   }
 
   }
 

+
+  # search for the template
+  my @template_files;
+  push @template_files, "$form->{formname}_email$form->{language}$form->{printer_code}.$extension" if $form->{media} eq 'email';
+  push @template_files, "$form->{formname}$form->{language}$form->{printer_code}.$extension";
+  push @template_files, "$form->{formname}.$extension";
+  push @template_files, "default.$extension";
+
+  $form->{IN} = undef;
+  for my $filename (@template_files) {
+    if (-f "$form->{templates}/$filename") {
+      $form->{IN} = $filename;
+      last;
+    }
+  }
+
+  if (!defined $form->{IN}) {
+    $::form->error($::locale->text('Cannot find matching template for this print request. Please contact your template maintainer. I tried these: #1.', join ', ', map { "'$_'"} @template_files));
+  }
+
+  # prepare meta information for template introspection
+  $form->{template_meta} = {
+    formname  => $form->{formname},
+    language  => SL::DB::Manager::Language->find_by_or_create(id => $form->{language_id}),
+    format    => $form->{format},
+    media     => $form->{media},
+    extension => $extension,
+    printer   => SL::DB::Manager::Printer->find_by_or_create(id => $form->{printer_id}),
+    today     => DateTime->today,
+  };
+

   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 


@@ -462,7 +501,7 @@ sub get_invoices {
     push(@values, $form->{minamount});
   }
 
     push(@values, $form->{minamount});
   }
 

-  $query =
+  my $query =

     qq|SELECT id
        FROM dunning_config
        WHERE dunning_level = (SELECT MAX(dunning_level) FROM dunning_config)|;
     qq|SELECT id
        FROM dunning_config
        WHERE dunning_level = (SELECT MAX(dunning_level) FROM dunning_config)|;


@@ -470,8 +509,9 @@ sub get_invoices {
 
   $query =
     qq|SELECT
 
   $query =
     qq|SELECT

-         a.id, a.ordnumber, a.transdate, a.invnumber, a.amount,
+         a.id, a.ordnumber, a.transdate, a.invnumber, a.amount, a.language_id,

          ct.name AS customername, a.customer_id, a.duedate,
          ct.name AS customername, a.customer_id, a.duedate,

+         a.amount - a.paid AS open_amount,

 
          cfg.dunning_description, cfg.dunning_level,
 
 
          cfg.dunning_description, cfg.dunning_level,
 


@@ -505,7 +545,12 @@ sub get_invoices {
               ORDER BY dunning_level ASC
               LIMIT 1)
              , ?))
               ORDER BY dunning_level ASC
               LIMIT 1)
              , ?))

-       LEFT JOIN dunning d ON ((d.trans_id = a.id) AND (cfg.dunning_level = d.dunning_level))
+       LEFT JOIN dunning d ON (d.id = (
+         SELECT MAX(d2.id)
+         FROM dunning d2
+         WHERE (d2.trans_id      = a.id)
+           AND (d2.dunning_level = cfg.dunning_level)
+       ))

 
        WHERE (a.paid < a.amount)
          AND (a.duedate < current_date)
 
        WHERE (a.paid < a.amount)
          AND (a.duedate < current_date)


@@ -517,8 +562,8 @@ sub get_invoices {
 
   $form->{DUNNINGS} = [];
 
 
   $form->{DUNNINGS} = [];
 

-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    next if !$ref->{terms} || ($ref->{pastdue} < $ref->{terms});
+  while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
+    next if ($ref->{pastdue} < $ref->{terms});

 
     $ref->{interest} = $form->round_amount($ref->{interest}, 2);
     push(@{ $form->{DUNNINGS} }, $ref);
 
     $ref->{interest} = $form->round_amount($ref->{interest}, 2);
     push(@{ $form->{DUNNINGS} }, $ref);


@@ -542,7 +587,7 @@ sub get_dunning {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 

-  $where = qq| WHERE (da.trans_id = a.id)|;
+  my $where = qq| WHERE (da.trans_id = a.id)|;

 
   my @values;
 
 
   my @values;
 


@@ -603,16 +648,38 @@ sub get_dunning {
     push(@values, $form->{dunningto});
   }
 
     push(@values, $form->{dunningto});
   }
 

-  $query =
-    qq|SELECT a.id, a.ordnumber, a.invoice, a.transdate, a.invnumber, a.amount,
+  if ($form->{salesman_id}) {
+    $where .= qq| AND a.salesman_id = ?|;
+    push(@values, conv_i($form->{salesman_id}));
+  }
+
+  my %sort_columns = (
+    'dunning_description' => [ qw(dn.dunning_description customername invnumber) ],
+    'customername'        => [ qw(customername invnumber) ],
+    'invnumber'           => [ qw(a.invnumber) ],
+    'transdate'           => [ qw(a.transdate a.invnumber) ],
+    'duedate'             => [ qw(a.duedate a.invnumber) ],
+    'dunning_date'        => [ qw(dunning_date a.invnumber) ],
+    'dunning_duedate'     => [ qw(dunning_duedate a.invnumber) ],
+    'salesman'            => [ qw(salesman) ],
+    );
+
+  my $sortdir   = !defined $form->{sortdir}    ? 'ASC'         : $form->{sortdir} ? 'ASC' : 'DESC';
+  my $sortkey   = $sort_columns{$form->{sort}} ? $form->{sort} : 'customername';
+  my $sortorder = join ', ', map { "$_ $sortdir" } @{ $sort_columns{$sortkey} };
+
+  my $query =
+    qq|SELECT a.id, a.ordnumber, a.invoice, a.transdate, a.invnumber, a.amount, a.language_id,

          ct.name AS customername, ct.id AS customer_id, a.duedate, da.fee,
          da.interest, dn.dunning_description, da.transdate AS dunning_date,
          ct.name AS customername, ct.id AS customer_id, a.duedate, da.fee,
          da.interest, dn.dunning_description, da.transdate AS dunning_date,

-         da.duedate AS dunning_duedate, da.dunning_id, da.dunning_config_id
+         da.duedate AS dunning_duedate, da.dunning_id, da.dunning_config_id,
+         e2.name AS salesman

        FROM ar a
        FROM ar a

-       JOIN customer ct ON (a.customer_id = ct.id), dunning da
+       JOIN customer ct ON (a.customer_id = ct.id)
+       LEFT JOIN employee e2 ON (a.salesman_id = e2.id), dunning da

        LEFT JOIN dunning_config dn ON (da.dunning_config_id = dn.id)
        $where
        LEFT JOIN dunning_config dn ON (da.dunning_config_id = dn.id)
        $where

-       ORDER BY name, a.id|;
+       ORDER BY $sortorder|;

 
   $form->{DUNNINGS} = selectall_hashref_query($form, $dbh, $query, @values);
 
 
   $form->{DUNNINGS} = selectall_hashref_query($form, $dbh, $query, @values);
 


@@ -635,38 +702,37 @@ sub melt_pdfs {
 
   $copies        *= 1;
   $copies         = 1 unless $copies;
 
   $copies        *= 1;
   $copies         = 1 unless $copies;

-  my $inputfiles  = join " ", map { "${main::spool}/$_ " x $copies } @{ $form->{DUNNING_PDFS} };
+  my $spool       = $::lx_office_conf{paths}->{spool};
+  my $inputfiles  = join " ", map { "$spool/$_ " x $copies } @{ $form->{DUNNING_PDFS} };

   my $dunning_id  = $form->{dunning_id};
 
   $dunning_id     =~ s|[^\d]||g;
 
   my $dunning_id  = $form->{dunning_id};
 
   $dunning_id     =~ s|[^\d]||g;
 

-  my $in = IO::File->new("gs -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=- $inputfiles |");
+  my $in = IO::File->new($::lx_office_conf{applications}->{ghostscript} . " -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=- $inputfiles |");

   $form->error($main::locale->text('Could not spawn ghostscript.')) unless $in;
 
   $form->error($main::locale->text('Could not spawn ghostscript.')) unless $in;
 

-  my $out;
-

   if ($form->{media} eq 'printer') {
     $form->get_printer_code($myconfig);
   if ($form->{media} eq 'printer') {
     $form->get_printer_code($myconfig);

+    my $out;

     if ($form->{printer_command}) {
       $out = IO::File->new("| $form->{printer_command}");
     }
 
     if ($form->{printer_command}) {
       $out = IO::File->new("| $form->{printer_command}");
     }
 

+    $::locale->with_raw_io($out, sub { $out->print($_) while <$in> });
+

     $form->error($main::locale->text('Could not spawn the printer command.')) unless $out;
 
   } else {
     $form->error($main::locale->text('Could not spawn the printer command.')) unless $out;
 
   } else {

-    $out = IO::File->new('>-');
-    $out->print(qq|Content-Type: Application/PDF\n| .
-                qq|Content-Disposition: attachment; filename="dunning_${dunning_id}.pdf"\n\n|);
-  }
+    my $dunning_filename = $form->get_formname_translation('dunning');
+    print qq|Content-Type: Application/PDF\n| .
+          qq|Content-Disposition: attachment; filename="${dunning_filename}_${dunning_id}.pdf"\n\n|;

 
 

-  while (my $line = <$in>) {
-    $out->print($line);
+    $::locale->with_raw_io(\*STDOUT, sub { print while <$in> });

   }
 
   $in->close();
   }
 
   $in->close();

-  $out->close();

 
 

-  map { unlink("${main::spool}/$_") } @{ $form->{DUNNING_PDFS} };
+  map { unlink("$spool/$_") } @{ $form->{DUNNING_PDFS} };

 
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }


@@ -691,8 +757,9 @@ sub print_dunning {
          dcfg.email_subject, dcfg.email_body, dcfg.email_attachment,
 
          ar.transdate,       ar.duedate,      ar.customer_id,
          dcfg.email_subject, dcfg.email_body, dcfg.email_attachment,
 
          ar.transdate,       ar.duedate,      ar.customer_id,

-         ar.invnumber,       ar.ordnumber,
+         ar.invnumber,       ar.ordnumber,    ar.cp_id,

          ar.amount,          ar.netamount,    ar.paid,
          ar.amount,          ar.netamount,    ar.paid,

+         ar.curr,

          ar.amount - ar.paid AS open_amount,
          ar.amount - ar.paid + da.fee + da.interest AS linetotal
 
          ar.amount - ar.paid AS open_amount,
          ar.amount - ar.paid + da.fee + da.interest AS linetotal
 


@@ -703,27 +770,34 @@ sub print_dunning {
 
   my $sth = prepare_execute_query($form, $dbh, $query, $dunning_id);
   my $first = 1;
 
   my $sth = prepare_execute_query($form, $dbh, $query, $dunning_id);
   my $first = 1;

-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+  while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {

     if ($first) {
     if ($first) {

-      map({ $form->{"dn_$_"} = []; } keys(%{$ref}));
+      $form->{TEMPLATE_ARRAYS} = {};
+      map({ $form->{TEMPLATE_ARRAYS}->{"dn_$_"} = []; } keys(%{$ref}));

       $first = 0;
     }
     map { $ref->{$_} = $form->format_amount($myconfig, $ref->{$_}, 2) } qw(amount netamount paid open_amount fee interest linetotal);
     map { $form->{$_} = $ref->{$_} } keys %$ref;
       $first = 0;
     }
     map { $ref->{$_} = $form->format_amount($myconfig, $ref->{$_}, 2) } qw(amount netamount paid open_amount fee interest linetotal);
     map { $form->{$_} = $ref->{$_} } keys %$ref;

-    map { push @{ $form->{"dn_$_"} }, $ref->{$_}} keys %$ref;
+    map { push @{ $form->{TEMPLATE_ARRAYS}->{"dn_$_"} }, $ref->{$_} } keys %$ref;

   }
   $sth->finish();
 
   $query =
     qq|SELECT
   }
   $sth->finish();
 
   $query =
     qq|SELECT

-         c.id AS customer_id, c.name,         c.street,       c.zipcode, c.city,
-         c.country,           c.department_1, c.department_2, c.email
+         c.id AS customer_id, c.name,         c.street,       c.zipcode,   c.city,
+         c.country,           c.department_1, c.department_2, c.email,     c.customernumber,
+         c.greeting,          c.contact,      c.phone,        c.fax,       c.homepage,
+         c.email,             c.taxincluded,  c.business_id,  c.taxnumber, c.iban,
+         c,ustid,             e.name as salesman_name,
+         co.*

        FROM dunning d
        FROM dunning d

-       LEFT JOIN ar         ON (d.trans_id = ar.id)
-       LEFT JOIN customer c ON (ar.customer_id = c.id)
+       LEFT JOIN ar          ON (d.trans_id = ar.id)
+       LEFT JOIN customer c  ON (ar.customer_id = c.id)
+       LEFT JOIN contacts co ON (ar.cp_id = co.cp_id)
+       LEFT JOIN employee e  ON (ar.salesman_id = e.id)

        WHERE (d.dunning_id = ?)
        LIMIT 1|;
        WHERE (d.dunning_id = ?)
        LIMIT 1|;

-  $ref = selectfirst_hashref_query($form, $dbh, $query, $dunning_id);
+  my $ref = selectfirst_hashref_query($form, $dbh, $query, $dunning_id);

   map { $form->{$_} = $ref->{$_} } keys %{ $ref };
 
   $query =
   map { $form->{$_} = $ref->{$_} } keys %{ $ref };
 
   $query =


@@ -759,19 +833,21 @@ sub print_dunning {
   $form->{total_open_amount} = $form->format_amount($myconfig, $form->round_amount($ref->{total_open_amount}, 2), 2);
   $form->{total_amount}      = $form->format_amount($myconfig, $form->round_amount($ref->{fee} + $ref->{total_interest} + $ref->{total_open_amount}, 2), 2);
 
   $form->{total_open_amount} = $form->format_amount($myconfig, $form->round_amount($ref->{total_open_amount}, 2), 2);
   $form->{total_amount}      = $form->format_amount($myconfig, $form->round_amount($ref->{fee} + $ref->{total_interest} + $ref->{total_open_amount}, 2), 2);
 

+  $self->set_customer_cvars($myconfig, $form);

   $self->set_template_options($myconfig, $form);
 
   my $filename          = "dunning_${dunning_id}_" . Common::unique_id() . ".pdf";
   $self->set_template_options($myconfig, $form);
 
   my $filename          = "dunning_${dunning_id}_" . Common::unique_id() . ".pdf";

-  $form->{OUT}          = ">${main::spool}/$filename";
+  my $spool             = $::lx_office_conf{paths}->{spool};
+  $form->{OUT}          = "${spool}/$filename";

   $form->{keep_tmpfile} = 1;
 
   delete $form->{tmpfile};
 
   push @{ $form->{DUNNING_PDFS} }, $filename;
   $form->{keep_tmpfile} = 1;
 
   delete $form->{tmpfile};
 
   push @{ $form->{DUNNING_PDFS} }, $filename;

-  push @{ $form->{DUNNING_PDFS_EMAIL} }, { 'filename' => "${main::spool}/$filename",
+  push @{ $form->{DUNNING_PDFS_EMAIL} }, { 'filename' => "${spool}/$filename",

                                            'name'     => "dunning_${dunning_id}.pdf" };
 
                                            'name'     => "dunning_${dunning_id}.pdf" };
 

-  $form->parse_template($myconfig, $main::userspath);
+  $form->parse_template($myconfig);

 
   $dbh->disconnect() unless $provided_dbh;
 
 
   $dbh->disconnect() unless $provided_dbh;
 


@@ -808,24 +884,24 @@ sub print_invoice_for_fees {
 
   $query =
     qq|SELECT
 
   $query =
     qq|SELECT

-         ar.invnumber, ar.transdate, ar.amount, ar.netamount,
-         ar.duedate,   ar.notes,     ar.notes AS invoicenotes,
+         ar.invnumber, ar.transdate AS invdate, ar.amount, ar.netamount,
+         ar.duedate,   ar.notes,     ar.notes AS invoicenotes, ar.customer_id,

 
          c.name,      c.department_1,   c.department_2, c.street, c.zipcode, c.city, c.country,
          c.contact,   c.customernumber, c.phone,        c.fax,    c.email,
 
          c.name,      c.department_1,   c.department_2, c.street, c.zipcode, c.city, c.country,
          c.contact,   c.customernumber, c.phone,        c.fax,    c.email,

-         c.taxnumber, c.sic_code,       c.greeting
+         c.taxnumber, c.greeting

 
        FROM ar
        LEFT JOIN customer c ON (ar.customer_id = c.id)
        WHERE ar.id = ?|;
 
        FROM ar
        LEFT JOIN customer c ON (ar.customer_id = c.id)
        WHERE ar.id = ?|;

-  $ref = selectfirst_hashref_query($form, $dbh, $query, $ar_id);
+  my $ref = selectfirst_hashref_query($form, $dbh, $query, $ar_id);

   map { $form->{$_} = $ref->{$_} } keys %{ $ref };
 
   $query = qq|SELECT * FROM employee WHERE login = ?|;
   $ref = selectfirst_hashref_query($form, $dbh, $query, $form->{login});
   map { $form->{"employee_${_}"} = $ref->{$_} } keys %{ $ref };
 
   map { $form->{$_} = $ref->{$_} } keys %{ $ref };
 
   $query = qq|SELECT * FROM employee WHERE login = ?|;
   $ref = selectfirst_hashref_query($form, $dbh, $query, $form->{login});
   map { $form->{"employee_${_}"} = $ref->{$_} } keys %{ $ref };
 

-  $query = qq|SELECT * FROM acc_trans WHERE trans_id = ? ORDER BY oid ASC|;
+  $query = qq|SELECT * FROM acc_trans WHERE trans_id = ? ORDER BY acc_trans_id ASC|;

   $sth   = prepare_execute_query($form, $dbh, $query, $ar_id);
 
   my ($row, $fee, $interest) = (0, 0, 0);
   $sth   = prepare_execute_query($form, $dbh, $query, $ar_id);
 
   my ($row, $fee, $interest) = (0, 0, 0);


@@ -850,22 +926,24 @@ sub print_invoice_for_fees {
 
   map { $form->{$_} = $form->format_amount($myconfig, $form->{$_}, 2) } qw(fee interest invamount);
 
 
   map { $form->{$_} = $form->format_amount($myconfig, $form->{$_}, 2) } qw(fee interest invamount);
 

+  $self->set_customer_cvars($myconfig, $form);

   $self->set_template_options($myconfig, $form);
 
   my $filename = Common::unique_id() . "dunning_invoice_${dunning_id}.pdf";
 
   $self->set_template_options($myconfig, $form);
 
   my $filename = Common::unique_id() . "dunning_invoice_${dunning_id}.pdf";
 

-  $form->{OUT}          = ">$main::spool/$filename";
+  my $spool             = $::lx_office_conf{paths}->{spool};
+  $form->{OUT}          = "$spool/$filename";

   $form->{keep_tmpfile} = 1;
   delete $form->{tmpfile};
 
   map { delete $form->{$_} } grep /^[a-z_]+_\d+$/, keys %{ $form };
 
   $form->{keep_tmpfile} = 1;
   delete $form->{tmpfile};
 
   map { delete $form->{$_} } grep /^[a-z_]+_\d+$/, keys %{ $form };
 

-  $form->parse_template($myconfig, $main::userspath);
+  $form->parse_template($myconfig);

 
   restore_form($saved_form);
 
   push @{ $form->{DUNNING_PDFS} }, $filename;
 
   restore_form($saved_form);
 
   push @{ $form->{DUNNING_PDFS} }, $filename;

-  push @{ $form->{DUNNING_PDFS_EMAIL} }, { 'filename' => "${main::spool}/$filename",
+  push @{ $form->{DUNNING_PDFS_EMAIL} }, { 'filename' => "${spool}/$filename",

                                            'name'     => "dunning_invoice_${dunning_id}.pdf" };
 
   $dbh->disconnect() unless $provided_dbh;
                                            'name'     => "dunning_invoice_${dunning_id}.pdf" };
 
   $dbh->disconnect() unless $provided_dbh;


@@ -873,4 +951,18 @@ sub print_invoice_for_fees {
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 

+sub set_customer_cvars {
+  my ($self, $myconfig, $form) = @_;
+
+  my $custom_variables = CVar->get_custom_variables(dbh      => $form->get_standard_dbh,
+                                                    module   => 'CT',
+                                                    trans_id => $form->{customer_id});
+  map { $form->{"vc_cvar_$_->{name}"} = $_->{value} } @{ $custom_variables };
+
+  $form->{cp_greeting} = GenericTranslations->get(dbh              => $form->get_standard_dbh,
+                                                  translation_type => 'greetings::' . ($form->{cp_gender} eq 'f' ? 'female' : 'male'),
+                                                  language_id      => $form->{language_id},
+                                                  allow_fallback   => 1);
+}
+

 1;
 1;