X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDN.pm;h=bc1ff840159665a099b602ea8721d160b0a9bdd5;hb=ed0754c2f82cab2e24100107b534692d5455b02d;hp=c9289e46fb10442e2a6b020ffa8a08c58a3d2d4b;hpb=1b15807093421ca00493a447048b960f2f512152;p=kivitendo-erp.git diff --git a/SL/DN.pm b/SL/DN.pm index c9289e46f..bc1ff8401 100644 --- 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 -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1335, USA. #====================================================================== # # Dunning process module @@ -36,7 +37,9 @@ package DN; use SL::Common; use SL::DBUtils; +use SL::DB::AuthUser; use SL::DB::Default; +use SL::DB::Employee; use SL::GenericTranslations; use SL::IS; use SL::Mailer; @@ -45,6 +48,10 @@ use SL::Template; use SL::DB::Printer; use SL::DB::Language; use SL::TransNumber; +use SL::Util qw(trim); +use SL::DB; + +use File::Copy; use strict; @@ -54,7 +61,7 @@ sub get_config { my ($self, $myconfig, $form) = @_; # connect to database - my $dbh = $form->dbconnect($myconfig); + my $dbh = SL::DB->client->dbh; my $query = qq|SELECT * | . @@ -68,22 +75,28 @@ sub get_config { } $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|; - ($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 { + my ($self, $myconfig, $form) = @_; $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) = @_; - # connect to database - my $dbh = $form->dbconnect_noauto($myconfig); + my $dbh = SL::DB->client->dbh; my ($query, @values); @@ -98,7 +111,8 @@ sub save_config { $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->{"create_invoices_for_fees_$i"} ? 't' : 'f'); + $form->{"create_invoices_for_fees_$i"} ? 't' : 'f', + $form->{"print_original_invoice_$i"} ? 't' : 'f'); if ($form->{"id_$i"}) { $query = qq|UPDATE dunning_config SET @@ -107,7 +121,8 @@ sub save_config { template = ?, fee = ?, interest_rate = ?, active = ?, auto = ?, email = ?, email_attachment = ?, payment_terms = ?, terms = ?, - create_invoices_for_fees = ? + create_invoices_for_fees = ?, + print_original_invoice = ? WHERE id = ?|; push(@values, conv_i($form->{"id_$i"})); } else { @@ -115,8 +130,9 @@ sub save_config { 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, create_invoices_for_fees) - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|; + email_attachment, payment_terms, terms, create_invoices_for_fees, + print_original_invoice) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|; } do_query($form, $dbh, $query, @values); } @@ -127,14 +143,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); - $dbh->commit(); - $dbh->disconnect(); - - $main::lxdebug->leave_sub(); + return 1; } sub create_invoice_for_fees { @@ -211,7 +226,7 @@ sub create_invoice_for_fees { $query = qq|INSERT INTO ar (id, invnumber, transdate, gldate, customer_id, taxincluded, amount, netamount, paid, duedate, - invoice, currency_id, notes, + invoice, currency_id, taxzone_id, notes, employee_id) VALUES ( ?, -- id @@ -232,6 +247,14 @@ sub create_invoice_for_fees { (SELECT duedate FROM dunning WHERE dunning_id = ? LIMIT 1), 'f', -- invoice (SELECT id FROM currencies WHERE name = ?), -- curr + --taxzone_id: + (SELECT taxzone_id FROM customer WHERE id = + (SELECT ar.customer_id + FROM dunning dn + LEFT JOIN ar ON (dn.trans_id = ar.id) + WHERE dn.dunning_id = ? + LIMIT 1) + ), ?, -- notes -- employee_id: (SELECT id FROM employee WHERE login = ?) @@ -243,6 +266,7 @@ sub create_invoice_for_fees { $amount, $dunning_id, # duedate $curr, # default currency + $dunning_id, # taxzone_id sprintf($main::locale->text('Automatically created invoice for fee and interest for dunning %s'), $dunning_id), # notes $::myconfig{login}); # employee_id do_query($form, $dbh, $query, @values); @@ -273,12 +297,26 @@ sub create_invoice_for_fees { $main::lxdebug->leave_sub(); } + sub save_dunning { + my ($self, $myconfig, $form, $rows) = @_; $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) = @_; - # connect to database - my $dbh = $form->dbconnect_noauto($myconfig); + + my $dbh = SL::DB->client->dbh; my ($query, @values); @@ -305,7 +343,7 @@ sub save_dunning { my @invoice_ids; my ($next_dunning_config_id, $customer_id); - my $send_email = 0; + my ($send_email, $print_invoice) = (0, 0); foreach my $row (@{ $rows }) { push @invoice_ids, $row->{invoice_id}; @@ -315,7 +353,8 @@ sub save_dunning { @values = ($row->{next_dunning_config_id}, $row->{invoice_id}); do_statement($form, $h_update_ar, $q_update_ar, @values); - $send_email |= $row->{email}; + $send_email |= $row->{email}; + $print_invoice |= $row->{print_invoice}; my $next_config_id = conv_i($row->{next_dunning_config_id}); my $invoice_id = conv_i($row->{invoice_id}); @@ -338,15 +377,15 @@ sub save_dunning { $self->print_invoice_for_fees($myconfig, $form, $dunning_id, $dbh); $self->print_dunning($myconfig, $form, $dunning_id, $dbh); + if ($print_invoice) { + $self->print_original_invoices($myconfig, $form, $_, $dbh) for @invoice_ids; + } if ($send_email) { $self->send_email($myconfig, $form, $dunning_id, $dbh); } - $dbh->commit(); - $dbh->disconnect(); - - $main::lxdebug->leave_sub(); + return 1; } sub send_email { @@ -357,8 +396,8 @@ sub send_email { 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) @@ -367,19 +406,38 @@ sub send_email { 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(); - return; + die $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, $sign); + if ($::instance_conf->get_dunning_creator eq 'current_employee') { + $from = $myconfig->{email}; + die $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"); + $sign = SL::DB::Manager::AuthUser->find_by(login => $ref->{invoice_employee_login})->get_config_value("signature"); + die unless ($from); + 1; + } or die $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(); - $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}); - + my $sign_backup = $::myconfig{signature}; + $::myconfig{signature} = $sign if $sign; $mail->{message} .= $form->create_email_signature(); + $::myconfig{signature} = $sign_backup if $sign; $mail->{message} =~ s/\r\n/\n/g; @@ -451,11 +509,11 @@ sub set_template_options { # 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, - 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, }; @@ -469,7 +527,7 @@ sub get_invoices { my ($self, $myconfig, $form) = @_; # connect to database - my $dbh = $form->dbconnect($myconfig); + my $dbh = SL::DB->client->dbh; my $where; my @values; @@ -482,7 +540,12 @@ sub get_invoices { } elsif ($form->{customer}) { $where .= qq| AND (ct.name ILIKE ?)|; - push(@values, '%' . $form->{customer} . '%'); + push(@values, like($form->{customer})); + } + + if ($form->{department_id}) { + $where .= qq| AND (a.department_id = ?)|; + push(@values, $form->{department_id}); } my %columns = ( @@ -494,7 +557,7 @@ sub get_invoices { 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}) { @@ -505,7 +568,7 @@ sub get_invoices { $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 = @@ -514,11 +577,17 @@ sub get_invoices { 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 - 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, + a.direct_debit, + dep.description as departmentname, cfg.dunning_description, cfg.dunning_level, @@ -531,11 +600,12 @@ sub get_invoices { nextcfg.dunning_description AS next_dunning_description, nextcfg.id AS next_dunning_config_id, - nextcfg.terms, nextcfg.active, nextcfg.email + nextcfg.terms, nextcfg.active, nextcfg.email, nextcfg.print_original_invoice FROM ar a LEFT JOIN customer ct ON (a.customer_id = ct.id) + LEFT JOIN department dep ON (a.department_id = dep.id) LEFT JOIN dunning_config cfg ON (a.dunning_config_id = cfg.id) LEFT JOIN dunning_config nextcfg ON (nextcfg.id = @@ -581,7 +651,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); - $dbh->disconnect; $main::lxdebug->leave_sub(); } @@ -592,7 +661,7 @@ sub get_dunning { 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)|; @@ -604,7 +673,7 @@ sub get_dunning { } elsif ($form->{customer}) { $where .= qq| AND (ct.name ILIKE ?)|; - push(@values, '%' . $form->{customer} . '%'); + push(@values, like($form->{customer})); } my %columns = ( @@ -615,7 +684,7 @@ sub get_dunning { 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}) { @@ -694,7 +763,6 @@ sub get_dunning { map { $ref->{$_} = $form->format_amount($myconfig, $ref->{$_}, 2)} qw(amount fee interest); } - $dbh->disconnect; $main::lxdebug->leave_sub(); } @@ -750,7 +818,7 @@ sub print_dunning { 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; @@ -776,7 +844,9 @@ sub print_dunning { 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 @@ -805,7 +875,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,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) @@ -819,7 +890,7 @@ sub print_dunning { $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) @@ -872,12 +943,23 @@ sub print_dunning { 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" }; - $form->parse_template($myconfig); + my $employee_id = ($::instance_conf->get_dunning_creator eq 'invoice_employee') ? + $form->{employee_id} : + SL::DB::Manager::Employee->current->id; + + $form->get_employee_data('prefix' => 'employee', 'id' => $employee_id); + $form->get_employee_data('prefix' => 'salesman', 'id' => $form->{salesman_id}); - $dbh->disconnect() unless $provided_dbh; + $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(); } @@ -887,18 +969,20 @@ sub print_invoice_for_fees { 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, - 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 = ?|; - 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(); @@ -966,6 +1050,9 @@ sub print_invoice_for_fees { 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); @@ -974,8 +1061,6 @@ sub print_invoice_for_fees { push @{ $form->{DUNNING_PDFS_EMAIL} }, { 'filename' => "${spool}/$filename", 'name' => "dunning_invoice_${dunning_id}.pdf" }; - $dbh->disconnect() unless $provided_dbh; - $main::lxdebug->leave_sub(); } @@ -991,6 +1076,52 @@ sub set_customer_cvars { 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 }; + } + +} + +sub print_original_invoices { + my ($self, $myconfig, $form, $invoice_id) = @_; + # get one invoice as object and print to pdf + my $invoice = SL::DB::Invoice->new(id => $invoice_id)->load; + + die "Invalid invoice object" unless ref($invoice) eq 'SL::DB::Invoice'; + + my $print_form = Form->new(''); + $print_form->{type} = 'invoice'; + $print_form->{formname} = 'invoice', + $print_form->{format} = 'pdf', + $print_form->{media} = 'file'; + # no language override, should always be the object's language + $invoice->flatten_to_form($print_form, format_amounts => 1); + $print_form->prepare_for_printing; + + my $filename = SL::Helper::CreatePDF->create_pdf( + template => 'invoice.tex', + variables => $print_form, + return => 'file_name', + ); + + my $spool = $::lx_office_conf{paths}->{spool}; + my ($volume, $directory, $file_name) = File::Spec->splitpath($filename); + my $full_file_name = File::Spec->catfile($spool, $file_name); + + move($filename, $full_file_name) or die "The move operation failed: $!"; + + # form get_formname_translation should use language_id_$i + my $saved_reicpient_locale = $form->{recipient_locale}; + $form->{recipient_locale} = $invoice->language; + + push @{ $form->{DUNNING_PDFS} }, $file_name; + push @{ $form->{DUNNING_PDFS_EMAIL} }, { 'path' => "${spool}/$file_name", + 'name' => $form->get_formname_translation('invoice') . "_" . $invoice->invnumber . ".pdf" }; + + $form->{recipient_locale} = $saved_reicpient_locale; } 1;