X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FForm.pm;h=6a1fa813cdd22c04255e7dcabceaa2426f0d07de;hb=a143b82a56e889cfda60c2d42fe7d0bdaf73aa83;hp=ef05c85915f62cd69847b32713d21dbb6c8a2756;hpb=060494201059a4fe80c3c220079f834e625ff83b;p=kivitendo-erp.git
diff --git a/SL/Form.pm b/SL/Form.pm
index ef05c8591..6a1fa813c 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -42,7 +42,9 @@ use Cwd;
use HTML::Template;
use SL::Template;
use CGI::Ajax;
+use SL::DBUtils;
use SL::Menu;
+use SL::User;
use CGI;
sub _input_to_hash {
@@ -146,7 +148,7 @@ sub new {
$self->{action} = lc $self->{action};
$self->{action} =~ s/( |-|,|\#)/_/g;
- $self->{version} = "2.4-RC2";
+ $self->{version} = "2.4.2";
$main::lxdebug->leave_sub();
@@ -349,7 +351,7 @@ sub isblank {
sub header {
$main::lxdebug->enter_sub();
- my ($self) = @_;
+ my ($self, $extra_code) = @_;
if ($self->{header}) {
$main::lxdebug->leave_sub();
@@ -366,6 +368,8 @@ sub header {
|;
}
+ $self->{favicon} = "favicon.ico" unless $self->{favicon};
+
if ($self->{favicon} && (-f "$self->{favicon}")) {
$favicon =
qq|
@@ -407,7 +411,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();
}
@@ -430,13 +434,14 @@ function fokus(){document.$self->{fokus}.focus();}
+ $extra_code
|;
@@ -573,31 +578,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(
@@ -661,7 +654,18 @@ sub format_amount {
}
my $neg = ($amount =~ s/-//);
- $amount = $self->round_amount($amount, $places) if ($places =~ /\d/);
+ if (defined($places) && ($places ne '')) {
+ if ($places < 0) {
+ $amount *= 1;
+ $places *= -1;
+
+ my ($actual_places) = ($amount =~ /\.(\d+)/);
+ $actual_places = length($actual_places);
+ $places = $actual_places > $places ? $actual_places : $places;
+ }
+
+ $amount = $self->round_amount($amount, $places);
+ }
my @d = map { s/\d//g; reverse split // } my $tmp = $myconfig->{numberformat}; # get delim chars
my @p = split(/\./, $amount); # split amount at decimal point
@@ -687,18 +691,6 @@ sub parse_amount {
my ($self, $myconfig, $amount) = @_;
- if ($myconfig->{in_numberformat} == 1) {
- # Extra input number format 1000.00 or 1000,00
- $amount =~ s/,/\./g;
- $amount = scalar reverse $amount;
- $amount =~ s/\./DOT/;
- $amount =~ s/\.//g;
- $amount =~ s/DOT/\./;
- $amount = scalar reverse $amount;
- $main::lxdebug->leave_sub(2);
- return ($amount * 1);
- }
-
if ( ($myconfig->{numberformat} eq '1.000,00')
|| ($myconfig->{numberformat} eq '1000,00')) {
$amount =~ s/\.//g;
@@ -754,20 +746,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}";
@@ -786,9 +795,6 @@ sub parse_template {
}
close(OUT);
-
- use Data::Dumper;
- #print(STDERR Dumper($self));
if ($template->uses_temp_file() || $self->{media} eq 'email') {
@@ -823,7 +829,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;
@@ -852,10 +863,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
|;
@@ -949,7 +960,7 @@ sub datetonum {
# Database routines used throughout
sub dbconnect {
- $main::lxdebug->enter_sub();
+ $main::lxdebug->enter_sub(2);
my ($self, $myconfig) = @_;
@@ -964,7 +975,7 @@ sub dbconnect {
$dbh->do($myconfig->{dboptions}) || $self->dberror($myconfig->{dboptions});
}
- $main::lxdebug->leave_sub();
+ $main::lxdebug->leave_sub(2);
return $dbh;
}
@@ -1082,7 +1093,7 @@ sub get_exchangerate {
unless ($transdate) {
$main::lxdebug->leave_sub();
- return "";
+ return 1;
}
my $query = qq|SELECT e.$fld FROM exchangerate e
@@ -1094,7 +1105,7 @@ sub get_exchangerate {
my ($exchangerate) = $sth->fetchrow_array;
$sth->finish;
- if ($exchangerate == 0) {
+ if (!$exchangerate) {
$exchangerate = 1;
}
@@ -1112,27 +1123,81 @@ sub set_payment_options {
my $dbh = $self->dbconnect($myconfig);
+ my $query =
+ qq|SELECT p.terms_netto, p.terms_skonto, p.percent_skonto, | .
+ qq|p.description_long | .
+ qq|FROM payment_terms p | .
+ qq|WHERE p.id = ?|;
- my $query = qq|SELECT p.terms_netto, p.terms_skonto, p.percent_skonto, p.description_long FROM payment_terms p
- WHERE p.id = $self->{payment_id}|;
- my $sth = $dbh->prepare($query);
- $sth->execute || $self->dberror($query);
-
- ($self->{terms_netto}, $self->{terms_skonto}, $self->{percent_skonto}, $self->{payment_terms}) = $sth->fetchrow_array;
+ ($self->{terms_netto}, $self->{terms_skonto}, $self->{percent_skonto},
+ $self->{payment_terms}) =
+ selectrow_query($self, $dbh, $query, $self->{payment_id});
- $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|;
- my $sth = $dbh->prepare($query);
- $sth->execute || $self->dberror($query);
- ($self->{netto_date}, $self->{skonto_date}) = $sth->fetchrow_array;
- $sth->finish;
+ if ($transdate eq "") {
+ if ($self->{invdate}) {
+ $transdate = $self->{invdate};
+ } else {
+ $transdate = $self->{transdate};
+ }
+ }
- $self->{skonto_amount} = $self->format_amount($myconfig, ($self->parse_amount($myconfig, $self->{subtotal}) * $self->{percent_skonto}), 2);
+ $query =
+ qq|SELECT date '$transdate' + $self->{terms_netto} AS netto_date, | .
+ qq|date '$transdate' + $self->{terms_skonto} AS skonto_date | .
+ qq|FROM payment_terms LIMIT 1|;
+ ($self->{netto_date}, $self->{skonto_date}) =
+ selectrow_query($self, $dbh, $query);
+
+ my $total = ($self->{invtotal}) ? $self->{invtotal} : $self->{ordtotal};
+ my $skonto_amount = $self->parse_amount($myconfig, $total) *
+ $self->{percent_skonto};
+
+ $self->{skonto_amount} =
+ $self->format_amount($myconfig, $skonto_amount, 2);
+
+ if ($self->{"language_id"}) {
+ $query =
+ qq|SELECT t.description_long, | .
+ qq|l.output_numberformat, l.output_dateformat, l.output_longdates | .
+ qq|FROM translation_payment_terms t | .
+ qq|LEFT JOIN language l ON t.language_id = l.id | .
+ qq|WHERE (t.language_id = ?) AND (t.payment_terms_id = ?)|;
+ my ($description_long, $output_numberformat, $output_dateformat,
+ $output_longdates) =
+ selectrow_query($self, $dbh, $query,
+ $self->{"language_id"}, $self->{"payment_id"});
+
+ $self->{payment_terms} = $description_long if ($description_long);
+
+ if ($output_dateformat) {
+ foreach my $key (qw(netto_date skonto_date)) {
+ $self->{$key} =
+ $main::locale->reformat_date($myconfig, $self->{$key},
+ $output_dateformat,
+ $output_longdates);
+ }
+ }
+
+ if ($output_numberformat &&
+ ($output_numberformat ne $myconfig->{"numberformat"})) {
+ my $saved_numberformat = $myconfig->{"numberformat"};
+ $myconfig->{"numberformat"} = $output_numberformat;
+ $self->{skonto_amount} =
+ $self->format_amount($myconfig, $skonto_amount, 2);
+ $myconfig->{"numberformat"} = $saved_numberformat;
+ }
+ }
$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;
}
@@ -1239,7 +1304,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;
}
@@ -1313,48 +1378,292 @@ sub get_employee {
$main::lxdebug->leave_sub();
}
-# get other contact for transaction and form - html/tex
-sub get_contact {
+sub get_salesman {
$main::lxdebug->enter_sub();
- my ($self, $dbh, $id) = @_;
+ my ($self, $myconfig, $salesman_id) = @_;
- my $query = qq|SELECT c.*
- FROM contacts c
- WHERE cp_id=$id|;
- $sth = $dbh->prepare($query);
- $sth->execute || $self->dberror($query);
+ my $dbh = $self->dbconnect($myconfig);
+
+ my ($login) =
+ selectrow_query($self, $dbh, qq|SELECT login FROM employee WHERE id = ?|,
+ $salesman_id);
+
+ if ($login) {
+ my $user = new User($main::memberfile, $login);
+ map({ $self->{"salesman_$_"} = $user->{$_}; }
+ qw(address businessnumber co_ustid company duns email fax name
+ taxnumber tel));
+ $self->{salesman_login} = $login;
+
+ $self->{salesman_name} = $login
+ if ($self->{salesman_name} eq "");
+
+ map({ $self->{"salesman_$_"} =~ s/\\n/\n/g; } qw(address company));
+ }
+
+ $dbh->disconnect();
- $ref = $sth->fetchrow_hashref(NAME_lc);
+ $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);
- push @{ $self->{$_} }, $ref;
+ ($self->{duedate}) = $sth->fetchrow_array;
$sth->finish;
+
$main::lxdebug->leave_sub();
}
# get contacts for id, if no contact return {"","","","",""}
-sub get_contacts {
+sub _get_contacts {
$main::lxdebug->enter_sub();
- my ($self, $dbh, $id) = @_;
+ my ($self, $dbh, $id, $key) = @_;
+
+ $key = "all_contacts" unless ($key);
+ $self->{$key} = [];
- my $query = qq|SELECT c.cp_id, c.cp_cv_id, c.cp_name, c.cp_givenname, c.cp_abteilung
- FROM contacts c
- WHERE cp_cv_id=$id|;
+ my $query =
+ qq|SELECT c.cp_id, c.cp_cv_id, c.cp_name, c.cp_givenname, c.cp_abteilung | .
+ qq|FROM contacts c | .
+ qq|WHERE cp_cv_id = ? | .
+ qq|ORDER BY lower(c.cp_name)|;
my $sth = $dbh->prepare($query);
- $sth->execute || $self->dberror($query);
+ $sth->execute($id) || $self->dberror($query . " ($id)");
my $i = 0;
while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
- push @{ $self->{all_contacts} }, $ref;
+ push @{ $self->{$key} }, $ref;
$i++;
}
if ($i == 0) {
- push @{ $self->{all_contacts} }, { { "", "", "", "", "", "" } };
+ push @{ $self->{$key} }, { { "", "", "", "", "", "" } };
+ }
+ $sth->finish;
+ $main::lxdebug->leave_sub();
+}
+
+sub _get_projects {
+ $main::lxdebug->enter_sub();
+
+ my ($self, $dbh, $key) = @_;
+
+ my ($all, $old_id, $where, @values);
+
+ if (ref($key) eq "HASH") {
+ my $params = $key;
+
+ $key = "ALL_PROJECTS";
+
+ foreach my $p (keys(%{$params})) {
+ if ($p eq "all") {
+ $all = $params->{$p};
+ } elsif ($p eq "old_id") {
+ $old_id = $params->{$p};
+ } elsif ($p eq "key") {
+ $key = $params->{$p};
+ }
+ }
+ }
+
+ if (!$all) {
+ $where = "WHERE active ";
+ if ($old_id) {
+ if (ref($old_id) eq "ARRAY") {
+ my @ids = grep({ $_ } @{$old_id});
+ if (@ids) {
+ $where .= " OR id IN (" . join(",", map({ "?" } @ids)) . ") ";
+ push(@values, @ids);
+ }
+ } else {
+ $where .= " OR (id = ?) ";
+ push(@values, $old_id);
+ }
+ }
+ }
+
+ my $query =
+ qq|SELECT id, projectnumber, description, active | .
+ qq|FROM project | .
+ $where .
+ qq|ORDER BY lower(projectnumber)|;
+ my $sth = $dbh->prepare($query);
+ $sth->execute(@values) ||
+ $self->dberror($query . " (" . join(", ", @values) . ")");
+
+ $self->{$key} = [];
+ while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+ push(@{ $self->{$key} }, $ref);
+ }
+
+ $sth->finish;
+ $main::lxdebug->leave_sub();
+}
+
+sub _get_shipto {
+ $main::lxdebug->enter_sub();
+
+ my ($self, $dbh, $vc_id, $key) = @_;
+
+ $key = "all_shipto" unless ($key);
+ $self->{$key} = [];
+
+ # get shipping addresses
+ my $query =
+ qq|SELECT s.shipto_id,s.shiptoname,s.shiptodepartment_1 | .
+ qq|FROM shipto s | .
+ qq|WHERE s.trans_id = ?|;
+ my $sth = $dbh->prepare($query);
+ $sth->execute($vc_id) || $self->dberror($query . " ($vc_id)");
+
+ while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+ push(@{ $self->{$key} }, $ref);
+ }
+ $sth->finish;
+
+ $main::lxdebug->leave_sub();
+}
+
+sub _get_printers {
+ $main::lxdebug->enter_sub();
+
+ my ($self, $dbh, $key) = @_;
+
+ $key = "all_printers" unless ($key);
+ $self->{$key} = [];
+
+ my $query = qq|SELECT id, printer_description, printer_command FROM printers|;
+ my $sth = $dbh->prepare($query);
+ $sth->execute() || $self->dberror($query);
+
+ while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+ push(@{ $self->{$key} }, $ref);
+ }
+ $sth->finish;
+
+ $main::lxdebug->leave_sub();
+}
+
+sub _get_charts {
+ $main::lxdebug->enter_sub();
+
+ my ($self, $dbh, $params) = @_;
+
+ $key = $params->{key};
+ $key = "all_charts" unless ($key);
+ $self->{$key} = [];
+
+ my $transdate = quote_db_date($params->{transdate});
+
+ my $query =
+ qq|SELECT c.accno, c.description, c.link, tk.taxkey_id, tk.tax_id | .
+ qq|FROM chart c | .
+ qq|LEFT JOIN taxkeys tk ON | .
+ qq|(tk.id = (SELECT id FROM taxkeys | .
+ qq| WHERE taxkeys.chart_id = c.id AND startdate <= $transdate | .
+ qq| ORDER BY startdate DESC LIMIT 1)) | .
+ qq|ORDER BY c.accno|;
+
+ my $sth = $dbh->prepare($query);
+ $sth->execute() || $self->dberror($query);
+
+ while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+ push(@{ $self->{$key} }, $ref);
+ }
+ $sth->finish;
+
+ $main::lxdebug->leave_sub();
+}
+
+sub _get_taxcharts {
+ $main::lxdebug->enter_sub();
+
+ my ($self, $dbh, $key) = @_;
+
+ $key = "all_taxcharts" unless ($key);
+ $self->{$key} = [];
+
+ my $query = qq|SELECT * FROM tax ORDER BY taxkey|;
+
+ my $sth = $dbh->prepare($query);
+ $sth->execute() || $self->dberror($query);
+
+ while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+ push(@{ $self->{$key} }, $ref);
}
$sth->finish;
+
+ $main::lxdebug->leave_sub();
+}
+
+sub _get_employees {
+ $main::lxdebug->enter_sub();
+
+ my ($self, $dbh, $key) = @_;
+
+ $key = "all_employees" unless ($key);
+ $self->{$key} =
+ selectall_hashref_query($self, $dbh, qq|SELECT * FROM employee|);
+
+ $main::lxdebug->leave_sub();
+}
+
+sub get_lists {
+ $main::lxdebug->enter_sub();
+
+ my $self = shift;
+ my %params = @_;
+
+ my $dbh = $self->dbconnect(\%main::myconfig);
+ my ($sth, $query, $ref);
+
+ my $vc = $self->{"vc"} eq "customer" ? "customer" : "vendor";
+ my $vc_id = $self->{"${vc}_id"};
+
+ if ($params{"contacts"}) {
+ $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"},
+ $params{"all_projects"} ? 1 : 0);
+ }
+
+ if ($params{"printers"}) {
+ $self->_get_printers($dbh, $params{"printers"});
+ }
+
+ if ($params{"charts"}) {
+ $self->_get_charts($dbh, $params{"charts"});
+ }
+
+ if ($params{"taxcharts"}) {
+ $self->_get_taxcharts($dbh, $params{"taxcharts"});
+ }
+
+ if ($params{"employees"}) {
+ $self->_get_employees($dbh, $params{"employees"});
+ }
+
+ $dbh->disconnect();
+
$main::lxdebug->leave_sub();
}
@@ -1428,7 +1737,7 @@ sub all_vc {
# build selection list
if ($count < $myconfig->{vclimit}) {
- $query = qq|SELECT id, name
+ $query = qq|SELECT id, name, salesman_id
FROM $table WHERE not obsolete
ORDER BY name|;
$sth = $dbh->prepare($query);
@@ -1494,7 +1803,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;
@@ -1506,7 +1815,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;
@@ -1517,9 +1826,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;
@@ -1529,7 +1838,6 @@ sub all_vc {
$main::lxdebug->leave_sub();
}
-
sub language_payment {
$main::lxdebug->enter_sub();
@@ -1545,7 +1853,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;
@@ -1557,7 +1865,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;
@@ -1567,9 +1875,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;
@@ -1580,7 +1888,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)) {
@@ -1647,12 +1955,14 @@ sub create_links {
# 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)
+ 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);
-
+
+ do_statement($form, $sth, $query);
+
$self->{accounts} = "";
while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
@@ -1675,43 +1985,17 @@ sub create_links {
}
# get taxkeys and description
- $query = qq|SELECT id, taxkey, taxdescription
- FROM tax|;
- $sth = $dbh->prepare($query);
- $sth->execute || $self->dberror($query);
-
- $ref = $sth->fetchrow_hashref(NAME_lc);
-
- while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
- push @{ $self->{TAXKEY} }, $ref;
- }
-
- $sth->finish;
-
+ $query = qq|SELECT id, taxkey, taxdescription FROM tax|;
+ $self->{TAXKEY} = selectall_hashref_query($form, $dbh, $query);
# get tax zones
- $query = qq|SELECT id, description
- FROM tax_zones|;
- $sth = $dbh->prepare($query);
- $sth->execute || $form->dberror($query);
-
-
- while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
- push @{ $self->{TAXZONE} }, $ref;
- }
- $sth->finish;
+ $query = qq|SELECT id, description FROM tax_zones|;
+ $self->{TAXZONE} = selectall_hashref_query($form, $dbh, $query);
if (($module eq "AP") || ($module eq "AR")) {
-
# get tax rates and description
$query = qq| SELECT * FROM tax t|;
- $sth = $dbh->prepare($query);
- $sth->execute || $self->dberror($query);
- $self->{TAX} = ();
- while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
- push @{ $self->{TAX} }, $ref;
- }
- $sth->finish;
+ $self->{TAX} = selectall_hashref_query($form, $dbh, $query);
}
if ($self->{id}) {
@@ -1729,7 +2013,7 @@ sub create_links {
LEFT JOIN department d ON (d.id = a.department_id)
WHERE a.id = $self->{id}|;
$sth = $dbh->prepare($query);
- $sth->execute || $self->dberror($query);
+ do_statement($form, $sth, $query);
$ref = $sth->fetchrow_hashref(NAME_lc);
foreach $key (keys %$ref) {
@@ -1744,13 +2028,30 @@ sub create_links {
}
# 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|;
-
+ $query = qq|
+ SELECT
+ c.accno,
+ c.description,
+ c.link,
+ c.taxkey_id,
+ tk.tax_id
+ FROM chart c
+ LEFT JOIN taxkeys tk ON (tk.chart_id = c.id)
+ WHERE
+ c.link LIKE ?
+ 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 <= ?
+ ORDER BY startdate desc LIMIT 1
+ )
+ ORDER BY c.accno|;
+
$sth = $dbh->prepare($query);
- $sth->execute || $self->dberror($query);
+ do_statement($form, $sth, $query, "%$module%", $transdate);
$self->{accounts} = "";
while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
@@ -1784,7 +2085,7 @@ sub create_links {
AND a.fx_transaction = '0'
ORDER BY a.oid,a.transdate|;
$sth = $dbh->prepare($query);
- $sth->execute || $self->dberror($query);
+ do_statement($form, $sth, $query);
my $fld = ($table eq 'customer') ? 'buy' : 'sell';
@@ -1818,7 +2119,7 @@ sub create_links {
WHERE d.fxloss_accno_id = c.id) AS fxloss_accno
FROM defaults d|;
$sth = $dbh->prepare($query);
- $sth->execute || $self->dberror($query);
+ do_statement($form, $sth, $query);
$ref = $sth->fetchrow_hashref(NAME_lc);
map { $self->{$_} = $ref->{$_} } keys %$ref;
@@ -1835,7 +2136,7 @@ sub create_links {
WHERE d.fxloss_accno_id = c.id) AS fxloss_accno
FROM defaults d|;
$sth = $dbh->prepare($query);
- $sth->execute || $self->dberror($query);
+ do_statement($form, $sth, $query);
$ref = $sth->fetchrow_hashref(NAME_lc);
map { $self->{$_} = $ref->{$_} } keys %$ref;
@@ -2049,6 +2350,83 @@ sub update_status {
$main::lxdebug->leave_sub();
}
+#--- 4 locale ---#
+# $main::locale->text('SAVED')
+# $main::locale->text('DELETED')
+# $main::locale->text('ADDED')
+# $main::locale->text('PAYMENT POSTED')
+# $main::locale->text('POSTED')
+# $main::locale->text('POSTED AS NEW')
+# $main::locale->text('ELSE')
+# $main::locale->text('SAVED FOR DUNNING')
+# $main::locale->text('DUNNING STARTED')
+# $main::locale->text('PRINTED')
+# $main::locale->text('MAILED')
+# $main::locale->text('SCREENED')
+# $main::locale->text('invoice')
+# $main::locale->text('proforma')
+# $main::locale->text('sales_order')
+# $main::locale->text('packing_list')
+# $main::locale->text('pick_list')
+# $main::locale->text('purchase_order')
+# $main::locale->text('bin_list')
+# $main::locale->text('sales_quotation')
+# $main::locale->text('request_quotation')
+
+sub save_history {
+ $main::lxdebug->enter_sub();
+
+ my $self = shift();
+ my $dbh = shift();
+
+ if(!exists $self->{employee_id}) {
+ &get_employee($self, $dbh);
+ }
+
+ my $query =
+ qq|INSERT INTO history_erp (trans_id, employee_id, addition, what_done) | .
+ qq|VALUES (?, ?, ?, ?)|;
+ my @values = (conv_i($self->{id}), conv_i($self->{employee_id}),
+ $self->{addition}, $self->{what_done});
+ do_query($self, $dbh, $query, @values);
+
+ $main::lxdebug->leave_sub();
+}
+
+sub get_history {
+ $main::lxdebug->enter_sub();
+
+ my $self = shift();
+ my $dbh = shift();
+ my $trans_id = shift();
+ my $restriction = shift();
+ my @tempArray;
+ my $i = 0;
+ if ($trans_id ne "") {
+ my $query =
+ qq|SELECT h.employee_id, h.itime::timestamp(0) AS itime, h.addition, h.what_done, emp.name | .
+ qq|FROM history_erp h | .
+ qq|LEFT JOIN employee emp | .
+ qq|ON emp.id = h.employee_id | .
+ qq|WHERE trans_id = ? |
+ . $restriction;
+
+ my $sth = $dbh->prepare($query) || $self->dberror($query);
+
+ $sth->execute($trans_id) || $self->dberror("$query ($trans_id)");
+
+ while(my $hash_ref = $sth->fetchrow_hashref()) {
+ $hash_ref->{addition} = $main::locale->text($hash_ref->{addition});
+ $hash_ref->{what_done} = $main::locale->text($hash_ref->{what_done});
+ $tempArray[$i++] = $hash_ref;
+ }
+ $main::lxdebug->leave_sub() and return \@tempArray
+ if ($i > 0 && $tempArray[0] ne "");
+ }
+ $main::lxdebug->leave_sub();
+ return 0;
+}
+
sub save_status {
$main::lxdebug->enter_sub();
@@ -2059,9 +2437,9 @@ sub save_status {
my $formnames = $self->{printed};
my $emailforms = $self->{emailed};
- my $query = qq|DELETE FROM status
- WHERE formname = '$self->{formname}'
- AND trans_id = $self->{id}|;
+ $query = qq|DELETE FROM status
+ WHERE formname = '$self->{formname}'
+ AND trans_id = $self->{id}|;
$dbh->do($query) || $self->dberror($query);
# this only applies to the forms
@@ -2109,9 +2487,14 @@ sub save_status {
sub update_defaults {
$main::lxdebug->enter_sub();
- my ($self, $myconfig, $fld) = @_;
+ my ($self, $myconfig, $fld, $provided_dbh) = @_;
- my $dbh = $self->dbconnect_noauto($myconfig);
+ my $dbh;
+ if ($provided_dbh) {
+ $dbh = $provided_dbh;
+ } else {
+ $dbh = $self->dbconnect_noauto($myconfig);
+ }
my $query = qq|SELECT $fld FROM defaults FOR UPDATE|;
my $sth = $dbh->prepare($query);
@@ -2125,8 +2508,10 @@ sub update_defaults {
SET $fld = '$var'|;
$dbh->do($query) || $self->dberror($query);
- $dbh->commit;
- $dbh->disconnect;
+ if (!$provided_dbh) {
+ $dbh->commit;
+ $dbh->disconnect;
+ }
$main::lxdebug->leave_sub();
@@ -2136,9 +2521,14 @@ sub update_defaults {
sub update_business {
$main::lxdebug->enter_sub();
- my ($self, $myconfig, $business_id) = @_;
+ my ($self, $myconfig, $business_id, $provided_dbh) = @_;
- my $dbh = $self->dbconnect_noauto($myconfig);
+ my $dbh;
+ if ($provided_dbh) {
+ $dbh = $provided_dbh;
+ } else {
+ $dbh = $self->dbconnect_noauto($myconfig);
+ }
my $query =
qq|SELECT customernumberinit FROM business WHERE id=$business_id FOR UPDATE|;
my $sth = $dbh->prepare($query);
@@ -2153,36 +2543,16 @@ sub update_business {
SET customernumberinit = '$var' WHERE id=$business_id|;
$dbh->do($query) || $self->dberror($query);
- $dbh->commit;
- $dbh->disconnect;
+ if (!$provided_dbh) {
+ $dbh->commit;
+ $dbh->disconnect;
+ }
$main::lxdebug->leave_sub();
return $var;
}
-sub get_salesman {
- $main::lxdebug->enter_sub();
-
- my ($self, $myconfig, $salesman) = @_;
-
- my $dbh = $self->dbconnect($myconfig);
- my $query =
- qq|SELECT id, name FROM customer WHERE (customernumber ilike '%$salesman%' OR name ilike '%$salesman%') AND business_id in (SELECT id from business WHERE salesman)|;
- my $sth = $dbh->prepare($query);
- $sth->execute || $self->dberror($query);
-
- my $i = 0;
- while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
- push(@{ $self->{salesman_list} }, $ref);
- $i++;
- }
- $dbh->commit;
- $main::lxdebug->leave_sub();
-
- return $i;
-}
-
sub get_partsgroup {
$main::lxdebug->enter_sub();
@@ -2362,175 +2732,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 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;