projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CustomerVendor: Redirect gefixt
[kivitendo-erp.git]
/
SL
/
DN.pm
diff --git
a/SL/DN.pm
b/SL/DN.pm
index
a960a4c
..
b64e48c
100644
(file)
--- a/
SL/DN.pm
+++ b/
SL/DN.pm
@@
-36,6
+36,7
@@
package DN;
use SL::Common;
use SL::DBUtils;
use SL::Common;
use SL::DBUtils;
+use SL::DB::Default;
use SL::GenericTranslations;
use SL::IS;
use SL::Mailer;
use SL::GenericTranslations;
use SL::IS;
use SL::Mailer;
@@
-208,7
+209,7
@@
sub create_invoice_for_fees {
$query =
qq|INSERT INTO ar (id, invnumber, transdate, gldate, customer_id,
taxincluded, amount, netamount, paid, duedate,
$query =
qq|INSERT INTO ar (id, invnumber, transdate, gldate, customer_id,
taxincluded, amount, netamount, paid, duedate,
- invoice, curr, notes,
+ invoice, curr
ency_id
, notes,
employee_id)
VALUES (
?, -- id
employee_id)
VALUES (
?, -- id
@@
-228,7
+229,7
@@
sub create_invoice_for_fees {
-- duedate:
(SELECT duedate FROM dunning WHERE dunning_id = ? LIMIT 1),
'f', -- invoice
-- duedate:
(SELECT duedate FROM dunning WHERE dunning_id = ? LIMIT 1),
'f', -- invoice
- (SELECT id FROM currencies WHERE
curr
= ?), -- curr
+ (SELECT id FROM currencies WHERE
name
= ?), -- curr
?, -- notes
-- employee_id:
(SELECT id FROM employee WHERE login = ?)
?, -- notes
-- employee_id:
(SELECT id FROM employee WHERE login = ?)
@@
-368,7
+369,6
@@
sub send_email {
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->{charset} = $::lx_office_conf{system}->{dbcharset} || Common::DEFAULT_CHARSET;
$mail->{from} = $myconfig->{email};
$mail->{to} = $ref->{recipient};
$mail->{subject} = $template->parse_block($ref->{email_subject});
$mail->{from} = $myconfig->{email};
$mail->{to} = $ref->{recipient};
$mail->{subject} = $template->parse_block($ref->{email_subject});
@@
-394,7
+394,9
@@
sub set_template_options {
my ($self, $myconfig, $form) = @_;
my ($self, $myconfig, $form) = @_;
- $form->{templates} = "$myconfig->{templates}";
+ my $defaults = SL::DB::Default->get;
+ $form->error($::locale->text('No print templates have been created for this client yet. Please do so in the client configuration.')) if !$defaults->templates;
+ $form->{templates} = $defaults->templates;
$form->{language} = $form->get_template_language($myconfig);
$form->{printer_code} = $form->get_printer_code($myconfig);
$form->{language} = $form->get_template_language($myconfig);
$form->{printer_code} = $form->get_printer_code($myconfig);
@@
-433,7
+435,7
@@
sub set_template_options {
$form->{IN} = undef;
for my $filename (@template_files) {
$form->{IN} = undef;
for my $filename (@template_files) {
- if (-f
"$form->{templates}/$filename"
) {
+ if (-f
($defaults->templates . "/$filename")
) {
$form->{IN} = $filename;
last;
}
$form->{IN} = $filename;
last;
}
@@
-761,7
+763,7
@@
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.
curr FROM currencies cu WHERE cu.id=ar.curr
) AS curr,
+ (SELECT cu.
name FROM currencies cu WHERE cu.id=ar.currency_id
) AS 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