Zahlungserinnerung an Rechnungsadresse schicken - Weiche für Absender

[mfinanz.git] / SL / DN.pm

diff --git a/SL/DN.pm b/SL/DN.pm
index 55200835efd12d218ddb0c51cb10be1057f6bfad..20b4184216a813af1dbfbfab6324de4e6ee931c2 100644 (file)
--- a/SL/DN.pm
+++ b/SL/DN.pm
@@ -25,7 +25,8 @@
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software

-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.

 #======================================================================
 #
 # Dunning process module
 #======================================================================
 #
 # Dunning process module


@@ -36,7 +37,9 @@ package DN;
 
 use SL::Common;
 use SL::DBUtils;
 
 use SL::Common;
 use SL::DBUtils;

+use SL::DB::AuthUser;

 use SL::DB::Default;
 use SL::DB::Default;

+use SL::DB::Employee;

 use SL::GenericTranslations;
 use SL::IS;
 use SL::Mailer;
 use SL::GenericTranslations;
 use SL::IS;
 use SL::Mailer;


@@ -45,6 +48,8 @@ use SL::Template;
 use SL::DB::Printer;
 use SL::DB::Language;
 use SL::TransNumber;
 use SL::DB::Printer;
 use SL::DB::Language;
 use SL::TransNumber;

+use SL::Util qw(trim);
+use SL::DB;

 
 use strict;
 
 
 use strict;
 


@@ -54,7 +59,7 @@ sub get_config {
   my ($self, $myconfig, $form) = @_;
 
   # connect to database
   my ($self, $myconfig, $form) = @_;
 
   # connect to database

-  my $dbh = $form->dbconnect($myconfig);
+  my $dbh = SL::DB->client->dbh;

 
   my $query =
     qq|SELECT * | .
 
   my $query =
     qq|SELECT * | .


@@ -68,22 +73,28 @@ sub get_config {
   }
 
   $query =
   }
 
   $query =

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

        FROM defaults|;
        FROM defaults|;

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

 
   $main::lxdebug->leave_sub();
 }
 
 sub save_config {
 
   $main::lxdebug->leave_sub();
 }
 
 sub save_config {

+  my ($self, $myconfig, $form) = @_;

   $main::lxdebug->enter_sub();
 
   $main::lxdebug->enter_sub();
 

+  my $rc = SL::DB->client->with_transaction(\&_save_config, $self, $myconfig, $form);
+
+  $::lxdebug->leave_sub;
+  return $rc;
+}
+
+sub _save_config {

   my ($self, $myconfig, $form) = @_;
 
   my ($self, $myconfig, $form) = @_;
 

-  # connect to database
-  my $dbh = $form->dbconnect_noauto($myconfig);
+  my $dbh = SL::DB->client->dbh;

 
   my ($query, @values);
 
 
   my ($query, @values);
 


@@ -127,14 +138,13 @@ sub save_config {
     }
   }
 
     }
   }
 

-  $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}));
+  $query  = qq|UPDATE defaults SET dunning_ar_amount_fee = ?, dunning_ar_amount_interest = ?, dunning_ar = ?,
+               dunning_creator = ?|;
+  @values = (conv_i($form->{AR_amount_fee}), conv_i($form->{AR_amount_interest}), conv_i($form->{AR}),
+             $form->{dunning_creator});

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

-  $dbh->commit();
-  $dbh->disconnect();
-
-  $main::lxdebug->leave_sub();
+  return 1;

 }
 
 sub create_invoice_for_fees {
 }
 
 sub create_invoice_for_fees {


@@ -282,12 +292,26 @@ sub create_invoice_for_fees {
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 

+

 sub save_dunning {
 sub save_dunning {

+  my ($self, $myconfig, $form, $rows) = @_;

   $main::lxdebug->enter_sub();
 
   $main::lxdebug->enter_sub();
 

+  my $rc = SL::DB->client->with_transaction(\&_save_dunning, $self, $myconfig, $form, $rows);
+
+  if (!$rc) {
+    die SL::DB->client->error
+  }
+  $::lxdebug->leave_sub;
+
+  return $rc;
+}
+
+
+sub _save_dunning {

   my ($self, $myconfig, $form, $rows) = @_;
   my ($self, $myconfig, $form, $rows) = @_;

-  # connect to database
-  my $dbh = $form->dbconnect_noauto($myconfig);
+
+  my $dbh = SL::DB->client->dbh;

 
   my ($query, @values);
 
 
   my ($query, @values);
 


@@ -352,10 +376,7 @@ sub save_dunning {
     $self->send_email($myconfig, $form, $dunning_id, $dbh);
   }
 
     $self->send_email($myconfig, $form, $dunning_id, $dbh);
   }
 

-  $dbh->commit();
-  $dbh->disconnect();
-
-  $main::lxdebug->leave_sub();
+  return 1;

 }
 
 sub send_email {
 }
 
 sub send_email {


@@ -366,8 +387,8 @@ sub send_email {
   my $query =
     qq|SELECT
          dcfg.email_body,     dcfg.email_subject, dcfg.email_attachment,
   my $query =
     qq|SELECT
          dcfg.email_body,     dcfg.email_subject, dcfg.email_attachment,

-         c.email AS recipient
-
+         COALESCE (NULLIF(c.invoice_mail, ''), c.email) AS recipient, c.name,
+         (SELECT login from employee where id = ar.employee_id) as invoice_employee_login

        FROM dunning d
        LEFT JOIN dunning_config dcfg ON (d.dunning_config_id = dcfg.id)
        LEFT JOIN ar                  ON (d.trans_id          = ar.id)
        FROM dunning d
        LEFT JOIN dunning_config dcfg ON (d.dunning_config_id = dcfg.id)
        LEFT JOIN ar                  ON (d.trans_id          = ar.id)


@@ -376,14 +397,29 @@ sub send_email {
        LIMIT 1|;
   my $ref = selectfirst_hashref_query($form, $dbh, $query, $dunning_id);
 
        LIMIT 1|;
   my $ref = selectfirst_hashref_query($form, $dbh, $query, $dunning_id);
 

-  if (!$ref || !$ref->{recipient} || !$myconfig->{email}) {
+  # without a recipient, we cannot send a mail
+  if (!$ref || !$ref->{recipient}) {

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

-    return;
+    $form->error($main::locale->text("No email recipient for customer #1 defined.", $ref->{name}));
+  }
+
+  # without a sender we cannot send a mail
+  # two cases: check mail from 1. current user OR  2. employee who created the invoice
+  my $from;
+  if ($::instance_conf->get_dunning_creator eq 'current_employee') {
+    $from = $myconfig->{email};
+    $form->error($main::locale->text('No email for current user #1 defined.', $myconfig->{name})) unless $from;
+  } else {
+    eval {
+      $from = SL::DB::Manager::AuthUser->find_by(login =>  $ref->{invoice_employee_login})->get_config_value("email");
+      1;
+    } or do { $form->error($main::locale->text('No email for user with login #1 defined.', $ref->{invoice_employee_login})) };

   }
 
   my $template     = SL::Template::create(type => 'PlainText', form => $form, myconfig => $myconfig);
   my $mail         = Mailer->new();
   }
 
   my $template     = SL::Template::create(type => 'PlainText', form => $form, myconfig => $myconfig);
   my $mail         = Mailer->new();

-  $mail->{from}    = $myconfig->{email};
+  $mail->{bcc}     = $form->get_bcc_defaults($myconfig, $form->{bcc});
+  $mail->{from}    = $from;

   $mail->{to}      = $ref->{recipient};
   $mail->{subject} = $template->parse_block($ref->{email_subject});
   $mail->{message} = $template->parse_block($ref->{email_body});
   $mail->{to}      = $ref->{recipient};
   $mail->{subject} = $template->parse_block($ref->{email_subject});
   $mail->{message} = $template->parse_block($ref->{email_body});


@@ -460,11 +496,11 @@ sub set_template_options {
   # prepare meta information for template introspection
   $form->{template_meta} = {
     formname  => $form->{formname},
   # 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}),
+    language  => SL::DB::Manager::Language->find_by_or_create(id => $form->{language_id} || undef),

     format    => $form->{format},
     media     => $form->{media},
     extension => $extension,
     format    => $form->{format},
     media     => $form->{media},
     extension => $extension,

-    printer   => SL::DB::Manager::Printer->find_by_or_create(id => $form->{printer_id}),
+    printer   => SL::DB::Manager::Printer->find_by_or_create(id => $form->{printer_id} || undef),

     today     => DateTime->today,
   };
 
     today     => DateTime->today,
   };
 


@@ -478,7 +514,7 @@ sub get_invoices {
   my ($self, $myconfig, $form) = @_;
 
   # connect to database
   my ($self, $myconfig, $form) = @_;
 
   # connect to database

-  my $dbh = $form->dbconnect($myconfig);
+  my $dbh = SL::DB->client->dbh;

 
   my $where;
   my @values;
 
   my $where;
   my @values;


@@ -491,7 +527,7 @@ sub get_invoices {
 
   } elsif ($form->{customer}) {
     $where .= qq| AND (ct.name ILIKE ?)|;
 
   } elsif ($form->{customer}) {
     $where .= qq| AND (ct.name ILIKE ?)|;

-    push(@values, '%' . $form->{customer} . '%');
+    push(@values, like($form->{customer}));

   }
 
   my %columns = (
   }
 
   my %columns = (


@@ -503,7 +539,7 @@ sub get_invoices {
   foreach my $key (keys(%columns)) {
     next unless ($form->{$key});
     $where .= qq| AND $columns{$key} ILIKE ?|;
   foreach my $key (keys(%columns)) {
     next unless ($form->{$key});
     $where .= qq| AND $columns{$key} ILIKE ?|;

-    push(@values, '%' . $form->{$key} . '%');
+    push(@values, like($form->{$key}));

   }
 
   if ($form->{dunning_level}) {
   }
 
   if ($form->{dunning_level}) {


@@ -514,7 +550,7 @@ sub get_invoices {
   $form->{minamount} = $form->parse_amount($myconfig,$form->{minamount});
   if ($form->{minamount}) {
     $where .= qq| AND ((a.amount - a.paid) > ?) |;
   $form->{minamount} = $form->parse_amount($myconfig,$form->{minamount});
   if ($form->{minamount}) {
     $where .= qq| AND ((a.amount - a.paid) > ?) |;

-    push(@values, $form->{minamount});
+    push(@values, trim($form->{minamount}));

   }
 
   my $query =
   }
 
   my $query =


@@ -523,11 +559,16 @@ sub get_invoices {
        WHERE dunning_level = (SELECT MAX(dunning_level) FROM dunning_config)|;
   my ($id_for_max_dunning_level) = selectrow_query($form, $dbh, $query);
 
        WHERE dunning_level = (SELECT MAX(dunning_level) FROM dunning_config)|;
   my ($id_for_max_dunning_level) = selectrow_query($form, $dbh, $query);
 

+  if (!$form->{l_include_direct_debit}) {
+    $where .= qq| AND NOT COALESCE(a.direct_debit, FALSE) |;
+  }
+

   $query =
     qq|SELECT
   $query =
     qq|SELECT

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

          ct.name AS customername, a.customer_id, a.duedate,
          a.amount - a.paid AS open_amount,
          ct.name AS customername, a.customer_id, a.duedate,
          a.amount - a.paid AS open_amount,

+         a.direct_debit,

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


@@ -590,7 +631,6 @@ sub get_invoices {
   $query = qq|SELECT id, dunning_description FROM dunning_config ORDER BY dunning_level|;
   $form->{DUNNING_CONFIG} = selectall_hashref_query($form, $dbh, $query);
 
   $query = qq|SELECT id, dunning_description FROM dunning_config ORDER BY dunning_level|;
   $form->{DUNNING_CONFIG} = selectall_hashref_query($form, $dbh, $query);
 

-  $dbh->disconnect;

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


@@ -601,7 +641,7 @@ sub get_dunning {
   my ($self, $myconfig, $form) = @_;
 
   # connect to database
   my ($self, $myconfig, $form) = @_;
 
   # connect to database

-  my $dbh = $form->dbconnect($myconfig);
+  my $dbh = SL::DB->client->dbh;

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


@@ -613,7 +653,7 @@ sub get_dunning {
 
   } elsif ($form->{customer}) {
     $where .= qq| AND (ct.name ILIKE ?)|;
 
   } elsif ($form->{customer}) {
     $where .= qq| AND (ct.name ILIKE ?)|;

-    push(@values, '%' . $form->{customer} . '%');
+    push(@values, like($form->{customer}));

   }
 
   my %columns = (
   }
 
   my %columns = (


@@ -624,7 +664,7 @@ sub get_dunning {
   foreach my $key (keys(%columns)) {
     next unless ($form->{$key});
     $where .= qq| AND $columns{$key} ILIKE ?|;
   foreach my $key (keys(%columns)) {
     next unless ($form->{$key});
     $where .= qq| AND $columns{$key} ILIKE ?|;

-    push(@values, '%' . $form->{$key} . '%');
+    push(@values, like($form->{$key}));

   }
 
   if ($form->{dunning_level}) {
   }
 
   if ($form->{dunning_level}) {


@@ -703,7 +743,6 @@ sub get_dunning {
     map { $ref->{$_} = $form->format_amount($myconfig, $ref->{$_}, 2)} qw(amount fee interest);
   }
 
     map { $ref->{$_} = $form->format_amount($myconfig, $ref->{$_}, 2)} qw(amount fee interest);
   }
 

-  $dbh->disconnect;

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


@@ -759,7 +798,7 @@ sub print_dunning {
   my ($self, $myconfig, $form, $dunning_id, $provided_dbh) = @_;
 
   # connect to database
   my ($self, $myconfig, $form, $dunning_id, $provided_dbh) = @_;
 
   # connect to database

-  my $dbh = $provided_dbh ? $provided_dbh : $form->dbconnect_noauto($myconfig);
+  my $dbh = $provided_dbh || SL::DB->client->dbh;

 
   $dunning_id =~ s|[^\d]||g;
 
 
   $dunning_id =~ s|[^\d]||g;
 


@@ -785,7 +824,9 @@ sub print_dunning {
          ar.transdate,       ar.duedate,      ar.customer_id,
          ar.invnumber,       ar.ordnumber,    ar.cp_id,
          ar.amount,          ar.netamount,    ar.paid,
          ar.transdate,       ar.duedate,      ar.customer_id,
          ar.invnumber,       ar.ordnumber,    ar.cp_id,
          ar.amount,          ar.netamount,    ar.paid,

-         (SELECT cu.name FROM currencies cu WHERE cu.id=ar.currency_id) AS curr,
+         ar.employee_id,     ar.salesman_id,
+         (SELECT cu.name FROM currencies cu WHERE cu.id = ar.currency_id) AS curr,
+         (SELECT description from department WHERE id = ar.department_id) AS department,

          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
 


@@ -814,7 +855,8 @@ sub print_dunning {
          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.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,
+         c.ustid,
+         ar.id AS invoice_id,

          co.*
        FROM dunning d
        LEFT JOIN ar          ON (d.trans_id = ar.id)
          co.*
        FROM dunning d
        LEFT JOIN ar          ON (d.trans_id = ar.id)


@@ -828,7 +870,7 @@ sub print_dunning {
 
   $query =
     qq|SELECT
 
   $query =
     qq|SELECT

-         cfg.interest_rate, cfg.template AS formname,
+         cfg.interest_rate, cfg.template AS formname, cfg.dunning_level,

          cfg.email_subject, cfg.email_body, cfg.email_attachment,
          d.transdate AS dunning_date,
          (SELECT SUM(fee)
          cfg.email_subject, cfg.email_body, cfg.email_attachment,
          d.transdate AS dunning_date,
          (SELECT SUM(fee)


@@ -881,12 +923,23 @@ sub print_dunning {
   delete $form->{tmpfile};
 
   push @{ $form->{DUNNING_PDFS} }, $filename;
   delete $form->{tmpfile};
 
   push @{ $form->{DUNNING_PDFS} }, $filename;

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

                                            'name'     => $form->get_formname_translation('dunning') . "_${dunning_id}.pdf" };
 
                                            'name'     => $form->get_formname_translation('dunning') . "_${dunning_id}.pdf" };
 

-  $form->parse_template($myconfig);
+  my $employee_id = ($::instance_conf->get_dunning_creator eq 'invoice_employee') ?
+                      $form->{employee_id}                                        :
+                      SL::DB::Manager::Employee->current->id;

 
 

-  $dbh->disconnect() unless $provided_dbh;
+  $form->get_employee_data('prefix' => 'employee', 'id' => $employee_id);
+  $form->get_employee_data('prefix' => 'salesman', 'id' => $form->{salesman_id});
+
+  $form->{attachment_type}    = "dunning";
+  if ( $form->{dunning_level} ) {
+    $form->{attachment_type} .= $form->{dunning_level} if $form->{dunning_level} < 4;
+  }
+  $form->{attachment_filename} = $form->get_formname_translation($form->{attachment_type}) . "_${dunning_id}.pdf";
+  $form->{attachment_id} = $form->{invoice_id};
+  $form->parse_template($myconfig);

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


@@ -896,18 +949,20 @@ sub print_invoice_for_fees {
 
   my ($self, $myconfig, $form, $dunning_id, $provided_dbh) = @_;
 
 
   my ($self, $myconfig, $form, $dunning_id, $provided_dbh) = @_;
 

-  my $dbh = $provided_dbh ? $provided_dbh : $form->dbconnect($myconfig);
+  my $dbh = $provided_dbh || SL::DB->client->dbh;

 
   my ($query, @values, $sth);
 
   $query =
     qq|SELECT
          d.fee_interest_ar_id,
 
   my ($query, @values, $sth);
 
   $query =
     qq|SELECT
          d.fee_interest_ar_id,

-         dcfg.template
+         d.trans_id AS invoice_id,
+         dcfg.template,
+         dcfg.dunning_level

        FROM dunning d
        LEFT JOIN dunning_config dcfg ON (d.dunning_config_id = dcfg.id)
        WHERE d.dunning_id = ?|;
        FROM dunning d
        LEFT JOIN dunning_config dcfg ON (d.dunning_config_id = dcfg.id)
        WHERE d.dunning_id = ?|;

-  my ($ar_id, $template) = selectrow_query($form, $dbh, $query, $dunning_id);
+  my ($ar_id, $invoice_id, $template, $dunning_level) = selectrow_query($form, $dbh, $query, $dunning_id);

 
   if (!$ar_id) {
     $main::lxdebug->leave_sub();
 
   if (!$ar_id) {
     $main::lxdebug->leave_sub();


@@ -975,6 +1030,9 @@ sub print_invoice_for_fees {
 
   map { delete $form->{$_} } grep /^[a-z_]+_\d+$/, keys %{ $form };
 
 
   map { delete $form->{$_} } grep /^[a-z_]+_\d+$/, keys %{ $form };
 

+  $form->{attachment_filename} = $form->get_formname_translation('dunning_invoice') . "_${dunning_id}.pdf";
+  $form->{attachment_type}     = "dunning";
+  $form->{attachment_id}       = $form->{invoice_id};

   $form->parse_template($myconfig);
 
   restore_form($saved_form);
   $form->parse_template($myconfig);
 
   restore_form($saved_form);


@@ -983,8 +1041,6 @@ sub print_invoice_for_fees {
   push @{ $form->{DUNNING_PDFS_EMAIL} }, { 'filename' => "${spool}/$filename",
                                            'name'     => "dunning_invoice_${dunning_id}.pdf" };
 
   push @{ $form->{DUNNING_PDFS_EMAIL} }, { 'filename' => "${spool}/$filename",
                                            'name'     => "dunning_invoice_${dunning_id}.pdf" };
 

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

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


@@ -1000,6 +1056,13 @@ sub set_customer_cvars {
                                                   translation_type => 'greetings::' . ($form->{cp_gender} eq 'f' ? 'female' : 'male'),
                                                   language_id      => $form->{language_id},
                                                   allow_fallback   => 1);
                                                   translation_type => 'greetings::' . ($form->{cp_gender} eq 'f' ? 'female' : 'male'),
                                                   language_id      => $form->{language_id},
                                                   allow_fallback   => 1);

+  if ($form->{cp_id}) {
+    $custom_variables = CVar->get_custom_variables(dbh      => $form->get_standard_dbh,
+                                                   module   => 'Contacts',
+                                                   trans_id => $form->{cp_id});
+    $form->{"cp_cvar_$_->{name}"} = $_->{value} for @{ $custom_variables };
+  }
+

 }
 
 1;
 }
 
 1;