X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FForm.pm;h=636eacd9801f0dadfdb5126ec5c09804c7a7a611;hb=a805ddafe2970ba5c07a59d90749fa0c7e24f903;hp=bf126cb55bd9c0f6ca5359a0232e1b83cc38c073;hpb=bca91008eddc6a1734a75fcd555f10d1c8ac65f6;p=kivitendo-erp.git
diff --git a/SL/Form.pm b/SL/Form.pm
index bf126cb55..636eacd98 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -47,6 +47,7 @@ use CGI;
use Cwd;
use Encode;
use File::Copy;
+use File::Temp ();
use IO::File;
use Math::BigInt;
use POSIX qw(strftime);
@@ -909,11 +910,18 @@ sub parse_template {
local (*IN, *OUT);
- my $defaults = SL::DB::Default->get;
- my $userspath = $::lx_office_conf{paths}->{userspath};
+ my $defaults = SL::DB::Default->get;
- $self->{"cwd"} = getcwd();
- $self->{"tmpdir"} = $self->{cwd} . "/${userspath}";
+ my $keep_temp_files = $::lx_office_conf{debug} && $::lx_office_conf{debug}->{keep_temp_files};
+ $self->{cwd} = getcwd();
+ my $temp_dir = File::Temp->newdir(
+ "kivitendo-print-XXXXXX",
+ DIR => $self->{cwd} . "/" . $::lx_office_conf{paths}->{userspath},
+ CLEANUP => !$keep_temp_files,
+ );
+
+ my $userspath = File::Spec->abs2rel($temp_dir->dirname);
+ $self->{tmpdir} = $temp_dir->dirname;
my $ext_for_format;
@@ -930,13 +938,6 @@ sub parse_template {
$template_type = 'HTML';
$ext_for_format = 'html';
- } elsif (($self->{"format"} =~ /xml/i) || (!$self->{"format"} && ($self->{"IN"} =~ /xml$/i))) {
- $template_type = 'XML';
- $ext_for_format = 'xml';
-
- } elsif ( $self->{"format"} =~ /elster(?:winston|taxbird)/i ) {
- $template_type = 'XML';
-
} elsif ( $self->{"format"} =~ /excel/i ) {
$template_type = 'Excel';
$ext_for_format = 'xls';
@@ -980,7 +981,6 @@ sub parse_template {
# OUT is used for the media, screen, printer, email
# for postscript we store a copy in a temporary file
- my $keep_temp_files = $::lx_office_conf{debug} && $::lx_office_conf{debug}->{keep_temp_files};
my ($temp_fh, $suffix);
$suffix = $self->{IN};
@@ -1119,8 +1119,8 @@ sub send_email {
if (($self->{format} eq 'html') && ($self->{sendmode} eq 'inline')) {
$mail->{content_type} = "text/html";
$mail->{message} =~ s/\r//g;
- $mail->{message} =~ s/\n/
\n/g;
- $full_signature =~ s/\n/
\n/g;
+ $mail->{message} =~ s{\n}{
\n}g;
+ $full_signature =~ s{\n}{
\n}g;
$mail->{message} .= $full_signature;
open(IN, "<", $self->{tmpfile})
@@ -1130,7 +1130,7 @@ sub send_email {
} elsif (($self->{attachment_policy} // '') ne 'no_file') {
my $attachment_name = $self->{attachment_filename} || $self->{tmpfile};
- $attachment_name =~ s/\.(.+?)$/.${ext_for_format}/ if ($ext_for_format);
+ $attachment_name =~ s{\.(.+?)$}{.${ext_for_format}} if ($ext_for_format);
if (($self->{attachment_policy} // '') eq 'old_file') {
my ( $attfile ) = SL::File->get_all(object_id => $self->{id},
@@ -1270,6 +1270,20 @@ sub get_formname_translation {
return $formname_translations{$formname};
}
+sub get_cusordnumber_translation {
+ $main::lxdebug->enter_sub();
+ my ($self, $formname) = @_;
+
+ $formname ||= $self->{formname};
+
+ $self->{recipient_locale} ||= Locale->lang_to_locale($self->{language});
+ local $::locale = Locale->new($self->{recipient_locale});
+
+
+ $main::lxdebug->leave_sub();
+ return $main::locale->text('Your Order');
+}
+
sub get_number_prefix_for_type {
$main::lxdebug->enter_sub();
my ($self) = @_;
@@ -1345,6 +1359,10 @@ sub generate_email_subject {
$subject .= " " . $self->{"${prefix}number"}
}
+ if ($self->{cusordnumber}) {
+ $subject = $self->get_cusordnumber_translation() . ' ' . $self->{cusordnumber} . ' / ' . $subject;
+ }
+
$main::lxdebug->leave_sub();
return $subject;
}
@@ -1372,8 +1390,11 @@ sub generate_email_body {
return undef unless $body;
- $body .= GenericTranslations->get(translation_type =>"salutation_punctuation_mark", language_id => $self->{language_id}) . "\n";
- $body .= GenericTranslations->get(translation_type =>"preset_text_$self->{formname}", language_id => $self->{language_id});
+ my $translation_type = $params{translation_type} // "preset_text_$self->{formname}";
+ my $main_body = GenericTranslations->get(translation_type => $translation_type, language_id => $self->{language_id});
+ $main_body = GenericTranslations->get(translation_type => $params{fallback_translation_type}, language_id => $self->{language_id}) if !$main_body && $params{fallback_translation_type};
+ $body .= GenericTranslations->get(translation_type => "salutation_punctuation_mark", language_id => $self->{language_id}) . "\n\n";
+ $body .= $main_body;
$body = $main::locale->unquote_special_chars('HTML', $body);
@@ -1895,10 +1916,10 @@ sub add_shipto {
shiptocountry = ?,
shiptogln = ?,
shiptocontact = ?,
- shiptocp_gender = ?,
shiptophone = ?,
shiptofax = ?,
shiptoemail = ?
+ shiptocp_gender = ?,
WHERE shipto_id = ?|;
do_query($self, $dbh, $query, @values, $self->{shipto_id});
} else {
@@ -1912,10 +1933,10 @@ sub add_shipto {
shiptocountry = ? AND
shiptogln = ? AND
shiptocontact = ? AND
- shiptocp_gender = ? AND
shiptophone = ? AND
shiptofax = ? AND
shiptoemail = ? AND
+ shiptocp_gender = ? AND
module = ? AND
trans_id = ?|;
my $insert_check = selectfirst_hashref_query($self, $dbh, $query, @values, $module, $id);
@@ -1923,7 +1944,7 @@ sub add_shipto {
my $insert_query =
qq|INSERT INTO shipto (trans_id, shiptoname, shiptodepartment_1, shiptodepartment_2,
shiptostreet, shiptozipcode, shiptocity, shiptocountry, shiptogln,
- shiptocontact, shiptocp_gender, shiptophone, shiptofax, shiptoemail, module)
+ shiptocontact, shiptophone, shiptofax, shiptoemail, shiptocp_gender, module)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
do_query($self, $dbh, $insert_query, $id, @values, $module);
@@ -2071,26 +2092,6 @@ sub _get_projects {
$main::lxdebug->leave_sub();
}
-sub _get_shipto {
- $main::lxdebug->enter_sub();
-
- my ($self, $dbh, $vc_id, $key) = @_;
-
- $key = "all_shipto" unless ($key);
-
- if ($vc_id) {
- # get shipping addresses
- my $query = qq|SELECT * FROM shipto WHERE trans_id = ?|;
-
- $self->{$key} = selectall_hashref_query($self, $dbh, $query, $vc_id);
-
- } else {
- $self->{$key} = [];
- }
-
- $main::lxdebug->leave_sub();
-}
-
sub _get_printers {
$main::lxdebug->enter_sub();
@@ -2130,36 +2131,6 @@ sub _get_charts {
$main::lxdebug->leave_sub();
}
-sub _get_taxcharts {
- $main::lxdebug->enter_sub();
-
- my ($self, $dbh, $params) = @_;
-
- my $key = "all_taxcharts";
- my @where;
-
- if (ref $params eq 'HASH') {
- $key = $params->{key} if ($params->{key});
- if ($params->{module} eq 'AR') {
- push @where, 'chart_categories ~ \'[ACILQ]\'';
-
- } elsif ($params->{module} eq 'AP') {
- push @where, 'chart_categories ~ \'[ACELQ]\'';
- }
-
- } elsif ($params) {
- $key = $params;
- }
-
- my $where = @where ? ' WHERE ' . join(' AND ', map { "($_)" } @where) : '';
-
- my $query = qq|SELECT * FROM tax $where ORDER BY taxkey, rate|;
-
- $self->{$key} = selectall_hashref_query($self, $dbh, $query);
-
- $main::lxdebug->leave_sub();
-}
-
sub _get_taxzones {
$main::lxdebug->enter_sub();
@@ -2373,31 +2344,19 @@ sub _get_simple {
$main::lxdebug->leave_sub();
}
-#sub _get_groups {
-# $main::lxdebug->enter_sub();
-#
-# my ($self, $dbh, $key) = @_;
-#
-# $key ||= "all_groups";
-#
-# my $groups = $main::auth->read_groups();
-#
-# $self->{$key} = selectall_hashref_query($self, $dbh, $query);
-#
-# $main::lxdebug->leave_sub();
-#}
-
sub get_lists {
$main::lxdebug->enter_sub();
my $self = shift;
my %params = @_;
+ croak "get_lists: shipto is no longer supported" if $params{shipto};
+
my $dbh = $self->get_standard_dbh(\%main::myconfig);
my ($sth, $query, $ref);
my ($vc, $vc_id);
- if ($params{contacts} || $params{shipto}) {
+ if ($params{contacts}) {
$vc = 'customer' if $self->{"vc"} eq "customer";
$vc = 'vendor' if $self->{"vc"} eq "vendor";
die "invalid use of get_lists, need 'vc'" unless $vc;
@@ -2408,10 +2367,6 @@ sub get_lists {
$self->_get_contacts($dbh, $vc_id, $params{"contacts"});
}
- if ($params{"shipto"}) {
- $self->_get_shipto($dbh, $vc_id, $params{"shipto"});
- }
-
if ($params{"projects"} || $params{"all_projects"}) {
$self->_get_projects($dbh, $params{"all_projects"} ?
$params{"all_projects"} : $params{"projects"},
@@ -2430,10 +2385,6 @@ sub get_lists {
$self->_get_charts($dbh, $params{"charts"});
}
- if ($params{"taxcharts"}) {
- $self->_get_taxcharts($dbh, $params{"taxcharts"});
- }
-
if ($params{"taxzones"}) {
$self->_get_taxzones($dbh, $params{"taxzones"});
}
@@ -2486,10 +2437,6 @@ sub get_lists {
$self->_get_warehouses($dbh, $params{warehouses});
}
-# if ($params{groups}) {
-# $self->_get_groups($dbh, $params{groups});
-# }
-
if ($params{partsgroup}) {
$self->get_partsgroup(\%main::myconfig, { all => 1, target => $params{partsgroup} });
}
@@ -2723,7 +2670,7 @@ sub create_links {
if ($self->{id}) {
$query =
qq|SELECT
- a.cp_id, a.invnumber, a.transdate, a.${table}_id, a.datepaid,
+ a.cp_id, a.invnumber, a.transdate, a.${table}_id, a.datepaid, a.deliverydate,
a.duedate, a.ordnumber, a.taxincluded, (SELECT cu.name FROM currencies cu WHERE cu.id=a.currency_id) AS currency, a.notes,
a.mtime, a.itime,
a.intnotes, a.department_id, a.amount AS oldinvtotal,
@@ -3339,19 +3286,6 @@ sub prepare_for_printing {
$self->{"employee_${_}"} = $defaults->$_ for qw(address businessnumber co_ustid company duns sepa_creditor_id taxnumber);
}
- # Load shipping address from database. If shipto_id is set then it's
- # one from the customer's/vendor's master data. Otherwise look an a
- # customized address linking back to the current record.
- my $shipto_module = $self->{type} =~ /_delivery_order$/ ? 'DO'
- : $self->{type} =~ /sales_order|sales_quotation|request_quotation|purchase_order/ ? 'OE'
- : 'AR';
- my $shipto = $self->{shipto_id} ? SL::DB::Shipto->new(shipto_id => $self->{shipto_id})->load
- : SL::DB::Manager::Shipto->get_first(where => [ module => $shipto_module, trans_id => $self->{id} ]);
- if ($shipto) {
- $self->{$_} = $shipto->$_ for grep { m{^shipto} } map { $_->name } @{ $shipto->meta->columns };
- $self->{"shiptocvar_" . $_->config->name} = $_->value_as_text for @{ $shipto->cvars_by_config };
- }
-
my $language = $self->{language} ? '_' . $self->{language} : '';
my ($language_tc, $output_numberformat, $output_dateformat, $output_longdates);