# 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
use SL::Template;
use SL::DB::Printer;
use SL::DB::Language;
+use SL::TransNumber;
+use SL::Util qw(trim);
+use SL::DB;
use strict;
my ($self, $myconfig, $form) = @_;
# connect to database
- my $dbh = $form->dbconnect($myconfig);
+ my $dbh = SL::DB->client->dbh;
my $query =
qq|SELECT * | .
FROM defaults|;
($form->{AR_amount_fee}, $form->{AR_amount_interest}, $form->{AR}) = selectrow_query($form, $dbh, $query);
- $dbh->disconnect();
-
$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);
@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();
- $dbh->disconnect();
-
- $main::lxdebug->leave_sub();
+ return 1;
}
sub create_invoice_for_fees {
my ($ar_id) = selectrow_query($form, $dbh, qq|SELECT nextval('glid')|);
my $curr = $form->get_default_currency($myconfig);
+ my $trans_number = SL::TransNumber->new(type => 'invoice', dbh => $dbh);
$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
(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 = ?)
)|;
@values = ($ar_id, # id
- $form->update_defaults($myconfig, 'invnumber', $dbh), # invnumber
+ $trans_number->create_unique, # invnumber
$dunning_id, # customer_id
$amount,
$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
- $form->{login}); # employee_id
+ $::myconfig{login}); # employee_id
do_query($form, $dbh, $query, @values);
$query =
- qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, gldate, taxkey)
- VALUES (?, ?, ?, current_date, current_date, 0)|;
+ qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, gldate, taxkey, tax_id, chart_link)
+ VALUES (?, ?, ?, current_date, current_date, 0,
+ (SELECT id FROM tax WHERE (taxkey = 0) AND (rate = 0)),
+ (SELECT link FROM chart WHERE id = ?))|;
$sth = prepare_query($form, $dbh, $query);
- @values = ($ar_id, conv_i($form->{AR_amount_fee}), $fee_remaining);
+ @values = ($ar_id, conv_i($form->{AR_amount_fee}), $fee_remaining, conv_i($form->{AR_amount_fee}));
do_statement($form, $sth, $query, @values);
if ($interest_remaining) {
- @values = ($ar_id, conv_i($form->{AR_amount_interest}), $interest_remaining);
+ @values = ($ar_id, conv_i($form->{AR_amount_interest}), $interest_remaining, conv_i($form->{AR_amount_interest}));
do_statement($form, $sth, $query, @values);
}
- @values = ($ar_id, conv_i($form->{AR}), -1 * $amount);
+ @values = ($ar_id, conv_i($form->{AR}), -1 * $amount, conv_i($form->{AR}));
do_statement($form, $sth, $query, @values);
$sth->finish();
$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);
$self->send_email($myconfig, $form, $dunning_id, $dbh);
}
- $dbh->commit();
- $dbh->disconnect();
-
- $main::lxdebug->leave_sub();
+ return 1;
}
sub send_email {
my $template = SL::Template::create(type => 'PlainText', form => $form, myconfig => $myconfig);
my $mail = Mailer->new();
+ $mail->{bcc} = $form->get_bcc_defaults($myconfig, $form->{bcc});
$mail->{from} = $myconfig->{email};
$mail->{to} = $ref->{recipient};
$mail->{subject} = $template->parse_block($ref->{email_subject});
$mail->{message} = $template->parse_block($ref->{email_body});
- if ($myconfig->{signature}) {
- $mail->{message} .= "\n-- \n$myconfig->{signature}";
- }
+ $mail->{message} .= $form->create_email_signature();
$mail->{message} =~ s/\r\n/\n/g;
# 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,
};
my ($self, $myconfig, $form) = @_;
# connect to database
- my $dbh = $form->dbconnect($myconfig);
+ my $dbh = SL::DB->client->dbh;
my $where;
my @values;
} elsif ($form->{customer}) {
$where .= qq| AND (ct.name ILIKE ?)|;
- push(@values, '%' . $form->{customer} . '%');
+ push(@values, like($form->{customer}));
}
my %columns = (
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}) {
$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 =
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,
cfg.dunning_description, cfg.dunning_level,
$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();
}
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)|;
} elsif ($form->{customer}) {
$where .= qq| AND (ct.name ILIKE ?)|;
- push(@values, '%' . $form->{customer} . '%');
+ push(@values, like($form->{customer}));
}
my %columns = (
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}) {
map { $ref->{$_} = $form->format_amount($myconfig, $ref->{$_}, 2)} qw(amount fee interest);
}
- $dbh->disconnect;
$main::lxdebug->leave_sub();
}
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;
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
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)
$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)
delete $form->{tmpfile};
push @{ $form->{DUNNING_PDFS} }, $filename;
- push @{ $form->{DUNNING_PDFS_EMAIL} }, { 'filename' => "${spool}/$filename",
- 'name' => "dunning_${dunning_id}.pdf" };
+ push @{ $form->{DUNNING_PDFS_EMAIL} }, { 'path' => "${spool}/$filename",
+ 'name' => $form->get_formname_translation('dunning') . "_${dunning_id}.pdf" };
- $form->parse_template($myconfig);
+ $form->get_employee_data('prefix' => 'employee', 'id' => $form->{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();
}
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();
map { $form->{$_} = $ref->{$_} } keys %{ $ref };
$query = qq|SELECT * FROM employee WHERE login = ?|;
- $ref = selectfirst_hashref_query($form, $dbh, $query, $form->{login});
+ $ref = selectfirst_hashref_query($form, $dbh, $query, $::myconfig{login});
map { $form->{"employee_${_}"} = $ref->{$_} } keys %{ $ref };
$query = qq|SELECT * FROM acc_trans WHERE trans_id = ? ORDER BY acc_trans_id ASC|;
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);
push @{ $form->{DUNNING_PDFS_EMAIL} }, { 'filename' => "${spool}/$filename",
'name' => "dunning_invoice_${dunning_id}.pdf" };
- $dbh->disconnect() unless $provided_dbh;
-
$main::lxdebug->leave_sub();
}
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;
projects / kivitendo-erp.git / blobdiff