X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDN.pm;h=143998f0aeaaab102e575088a9d5b32ba5a38599;hb=7de440bfb460ac0e011b7a833390c980c0753984;hp=4c8001ac85b0ab7665b32d2f1d4185368dc9d4ff;hpb=4aa9760e3d155fccea859b2c56f75946c12633f9;p=kivitendo-erp.git diff --git a/SL/DN.pm b/SL/DN.pm index 4c8001ac8..143998f0a 100644 --- a/SL/DN.pm +++ b/SL/DN.pm @@ -51,6 +51,8 @@ use SL::TransNumber; use SL::Util qw(trim); use SL::DB; +use File::Copy; + use strict; sub get_config { @@ -109,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 @@ -118,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 { @@ -126,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); } @@ -187,7 +192,8 @@ sub create_invoice_for_fees { AND (d_interest.dunning_id <> ?) AND NOT (d_interest.fee_interest_ar_id ISNULL) ), 0) - AS max_previous_interest + AS max_previous_interest, + d.id AS link_id FROM dunning d WHERE dunning_id = ?|; @values = ($dunning_id, $dunning_id, $dunning_id); @@ -196,6 +202,8 @@ sub create_invoice_for_fees { my ($fee_remaining, $interest_remaining) = (0, 0); my ($fee_total, $interest_total) = (0, 0); + my @link_ids; + while (my $ref = $sth->fetchrow_hashref()) { $fee_remaining += $form->round_amount($ref->{fee}, 2); $fee_remaining -= $form->round_amount($ref->{max_previous_fee}, 2); @@ -203,6 +211,7 @@ sub create_invoice_for_fees { $interest_remaining += $form->round_amount($ref->{interest}, 2); $interest_remaining -= $form->round_amount($ref->{max_previous_interest}, 2); $interest_total += $form->round_amount($ref->{interest}, 2); + push @link_ids, $ref->{link_id}; } $sth->finish(); @@ -266,6 +275,15 @@ sub create_invoice_for_fees { $::myconfig{login}); # employee_id do_query($form, $dbh, $query, @values); + RecordLinks->create_links( + 'dbh' => $dbh, + 'mode' => 'ids', + 'from_table' => 'dunning', + 'from_ids' => \@link_ids, + 'to_table' => 'ar', + 'to_id' => $ar_id, + ); + $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, gldate, taxkey, tax_id, chart_link) VALUES (?, ?, ?, current_date, current_date, 0, @@ -321,9 +339,9 @@ sub _save_dunning { my $h_update_ar = prepare_query($form, $dbh, $q_update_ar); my $q_insert_dunning = - qq|INSERT INTO dunning (dunning_id, dunning_config_id, dunning_level, trans_id, - fee, interest, transdate, duedate) - VALUES (?, ?, + qq|INSERT INTO dunning (id, dunning_id, dunning_config_id, dunning_level, trans_id, + fee, interest, transdate, duedate) + VALUES (?, ?, ?, (SELECT dunning_level FROM dunning_config WHERE id = ?), ?, (SELECT SUM(fee) @@ -338,9 +356,19 @@ 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 }) { + if ($row->{credit_note}) { + my $i = $row->{row}; + %{ $form->{LIST_CREDIT_NOTES}{$row->{customer_id}}{$row->{invoice_id}} } = ( + open_amount => $form->{"open_amount_$i"}, + amount => $form->{"amount_$i"}, + invnumber => $form->{"invnumber_$i"}, + invdate => $form->{"invdate_$i"}, + ); + next; + } push @invoice_ids, $row->{invoice_id}; $next_dunning_config_id = $row->{next_dunning_config_id}; $customer_id = $row->{customer_id}; @@ -348,16 +376,30 @@ 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 ($row_id) = selectrow_query($form, $dbh, qq|SELECT nextval('id')|); my $next_config_id = conv_i($row->{next_dunning_config_id}); my $invoice_id = conv_i($row->{invoice_id}); - @values = ($dunning_id, $next_config_id, $next_config_id, - $invoice_id, $next_config_id, $invoice_id, - $next_config_id, $next_config_id); + @values = ($row_id, $dunning_id, $next_config_id, + $next_config_id, $invoice_id, $next_config_id, + $invoice_id, $next_config_id, $next_config_id); do_statement($form, $h_insert_dunning, $q_insert_dunning, @values); + + RecordLinks->create_links( + 'dbh' => $dbh, + 'mode' => 'ids', + 'from_table' => 'ar', + 'from_ids' => $invoice_id, + 'to_table' => 'dunning', + 'to_id' => $row_id, + ); } + # die this transaction, because for this customer only credit notes are + # selected ... + return unless $customer_id; $h_update_ar->finish(); $h_insert_dunning->finish(); @@ -371,6 +413,9 @@ 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); @@ -571,6 +616,7 @@ sub get_invoices { if (!$form->{l_include_direct_debit}) { $where .= qq| AND NOT COALESCE(a.direct_debit, FALSE) |; } + my $paid = ($form->{l_include_credit_notes}) ? "WHERE (a.paid <> a.amount)" : "WHERE (a.paid < a.amount)"; $query = qq|SELECT @@ -591,7 +637,7 @@ 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 @@ -619,9 +665,8 @@ sub get_invoices { WHERE (d2.trans_id = a.id) AND (d2.dunning_level = cfg.dunning_level) )) - - WHERE (a.paid < a.amount) - AND (a.duedate < current_date) + $paid + AND (a.duedate < current_date) $where @@ -632,7 +677,7 @@ sub get_invoices { while (my $ref = $sth->fetchrow_hashref("NAME_lc")) { next if ($ref->{pastdue} < $ref->{terms}); - + $ref->{credit_note} = 1 if ($ref->{amount} < 0 && $form->{l_include_credit_notes}); $ref->{interest} = $form->round_amount($ref->{interest}, 2); push(@{ $form->{DUNNINGS} }, $ref); } @@ -860,6 +905,14 @@ sub print_dunning { } $sth->finish(); + # if we have some credit notes to add, do a safety check on the first customer id + # and add one entry for each credit note + if ($form->{LIST_CREDIT_NOTES} && $form->{LIST_CREDIT_NOTES}->{$form->{TEMPLATE_ARRAYS}->{"dn_customer_id"}[0]}) { + my $first_customer_id = $form->{TEMPLATE_ARRAYS}->{"dn_customer_id"}[0]; + while ( my ($cred_id, $value) = each(%{ $form->{LIST_CREDIT_NOTES}->{$first_customer_id} } ) ) { + map { push @{ $form->{TEMPLATE_ARRAYS}->{"dn_$_"} }, $value->{$_} } keys %{ $value }; + } + } $query = qq|SELECT c.id AS customer_id, c.name, c.street, c.zipcode, c.city, @@ -909,8 +962,16 @@ sub print_dunning { $form->{interest_rate} = $form->format_amount($myconfig, $ref->{interest_rate} * 100); $form->{fee} = $form->format_amount($myconfig, $ref->{fee}, 2); $form->{total_interest} = $form->format_amount($myconfig, $form->round_amount($ref->{total_interest}, 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); + my $total_open_amount = $ref->{total_open_amount}; + if ($form->{l_include_credit_notes}) { + # a bit stupid, but redo calc because of credit notes + $total_open_amount = 0; + foreach my $amount (@{ $form->{TEMPLATE_ARRAYS}->{dn_open_amount} }) { + $total_open_amount += $form->parse_amount($myconfig, $amount, 2); + } + } + $form->{total_open_amount} = $form->format_amount($myconfig, $form->round_amount($total_open_amount, 2), 2); + $form->{total_amount} = $form->format_amount($myconfig, $form->round_amount($ref->{fee} + $ref->{total_interest} + $total_open_amount, 2), 2); $::form->format_dates($output_dateformat, $output_longdates, qw(dn_dunning_date dn_dunning_duedate dn_transdate dn_duedate @@ -1076,4 +1137,51 @@ sub set_customer_cvars { } +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); + for my $i (1 .. $print_form->{rowcount}) { + $print_form->{"sellprice_$i"} = $print_form->{"fxsellprice_$i"}; + } + $print_form->prepare_for_printing; + + my $filename = SL::Helper::CreatePDF->create_pdf( + template => 'invoice.tex', + variables => $print_form, + return => 'file_name', + variable_content_types => { + longdescription => 'html', + partnotes => 'html', + notes => 'html', + }, + ); + + 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;