X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FForm.pm;h=444bfdcaac06b091b60f5fea3562108d47a245d3;hb=3ac9bdcaf2633da20fc12464eddc946417689b48;hp=96d0adca049ac2028b4464115662a10611d3a216;hpb=11fb5cc4377b790ab7e9ea97d48e054fef7d10c1;p=kivitendo-erp.git
diff --git a/SL/Form.pm b/SL/Form.pm
index 96d0adca0..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.3.9";
+ $self->{version} = "2.4.1";
$main::lxdebug->leave_sub();
@@ -219,6 +219,25 @@ sub unquote {
}
+sub quote_html {
+ $main::lxdebug->enter_sub(2);
+
+ my ($self, $str) = @_;
+
+ my %replace =
+ ('order' => ['"', '<', '>'],
+ '<' => '<',
+ '>' => '>',
+ '"' => '"',
+ );
+
+ map({ $str =~ s/$_/$replace{$_}/g; } @{ $replace{"order"} });
+
+ $main::lxdebug->leave_sub(2);
+
+ return $str;
+}
+
sub hide_form {
my $self = shift;
@@ -330,7 +349,7 @@ sub isblank {
sub header {
$main::lxdebug->enter_sub();
- my ($self) = @_;
+ my ($self, $extra_code) = @_;
if ($self->{header}) {
$main::lxdebug->leave_sub();
@@ -347,6 +366,8 @@ sub header {
|;
}
+ $self->{favicon} = "favicon.ico" unless $self->{favicon};
+
if ($self->{favicon} && (-f "$self->{favicon}")) {
$favicon =
qq|
@@ -388,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();
}
@@ -404,6 +425,7 @@ function fokus(){document.$self->{fokus}.focus();}
$jsscript
$ajax
$fokus
+
@@ -417,6 +439,7 @@ function fokus(){document.$self->{fokus}.focus();}
+ $extra_code
|;
@@ -553,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(
@@ -635,24 +646,29 @@ sub format_amount {
$main::lxdebug->enter_sub(2);
my ($self, $myconfig, $amount, $places, $dash) = @_;
+
+ if ($amount eq "") {
+ $amount = 0;
+ }
my $neg = ($amount =~ s/-//);
$amount = $self->round_amount($amount, $places) if ($places =~ /\d/);
my @d = map { s/\d//g; reverse split // } my $tmp = $myconfig->{numberformat}; # get delim chars
- my @p = split /\./, $amount ; # split amount at decimal point
+ my @p = split(/\./, $amount); # split amount at decimal point
$p[0] =~ s/\B(?=(...)*$)/$d[1]/g if $d[1]; # add 1,000 delimiters
$amount = $p[0];
$amount .= $d[0].$p[1].(0 x ($places - length $p[1])) if ($places || $p[1] ne '');
-
+
$amount = do {
($dash =~ /-/) ? ($neg ? "($amount)" : "$amount" ) :
($dash =~ /DRCR/) ? ($neg ? "$amount DR" : "$amount CR" ) :
($neg ? "-$amount" : "$amount" ) ;
};
-
+
+
$main::lxdebug->leave_sub(2);
return $amount;
}
@@ -729,20 +745,37 @@ sub parse_template {
} elsif (($self->{"format"} =~ /html/i) ||
(!$self->{"format"} && ($self->{"IN"} =~ /html$/i))) {
$template = HTMLTemplate->new($self->{"IN"}, $self, $myconfig, $userspath);
+ } elsif (($self->{"format"} =~ /xml/i) ||
+ (!$self->{"format"} && ($self->{"IN"} =~ /xml$/i))) {
+ $template = XMLTemplate->new($self->{"IN"}, $self, $myconfig, $userspath);
+ } elsif ( $self->{"format"} =~ /elsterwinston/i ) {
+ $template = XMLTemplate->new($self->{"IN"}, $self, $myconfig, $userspath);
+ } elsif ( $self->{"format"} =~ /elstertaxbird/i ) {
+ $template = XMLTemplate->new($self->{"IN"}, $self, $myconfig, $userspath);
+ } elsif ( defined $self->{'format'}) {
+ $self->error("Outputformat not defined. This may be a future feature: $self->{'format'}");
+ } elsif ( $self->{'format'} eq '' ) {
+ $self->error("No Outputformat given: $self->{'format'}");
+ } else { #Catch the rest
+ $self->error("Outputformat not defined: $self->{'format'}");
}
# Copy the notes from the invoice/sales order etc. back to the variable "notes" because that is where most templates expect it to be.
$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);
# OUT is used for the media, screen, printer, email
# for postscript we store a copy in a temporary file
my $fileid = time;
- $self->{tmpfile} = "$userspath/${fileid}.$self->{IN}";
+ $self->{tmpfile} = "$userspath/${fileid}.$self->{IN}" if ( $self->{tmpfile} eq '' );
if ($template->uses_temp_file() || $self->{media} eq 'email') {
$out = $self->{OUT};
$self->{OUT} = ">$self->{tmpfile}";
@@ -761,9 +794,6 @@ sub parse_template {
}
close(OUT);
-
- use Data::Dumper;
- #print(STDERR Dumper($self));
if ($template->uses_temp_file() || $self->{media} eq 'email') {
@@ -798,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;
@@ -827,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
|;
@@ -1095,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|;
@@ -1103,11 +1146,20 @@ 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;
$self->{payment_terms} =~ s/<%skonto_amount%>/$self->{skonto_amount}/g;
+ $self->{payment_terms} =~ s/<%total%>/$self->{total}/g;
+ $self->{payment_terms} =~ s/<%invtotal%>/$self->{invtotal}/g;
+ $self->{payment_terms} =~ s/<%currency%>/$self->{currency}/g;
+ $self->{payment_terms} =~ s/<%terms_netto%>/$self->{terms_netto}/g;
+ $self->{payment_terms} =~ s/<%account_number%>/$self->{account_number}/g;
+ $self->{payment_terms} =~ s/<%bank%>/$self->{bank}/g;
+ $self->{payment_terms} =~ s/<%bank_code%>/$self->{bank_code}/g;
$dbh->disconnect;
}
@@ -1214,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;
}
@@ -1288,6 +1340,24 @@ sub get_employee {
$main::lxdebug->leave_sub();
}
+sub get_duedate {
+ $main::lxdebug->enter_sub();
+
+ my ($self, $myconfig) = @_;
+
+ my $dbh = $self->dbconnect($myconfig);
+ my $query = qq|SELECT current_date+terms_netto FROM payment_terms
+ WHERE id = '$self->{payment_id}'|;
+ my $sth = $dbh->prepare($query);
+ $sth->execute || $self->dberror($query);
+
+ ($self->{duedate}) = $sth->fetchrow_array;
+
+ $sth->finish;
+
+ $main::lxdebug->leave_sub();
+}
+
# get other contact for transaction and form - html/tex
sub get_contact {
$main::lxdebug->enter_sub();
@@ -1469,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;
@@ -1481,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;
@@ -1492,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;
@@ -1520,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;
@@ -1532,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;
@@ -1542,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;
@@ -1555,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)) {
@@ -1563,18 +1633,6 @@ sub language_payment {
}
$sth->finish;
- # get adr
- $query = qq|SELECT id, adr_description, adr_code
- FROM adr|;
- $sth = $dbh->prepare($query);
- $sth->execute || $form->dberror($query);
-
-
- $self->{ADR} = [];
- while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
- push @{ $self->{ADR} }, $ref;
- }
- $sth->finish;
$dbh->disconnect;
$main::lxdebug->leave_sub();
}
@@ -1622,40 +1680,47 @@ sub create_links {
my ($query, $sth);
my $dbh = $self->dbconnect($myconfig);
-
my %xkeyref = ();
- # now get the account numbers
- $query = qq|SELECT c.accno, c.description, c.link, c.taxkey_id
- FROM chart c
- WHERE c.link LIKE '%$module%'
- ORDER BY c.accno|;
-
- $sth = $dbh->prepare($query);
- $sth->execute || $self->dberror($query);
-
- $self->{accounts} = "";
- while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-
- foreach my $key (split /:/, $ref->{link}) {
- if ($key =~ /$module/) {
-
- # cross reference for keys
- $xkeyref{ $ref->{accno} } = $key;
-
- push @{ $self->{"${module}_links"}{$key} },
- { accno => $ref->{accno},
- description => $ref->{description},
- taxkey => $ref->{taxkey_id} };
+ if (!$self->{id}) {
- $self->{accounts} .= "$ref->{accno} " unless $key =~ /tax/;
+ my $transdate = "current_date";
+ if ($self->{transdate}) {
+ $transdate = qq|'$self->{transdate}'|;
+ }
+
+ # now get the account numbers
+ $query = qq|SELECT c.accno, c.description, c.link, c.taxkey_id, tk.tax_id
+ FROM chart c, taxkeys tk
+ WHERE c.link LIKE '%$module%' AND c.id=tk.chart_id AND tk.id = (SELECT id from taxkeys where taxkeys.chart_id =c.id AND startdate<=$transdate ORDER BY startdate desc LIMIT 1)
+ ORDER BY c.accno|;
+
+ $sth = $dbh->prepare($query);
+ $sth->execute || $self->dberror($query);
+
+ $self->{accounts} = "";
+ while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+
+ foreach my $key (split(/:/, $ref->{link})) {
+ if ($key =~ /$module/) {
+
+ # cross reference for keys
+ $xkeyref{ $ref->{accno} } = $key;
+
+ push @{ $self->{"${module}_links"}{$key} },
+ { accno => $ref->{accno},
+ description => $ref->{description},
+ taxkey => $ref->{taxkey_id},
+ tax_id => $ref->{tax_id} };
+
+ $self->{accounts} .= "$ref->{accno} " unless $key =~ /tax/;
+ }
}
}
}
- $sth->finish;
# get taxkeys and description
- $query = qq|SELECT taxkey, taxdescription
+ $query = qq|SELECT id, taxkey, taxdescription
FROM tax|;
$sth = $dbh->prepare($query);
$sth->execute || $self->dberror($query);
@@ -1673,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)) {
@@ -1717,14 +1782,50 @@ sub create_links {
}
$sth->finish;
+
+ my $transdate = "current_date";
+ if ($self->{transdate}) {
+ $transdate = qq|'$self->{transdate}'|;
+ }
+
+ # now get the account numbers
+ $query = qq|SELECT c.accno, c.description, c.link, c.taxkey_id, tk.tax_id
+ FROM chart c, taxkeys tk
+ WHERE c.link LIKE '%$module%' AND (((tk.chart_id=c.id) AND NOT(c.link like '%_tax%')) OR (NOT(tk.chart_id=c.id) AND (c.link like '%_tax%'))) AND (((tk.id = (SELECT id from taxkeys where taxkeys.chart_id =c.id AND startdate<=$transdate ORDER BY startdate desc LIMIT 1)) AND NOT(c.link like '%_tax%')) OR (c.link like '%_tax%'))
+ ORDER BY c.accno|;
+
+ $sth = $dbh->prepare($query);
+ $sth->execute || $self->dberror($query);
+
+ $self->{accounts} = "";
+ while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+
+ foreach my $key (split(/:/, $ref->{link})) {
+ if ($key =~ /$module/) {
+
+ # cross reference for keys
+ $xkeyref{ $ref->{accno} } = $key;
+
+ push @{ $self->{"${module}_links"}{$key} },
+ { accno => $ref->{accno},
+ description => $ref->{description},
+ taxkey => $ref->{taxkey_id},
+ tax_id => $ref->{tax_id} };
+
+ $self->{accounts} .= "$ref->{accno} " unless $key =~ /tax/;
+ }
+ }
+ }
+
+
# get amounts from individual entries
$query = qq|SELECT c.accno, c.description, a.source, a.amount, a.memo,
- a.transdate, a.cleared, a.project_id, p.projectnumber, a.taxkey, t.rate
+ a.transdate, a.cleared, a.project_id, p.projectnumber, a.taxkey, t.rate, t.id
FROM acc_trans a
JOIN chart c ON (c.id = a.chart_id)
LEFT JOIN project p ON (p.id = a.project_id)
- LEFT Join tax t ON (a.taxkey = t.taxkey)
- WHERE a.trans_id = $self->{id}
+ LEFT JOIN tax t ON (t.id=(SELECT tk.tax_id from taxkeys tk WHERE (tk.taxkey_id=a.taxkey) AND ((CASE WHEN a.chart_id IN (SELECT chart_id FROM taxkeys WHERE taxkey_id=a.taxkey) THEN tk.chart_id=a.chart_id ELSE 1=1 END) OR (c.link='%tax%')) AND startdate <=a.transdate ORDER BY startdate DESC LIMIT 1))
+ WHERE a.trans_id = $self->{id}
AND a.fx_transaction = '0'
ORDER BY a.oid,a.transdate|;
$sth = $dbh->prepare($query);
@@ -1753,8 +1854,8 @@ sub create_links {
push @{ $self->{acc_trans}{ $xkeyref{ $ref->{accno} } } }, $ref;
}
- $sth->finish;
+ $sth->finish;
$query = qq|SELECT d.curr AS currencies, d.closedto, d.revtrans,
(SELECT c.accno FROM chart c
WHERE d.fxgain_accno_id = c.id) AS fxgain_accno,
@@ -1788,7 +1889,7 @@ sub create_links {
if ($self->{"$self->{vc}_id"}) {
# only setup currency
- ($self->{currency}) = split /:/, $self->{currencies};
+ ($self->{currency}) = split(/:/, $self->{currencies});
} else {
@@ -1805,6 +1906,8 @@ sub create_links {
}
+ $sth->finish;
+
$dbh->disconnect;
$main::lxdebug->leave_sub();
@@ -2304,171 +2407,52 @@ sub audittrail {
}
-package Locale;
-
-sub new {
- $main::lxdebug->enter_sub();
-
- my ($type, $country, $NLS_file) = @_;
- my $self = {};
-
- %self = ();
- if ($country && -d "locale/$country") {
- $self->{countrycode} = $country;
- eval { require "locale/$country/$NLS_file"; };
- }
-
- $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 all_years {
+# usage $form->all_years($myconfig, [$dbh])
+# return list of all years where bookings found
+# (@all_years)
-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 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);
}
+
1;