X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FForm.pm;h=444bfdcaac06b091b60f5fea3562108d47a245d3;hb=3ac9bdcaf2633da20fc12464eddc946417689b48;hp=a2e55b0cec92e2701aebf5e74b287174409c3a34;hpb=cb3f5922707cd737c275c00635410becf76eb4a3;p=kivitendo-erp.git
diff --git a/SL/Form.pm b/SL/Form.pm
index a2e55b0ce..444bfdcaa 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -146,7 +146,7 @@ sub new {
$self->{action} = lc $self->{action};
$self->{action} =~ s/( |-|,|\#)/_/g;
- $self->{version} = "2.4.0";
+ $self->{version} = "2.4.1";
$main::lxdebug->leave_sub();
@@ -349,7 +349,7 @@ sub isblank {
sub header {
$main::lxdebug->enter_sub();
- my ($self) = @_;
+ my ($self, $extra_code) = @_;
if ($self->{header}) {
$main::lxdebug->leave_sub();
@@ -366,6 +366,8 @@ sub header {
|;
}
+ $self->{favicon} = "favicon.ico" unless $self->{favicon};
+
if ($self->{favicon} && (-f "$self->{favicon}")) {
$favicon =
qq|
@@ -407,7 +409,7 @@ function fokus(){document.$self->{fokus}.focus();}
($self->{title})
? "$self->{title} - $self->{titlebar}"
: $self->{titlebar};
- $ajax = "";
+ my $ajax = "";
foreach $item (@ { $self->{AJAX} }) {
$ajax .= $item->show_javascript();
}
@@ -437,6 +439,7 @@ function fokus(){document.$self->{fokus}.focus();}
+ $extra_code
|;
@@ -573,31 +576,19 @@ sub write_trigger {
# set dateform for jsscript
# default
- $ifFormat = "%d.%m.%Y";
- if ($myconfig->{dateformat} eq "dd.mm.yy") {
- $ifFormat = "%d.%m.%Y";
- } else {
- if ($myconfig->{dateformat} eq "dd-mm-yy") {
- $ifFormat = "%d-%m-%Y";
- } else {
- if ($myconfig->{dateformat} eq "dd/mm/yy") {
- $ifFormat = "%d/%m/%Y";
- } else {
- if ($myconfig->{dateformat} eq "mm/dd/yy") {
- $ifFormat = "%m/%d/%Y";
- } else {
- if ($myconfig->{dateformat} eq "mm-dd-yy") {
- $ifFormat = "%m-%d-%Y";
- } else {
- if ($myconfig->{dateformat} eq "yyyy-mm-dd") {
- $ifFormat = "%Y-%m-%d";
- }
- }
- }
- }
- }
- }
+ my %dateformats = (
+ "dd.mm.yy" => "%d.%m.%Y",
+ "dd-mm-yy" => "%d-%m-%Y",
+ "dd/mm/yy" => "%d/%m/%Y",
+ "mm/dd/yy" => "%m/%d/%Y",
+ "mm-dd-yy" => "%m-%d-%Y",
+ "yyyy-mm-dd" => "%Y-%m-%d",
+ );
+
+ my $ifFormat = defined($dateformats{$myconfig{"dateformat"}}) ?
+ $dateformats{$myconfig{"dateformat"}} : "%d.%m.%Y";
+ my @triggers;
while ($#_ >= 2) {
push @triggers, qq|
Calendar.setup(
@@ -773,9 +764,11 @@ sub parse_template {
$self->{"notes"} = $self->{ $self->{"formname"} . "notes" };
map({ $self->{"employee_${_}"} = $myconfig->{$_}; }
- qw(email tel fax name signature company address businessnumber));
+ qw(email tel fax name signature company address businessnumber
+ co_ustid taxnumber duns));
map({ $self->{"employee_${_}"} =~ s/\\n/\n/g; }
qw(company address signature));
+ map({ $self->{$_} =~ s/\\n/\n/g; } qw(company address signature));
$self->{copies} = 1 if (($self->{copies} *= 1) <= 0);
@@ -835,7 +828,12 @@ sub parse_template {
} else {
- @{ $mail->{attachments} } = ($self->{tmpfile}) unless ($form->{do_not_attach});
+ if (!$self->{"do_not_attach"}) {
+ @{ $mail->{attachments} } =
+ ({ "filename" => $self->{"tmpfile"},
+ "name" => $self->{"attachment_filename"} ?
+ $self->{"attachment_filename"} : $self->{"tmpfile"} });
+ }
$mail->{message} =~ s/\r\n/\n/g;
$myconfig->{signature} =~ s/\\n/\n/g;
@@ -864,10 +862,10 @@ sub parse_template {
open(OUT, $self->{OUT})
or $self->error($self->cleanup . "$self->{OUT} : $!");
} else {
-
+ $self->{attachment_filename} = $self->{tmpfile} if ($self->{attachment_filename} eq '');
# launch application
print qq|Content-Type: | . $template->get_mime_type() . qq|
-Content-Disposition: attachment; filename="$self->{tmpfile}"
+Content-Disposition: attachment; filename="$self->{attachment_filename}"
Content-Length: $numbytes
|;
@@ -1132,6 +1130,14 @@ sub set_payment_options {
($self->{terms_netto}, $self->{terms_skonto}, $self->{percent_skonto}, $self->{payment_terms}) = $sth->fetchrow_array;
+ if ($transdate eq "") {
+ if ($self->{invdate}) {
+ $transdate = $self->{invdate};
+ } else {
+ $transdate = $self->{transdate};
+ }
+ }
+
$sth->finish;
my $query = qq|SELECT date '$transdate' + $self->{terms_netto} AS netto_date,date '$transdate' + $self->{terms_skonto} AS skonto_date FROM payment_terms
LIMIT 1|;
@@ -1140,7 +1146,9 @@ sub set_payment_options {
($self->{netto_date}, $self->{skonto_date}) = $sth->fetchrow_array;
$sth->finish;
- $self->{skonto_amount} = $self->format_amount($myconfig, ($self->parse_amount($myconfig, $self->{subtotal}) * $self->{percent_skonto}), 2);
+ my $total = ($self->{invtotal}) ? $self->{invtotal} : $self->{ordtotal};
+
+ $self->{skonto_amount} = $self->format_amount($myconfig, ($self->parse_amount($myconfig, $total) * $self->{percent_skonto}), 2);
$self->{payment_terms} =~ s/<%netto_date%>/$self->{netto_date}/g;
$self->{payment_terms} =~ s/<%skonto_date%>/$self->{skonto_date}/g;
@@ -1258,7 +1266,7 @@ sub get_shipto {
my $sth = $dbh->prepare($query);
$sth->execute || $self->dberror($query);
$ref = $sth->fetchrow_hashref(NAME_lc);
- map { $form->{$_} = $ref->{$_} } keys %$ref;
+ map { $self->{$_} = $ref->{$_} } keys %$ref;
$sth->finish;
$dbh->disconnect;
}
@@ -1531,7 +1539,7 @@ sub all_vc {
FROM language
ORDER BY 1|;
$sth = $dbh->prepare($query);
- $sth->execute || $form->dberror($query);
+ $sth->execute || $self->dberror($query);
while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
push @{ $self->{languages} }, $ref;
@@ -1543,7 +1551,7 @@ sub all_vc {
FROM printers
ORDER BY 1|;
$sth = $dbh->prepare($query);
- $sth->execute || $form->dberror($query);
+ $sth->execute || $self->dberror($query);
while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
push @{ $self->{printers} }, $ref;
@@ -1554,9 +1562,9 @@ sub all_vc {
# get payment terms
$query = qq|SELECT id, description
FROM payment_terms
- ORDER BY 1|;
+ ORDER BY sortkey|;
$sth = $dbh->prepare($query);
- $sth->execute || $form->dberror($query);
+ $sth->execute || $self->dberror($query);
while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
push @{ $self->{payment_terms} }, $ref;
@@ -1582,7 +1590,7 @@ sub language_payment {
FROM language
ORDER BY 1|;
my $sth = $dbh->prepare($query);
- $sth->execute || $form->dberror($query);
+ $sth->execute || $self->dberror($query);
while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
push @{ $self->{languages} }, $ref;
@@ -1594,7 +1602,7 @@ sub language_payment {
FROM printers
ORDER BY 1|;
$sth = $dbh->prepare($query);
- $sth->execute || $form->dberror($query);
+ $sth->execute || $self->dberror($query);
while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
push @{ $self->{printers} }, $ref;
@@ -1604,9 +1612,9 @@ sub language_payment {
# get payment terms
$query = qq|SELECT id, description
FROM payment_terms
- ORDER BY 1|;
+ ORDER BY sortkey|;
$sth = $dbh->prepare($query);
- $sth->execute || $form->dberror($query);
+ $sth->execute || $self->dberror($query);
while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
push @{ $self->{payment_terms} }, $ref;
@@ -1617,7 +1625,7 @@ sub language_payment {
$query = qq|SELECT id, description
FROM buchungsgruppen|;
$sth = $dbh->prepare($query);
- $sth->execute || $form->dberror($query);
+ $sth->execute || $self->dberror($query);
$self->{BUCHUNGSGRUPPEN} = [];
while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
@@ -1730,7 +1738,7 @@ sub create_links {
$query = qq|SELECT id, description
FROM tax_zones|;
$sth = $dbh->prepare($query);
- $sth->execute || $form->dberror($query);
+ $sth->execute || $self->dberror($query);
while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
@@ -2399,204 +2407,52 @@ sub audittrail {
}
-package Locale;
-
-sub new {
- $main::lxdebug->enter_sub();
-
- my ($type, $country, $NLS_file) = @_;
- my $self = {};
-
- if ($country && -d "locale/$country") {
- local *IN;
- $self->{countrycode} = $country;
- if (open(IN, "locale/$country/$NLS_file")) {
- my $code = join("", );
- eval($code);
- close(IN);
- }
- }
-
- $self->{NLS_file} = $NLS_file;
-
- push @{ $self->{LONG_MONTH} },
- ("January", "February", "March", "April",
- "May ", "June", "July", "August",
- "September", "October", "November", "December");
- push @{ $self->{SHORT_MONTH} },
- (qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec));
-
- $main::lxdebug->leave_sub();
-
- bless $self, $type;
-}
-
-sub text {
- my ($self, $text) = @_;
-
- return (exists $self->{texts}{$text}) ? $self->{texts}{$text} : $text;
-}
-
-sub findsub {
- $main::lxdebug->enter_sub();
-
- my ($self, $text) = @_;
-
- if (exists $self->{subs}{$text}) {
- $text = $self->{subs}{$text};
- } else {
- if ($self->{countrycode} && $self->{NLS_file}) {
- Form->error(
- "$text not defined in locale/$self->{countrycode}/$self->{NLS_file}");
- }
- }
-
- $main::lxdebug->leave_sub();
- return $text;
-}
+sub all_years {
+# usage $form->all_years($myconfig, [$dbh])
+# return list of all years where bookings found
+# (@all_years)
-sub date {
$main::lxdebug->enter_sub();
- my ($self, $myconfig, $date, $longformat) = @_;
-
- my $longdate = "";
- my $longmonth = ($longformat) ? 'LONG_MONTH' : 'SHORT_MONTH';
-
- if ($date) {
-
- # get separator
- $spc = $myconfig->{dateformat};
- $spc =~ s/\w//g;
- $spc = substr($spc, 1, 1);
-
- if ($date =~ /\D/) {
- if ($myconfig->{dateformat} =~ /^yy/) {
- ($yy, $mm, $dd) = split /\D/, $date;
- }
- if ($myconfig->{dateformat} =~ /^mm/) {
- ($mm, $dd, $yy) = split /\D/, $date;
- }
- if ($myconfig->{dateformat} =~ /^dd/) {
- ($dd, $mm, $yy) = split /\D/, $date;
- }
- } else {
- $date = substr($date, 2);
- ($yy, $mm, $dd) = ($date =~ /(..)(..)(..)/);
- }
-
- $dd *= 1;
- $mm--;
- $yy = ($yy < 70) ? $yy + 2000 : $yy;
- $yy = ($yy >= 70 && $yy <= 99) ? $yy + 1900 : $yy;
-
- if ($myconfig->{dateformat} =~ /^dd/) {
- if (defined $longformat && $longformat == 0) {
- $mm++;
- $dd = "0$dd" if ($dd < 10);
- $mm = "0$mm" if ($mm < 10);
- $longdate = "$dd$spc$mm$spc$yy";
- } else {
- $longdate = "$dd";
- $longdate .= ($spc eq '.') ? ". " : " ";
- $longdate .= &text($self, $self->{$longmonth}[$mm]) . " $yy";
- }
- } elsif ($myconfig->{dateformat} eq "yyyy-mm-dd") {
-
- # Use German syntax with the ISO date style "yyyy-mm-dd" because
- # Lx-Office is mainly used in Germany or German speaking countries.
- if (defined $longformat && $longformat == 0) {
- $mm++;
- $dd = "0$dd" if ($dd < 10);
- $mm = "0$mm" if ($mm < 10);
- $longdate = "$yy-$mm-$dd";
- } else {
- $longdate = "$dd. ";
- $longdate .= &text($self, $self->{$longmonth}[$mm]) . " $yy";
- }
- } else {
- if (defined $longformat && $longformat == 0) {
- $mm++;
- $dd = "0$dd" if ($dd < 10);
- $mm = "0$mm" if ($mm < 10);
- $longdate = "$mm$spc$dd$spc$yy";
- } else {
- $longdate = &text($self, $self->{$longmonth}[$mm]) . " $dd, $yy";
- }
- }
-
+ my ($self, $myconfig, $dbh) = @_;
+
+ my $disconnect = 0;
+ if (! $dbh) {
+ $dbh = $self->dbconnect($myconfig);
+ $disconnect = 1;
}
-
- $main::lxdebug->leave_sub();
-
- return $longdate;
-}
-
-sub parse_date {
- $main::lxdebug->enter_sub();
-
- my ($self, $myconfig, $date, $longformat) = @_;
-
- unless ($date) {
- $main::lxdebug->leave_sub();
- return ();
+
+ # get years
+ my $query = qq|SELECT (SELECT MIN(transdate) FROM acc_trans),
+ (SELECT MAX(transdate) FROM acc_trans)
+ FROM defaults|;
+ my ($startdate, $enddate) = $dbh->selectrow_array($query);
+
+ if ($myconfig->{dateformat} =~ /^yy/) {
+ ($startdate) = split /\W/, $startdate;
+ ($enddate) = split /\W/, $enddate;
+ } else {
+ (@_) = split /\W/, $startdate;
+ $startdate = $_[2];
+ (@_) = split /\W/, $enddate;
+ $enddate = $_[2];
+ }
+
+ my @all_years;
+ $startdate = substr($startdate,0,4);
+ $enddate = substr($enddate,0,4);
+
+ while ($enddate >= $startdate) {
+ push @all_years, $enddate--;
}
- # get separator
- $spc = $myconfig->{dateformat};
- $spc =~ s/\w//g;
- $spc = substr($spc, 1, 1);
-
- if ($date =~ /\D/) {
- if ($myconfig->{dateformat} =~ /^yy/) {
- ($yy, $mm, $dd) = split /\D/, $date;
- } elsif ($myconfig->{dateformat} =~ /^mm/) {
- ($mm, $dd, $yy) = split /\D/, $date;
- } elsif ($myconfig->{dateformat} =~ /^dd/) {
- ($dd, $mm, $yy) = split /\D/, $date;
- }
- } else {
- $date = substr($date, 2);
- ($yy, $mm, $dd) = ($date =~ /(..)(..)(..)/);
- }
+ $dbh->disconnect if $disconnect;
- $dd *= 1;
- $mm *= 1;
- $yy = ($yy < 70) ? $yy + 2000 : $yy;
- $yy = ($yy >= 70 && $yy <= 99) ? $yy + 1900 : $yy;
+ return @all_years;
$main::lxdebug->leave_sub();
- return ($yy, $mm, $dd);
}
-sub reformat_date {
- $main::lxdebug->enter_sub();
-
- my ($self, $myconfig, $date, $output_format, $longformat) = @_;
-
- $main::lxdebug->leave_sub() and return "" unless ($date);
-
- my ($yy, $mm, $dd) = $self->parse_date($myconfig, $date);
-
- $output_format =~ /d+/;
- substr($output_format, $-[0], $+[0] - $-[0]) =
- sprintf("%0" . (length($&)) . "d", $dd);
-
- $output_format =~ /m+/;
- substr($output_format, $-[0], $+[0] - $-[0]) =
- sprintf("%0" . (length($&)) . "d", $mm);
-
- $output_format =~ /y+/;
- if (length($&) == 2) {
- $yy -= $yy >= 2000 ? 2000 : 1900;
- }
- substr($output_format, $-[0], $+[0] - $-[0]) =
- sprintf("%0" . (length($&)) . "d", $yy);
-
- $main::lxdebug->leave_sub();
-
- return $output_format;
-}
1;