X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=SL%2FForm.pm;h=50b2e025d68bb394de22840248ebd506b4dd602d;hb=ce47a2340ef118b494854deae1b0ddc74b1d1c5a;hp=74e7ff28eaab4dc55c5c675f8014d38d63626f2a;hpb=12c628c589ea4e0da1caf190416da08946c54636;p=kivitendo-erp.git
diff --git a/SL/Form.pm b/SL/Form.pm
index 74e7ff28e..50b2e025d 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -43,10 +43,21 @@ use HTML::Template;
use SL::Template;
use CGI::Ajax;
use SL::DBUtils;
+use SL::Mailer;
use SL::Menu;
use SL::User;
+use SL::Common;
use CGI;
+my $standard_dbh;
+
+sub DESTROY {
+ if ($standard_dbh) {
+ $standard_dbh->disconnect();
+ undef $standard_dbh;
+ }
+}
+
sub _input_to_hash {
$main::lxdebug->enter_sub(2);
@@ -68,61 +79,77 @@ sub _request_to_hash {
$main::lxdebug->enter_sub(2);
my ($input) = @_;
- my ($i, $loc, $key, $val);
- my (%ATTACH, $f, $header, $header_body, $len, $buf);
- my ($boundary, @list, $size, $body, $x, $blah, $name);
-
- if ($ENV{'CONTENT_TYPE'}
- && ($ENV{'CONTENT_TYPE'} =~ /multipart\/form-data; boundary=(.+)$/)) {
- $boundary = quotemeta('--' . $1);
- @list = split(/$boundary/, $input);
-
- # For some reason there are always 2 extra, that are empty
- $size = @list - 2;
-
- for ($x = 1; $x <= $size; $x++) {
- $header_body = $list[$x];
- $header_body =~ /\r\n\r\n|\n\n/;
-
- # Here we split the header and body
- $header = $`;
- $body = $'; #'
- $body =~ s/\r\n$//;
-
- # Now we try to get the file name
- $name = $header;
- $name =~ /name=\"(.+)\"/;
- ($name, $blah) = split(/\"/, $1);
-
- # If the form name is not attach, then we need to parse this like
- # regular form data
- if ($name ne "attach") {
- $body =~ s/%([0-9a-fA-Z]{2})/pack("c",hex($1))/eg;
- $ATTACH{$name} = $body;
-
- # Otherwise it is an attachment and we need to finish it up
- } elsif ($name eq "attach") {
- $header =~ /filename=\"(.+)\"/;
- $ATTACH{'FILE_NAME'} = $1;
- $ATTACH{'FILE_NAME'} =~ s/\"//g;
- $ATTACH{'FILE_NAME'} =~ s/\s//g;
- $ATTACH{'FILE_CONTENT'} = $body;
-
- for ($i = $x; $list[$i]; $i++) {
- $list[$i] =~ s/^.+name=$//;
- $list[$i] =~ /\"(\w+)\"/;
- $ATTACH{$1} = $'; #'
+
+ if (!$ENV{'CONTENT_TYPE'}
+ || ($ENV{'CONTENT_TYPE'} !~ /multipart\/form-data\s*;\s*boundary\s*=\s*(.+)$/)) {
+ $main::lxdebug->leave_sub(2);
+ return _input_to_hash($input);
+ }
+
+ my ($name, $filename, $headers_done, $content_type, $boundary_found, $need_cr);
+ my %params;
+
+ my $boundary = '--' . $1;
+
+ foreach my $line (split m/\n/, $input) {
+ last if (($line eq "${boundary}--") || ($line eq "${boundary}--\r"));
+
+ if (($line eq $boundary) || ($line eq "$boundary\r")) {
+ $params{$name} =~ s|\r?\n$|| if $name;
+
+ undef $name, $filename;
+
+ $headers_done = 0;
+ $content_type = "text/plain";
+ $boundary_found = 1;
+ $need_cr = 0;
+
+ next;
+ }
+
+ next unless $boundary_found;
+
+ if (!$headers_done) {
+ $line =~ s/[\r\n]*$//;
+
+ if (!$line) {
+ $headers_done = 1;
+ next;
+ }
+
+ if ($line =~ m|^content-disposition\s*:.*?form-data\s*;|i) {
+ if ($line =~ m|filename\s*=\s*"(.*?)"|i) {
+ $filename = $1;
+ substr $line, $-[0], $+[0] - $-[0], "";
+ }
+
+ if ($line =~ m|name\s*=\s*"(.*?)"|i) {
+ $name = $1;
+ substr $line, $-[0], $+[0] - $-[0], "";
}
+
+ $params{$name} = "";
+ $params{FILENAME} = $filename if ($filename);
+
+ next;
+ }
+
+ if ($line =~ m|^content-type\s*:\s*(.*?)$|i) {
+ $content_type = $1;
}
+
+ next;
}
- $main::lxdebug->leave_sub(2);
- return %ATTACH;
+ next unless $name;
- } else {
- $main::lxdebug->leave_sub(2);
- return _input_to_hash($input);
+ $params{$name} .= "${line}\n";
}
+
+ $params{$name} =~ s|\r?\n$|| if $name;
+
+ $main::lxdebug->leave_sub(2);
+ return %params;
}
sub new {
@@ -132,6 +159,11 @@ sub new {
my $self = {};
+ if ($LXDebug::watch_form) {
+ require SL::Watchdog;
+ tie %{ $self }, 'SL::Watchdog';
+ }
+
read(STDIN, $_, $ENV{CONTENT_LENGTH});
if ($ENV{QUERY_STRING}) {
@@ -252,6 +284,8 @@ sub hide_form {
sub error {
$main::lxdebug->enter_sub();
+ $main::lxdebug->show_backtrace();
+
my ($self, $msg) = @_;
if ($ENV{HTTP_USER_AGENT}) {
$msg =~ s/\n/
/g;
@@ -347,7 +381,7 @@ sub header {
return;
}
- my ($stylesheet, $favicon, $charset);
+ my ($stylesheet, $favicon);
if ($ENV{HTTP_USER_AGENT}) {
@@ -365,23 +399,15 @@ sub header {
|;
}
- if ($self->{charset}) {
- $charset =
- qq|
- |;
- }
+ my $db_charset = $main::dbcharset ? $main::dbcharset : Common::DEFAULT_CHARSET;
+
if ($self->{landscape}) {
$pagelayout = qq||;
}
- if ($self->{fokus}) {
- $fokus = qq||;
- }
+
+ my $fokus = qq| document.$self->{fokus}.focus();| if ($self->{"fokus"});
#Set Calendar
my $jsscript = "";
@@ -404,7 +430,7 @@ function fokus(){document.$self->{fokus}.focus();}
foreach $item (@ { $self->{AJAX} }) {
$ajax .= $item->show_javascript();
}
- print qq|Content-Type: text/html
+ print qq|Content-Type: text/html; charset=${db_charset};
$info|); die($info); @@ -499,9 +534,9 @@ sub parse_html_template { $additional_params->{"myconfig_jsc_dateformat"} = $jsc_dateformat; } - $additional_params->{"conf_jscalendar"} = $main::jscalendar; - $additional_params->{"conf_lizenzen"} = $main::lizenzen; - $additional_params->{"conf_latex_templates"} = $main::latex; + $additional_params->{"conf_webdav"} = $main::webdav; + $additional_params->{"conf_lizenzen"} = $main::lizenzen; + $additional_params->{"conf_latex_templates"} = $main::latex; $additional_params->{"conf_opendocument_templates"} = $main::opendocument_templates; my @additional_param_names = keys(%{$additional_params}); @@ -722,7 +757,9 @@ sub parse_template { $main::lxdebug->enter_sub(); my ($self, $myconfig, $userspath) = @_; - my $template; + my ($template, $out); + + local (*IN, *OUT); $self->{"cwd"} = getcwd(); $self->{"tmpdir"} = $self->{cwd} . "/${userspath}"; @@ -765,7 +802,19 @@ sub parse_template { # 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}" if ( $self->{tmpfile} eq '' ); + my $prepend_userspath; + + if (!$self->{tmpfile}) { + $self->{tmpfile} = "${fileid}.$self->{IN}"; + $prepend_userspath = 1; + } + + $prepend_userspath = 1 if substr($self->{tmpfile}, 0, length $userspath) eq $userspath; + + $self->{tmpfile} =~ s|.*/||; + $self->{tmpfile} =~ s/[^a-zA-Z0-9\._\ \-]//g; + $self->{tmpfile} = "$userspath/$self->{tmpfile}" if $prepend_userspath; + if ($template->uses_temp_file() || $self->{media} eq 'email') { $out = $self->{OUT}; $self->{OUT} = ">$self->{tmpfile}"; @@ -789,13 +838,12 @@ sub parse_template { if ($self->{media} eq 'email') { - use SL::Mailer; - my $mail = new Mailer; map { $mail->{$_} = $self->{$_} } - qw(cc bcc subject message version format charset); - $mail->{to} = qq|$self->{email}|; + qw(cc bcc subject message version format); + $mail->{charset} = $main::dbcharset ? $main::dbcharset : Common::DEFAULT_CHARSET; + $mail->{to} = $self->{EMAIL_RECIPIENT} ? $self->{EMAIL_RECIPIENT} : $self->{email}; $mail->{from} = qq|"$myconfig->{name}" <$myconfig->{email}>|; $mail->{fileid} = "$fileid."; $myconfig->{signature} =~ s/\\r\\n/\\n/g; @@ -831,7 +879,7 @@ sub parse_template { } - my $err = $mail->send($out); + my $err = $mail->send(); $self->error($self->cleanup . "$err") if ($err); } else { @@ -852,7 +900,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 ''); + $self->{attachment_filename} = ($self->{attachment_filename}) + ? $self->{attachment_filename} + : $self->generate_attachment_filename(); + # launch application print qq|Content-Type: | . $template->get_mime_type() . qq| Content-Disposition: attachment; filename="$self->{attachment_filename}" @@ -884,6 +935,48 @@ Content-Length: $numbytes $main::lxdebug->leave_sub(); } +sub generate_attachment_filename { + my ($self) = @_; + + my %formname_translations = ( + bin_list => $main::locale->text('Bin List'), + credit_note => $main::locale->text('Credit Note'), + invoice => $main::locale->text('Invoice'), + packing_list => $main::locale->text('Packing List'), + pick_list => $main::locale->text('Pick List'), + proforma => $main::locale->text('Proforma Invoice'), + purchase_order => $main::locale->text('Purchase Order'), + request_quotation => $main::locale->text('RFQ'), + sales_order => $main::locale->text('Confirmation'), + sales_quotation => $main::locale->text('Quotation'), + storno_invoice => $main::locale->text('Storno Invoice'), + storno_packing_list => $main::locale->text('Storno Packing List'), + ); + + my $attachment_filename = $formname_translations{$self->{"formname"}}; + my $prefix = + (grep { $self->{"type"} eq $_ } qw(invoice credit_note)) ? "inv" + : ($self->{"type"} =~ /_quotation$/) ? "quo" + : "ord"; + + if ($attachment_filename && $self->{"${prefix}number"}) { + $attachment_filename .= "_" . $self->{"${prefix}number"} + . ( $self->{format} =~ /pdf/i ? ".pdf" + : $self->{format} =~ /postscript/i ? ".ps" + : $self->{format} =~ /opendocument/i ? ".odt" + : $self->{format} =~ /html/i ? ".html" + : ""); + $attachment_filename =~ s/ /_/g; + my %umlaute = ( "ä" => "ae", "ö" => "oe", "ü" => "ue", + "Ä" => "Ae", "Ö" => "Oe", "Ü" => "Ue", "ß" => "ss"); + map { $attachment_filename =~ s/$_/$umlaute{$_}/g } keys %umlaute; + } else { + $attachment_filename = ""; + } + + return $attachment_filename; +} + sub cleanup { $main::lxdebug->enter_sub(); @@ -973,7 +1066,7 @@ sub dbconnect_noauto { $main::lxdebug->enter_sub(); my ($self, $myconfig) = @_; - + # connect to database $dbh = DBI->connect($myconfig->{dbconnect}, $myconfig->{dbuser}, @@ -990,6 +1083,18 @@ sub dbconnect_noauto { return $dbh; } +sub get_standard_dbh { + $main::lxdebug->enter_sub(2); + + my ($self, $myconfig) = @_; + + $standard_dbh ||= $self->dbconnect_noauto($myconfig); + + $main::lxdebug->leave_sub(2); + + return $standard_dbh; +} + sub update_balance { $main::lxdebug->enter_sub(); @@ -1109,7 +1214,10 @@ sub check_exchangerate { my $query = qq|SELECT e.$fld FROM exchangerate e WHERE e.curr = ? AND e.transdate = ?|; my ($exchangerate) = selectrow_query($self, $dbh, $query, $currency, $transdate); - $dbh->disconnect; + $dbh->disconnect(); + + $exchangerate = 1 if ($exchangerate == 0); + $exchangerate = 1 if ($exchangerate eq ""); $main::lxdebug->leave_sub(); @@ -1121,86 +1229,83 @@ sub set_payment_options { my ($self, $myconfig, $transdate) = @_; - if ($self->{payment_id}) { + return $main::lxdebug->leave_sub() unless ($self->{payment_id}); - my $dbh = $self->dbconnect($myconfig); + my $dbh = $self->get_standard_dbh($myconfig); - my $query = - qq|SELECT p.terms_netto, p.terms_skonto, p.percent_skonto, 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 | . + qq|FROM payment_terms p | . + qq|WHERE p.id = ?|; - ($self->{terms_netto}, $self->{terms_skonto}, $self->{percent_skonto}, - $self->{payment_terms}) = - selectrow_query($self, $dbh, $query, $self->{payment_id}); + ($self->{terms_netto}, $self->{terms_skonto}, $self->{percent_skonto}, + $self->{payment_terms}) = + selectrow_query($self, $dbh, $query, $self->{payment_id}); - if ($transdate eq "") { - if ($self->{invdate}) { - $transdate = $self->{invdate}; - } else { - $transdate = $self->{transdate}; - } + if ($transdate eq "") { + if ($self->{invdate}) { + $transdate = $self->{invdate}; + } else { + $transdate = $self->{transdate}; } + } - $query = - qq|SELECT ?::date + ?::integer AS netto_date, ?::date + ?::integer AS skonto_date | . - qq|FROM payment_terms|; - ($self->{netto_date}, $self->{skonto_date}) = - selectrow_query($self, $dbh, $query, $transdate, $self->{terms_netto}, $transdate, $self->{terms_skonto}); - - 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, 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); - } - } + $query = + qq|SELECT ?::date + ?::integer AS netto_date, ?::date + ?::integer AS skonto_date | . + qq|FROM payment_terms|; + ($self->{netto_date}, $self->{skonto_date}) = + selectrow_query($self, $dbh, $query, $transdate, $self->{terms_netto}, $transdate, $self->{terms_skonto}); + + my $total = ($self->{invtotal}) ? $self->{invtotal} : $self->{ordtotal}; + my $skonto_amount = $self->parse_amount($myconfig, $total) * + $self->{percent_skonto}; - 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->{skonto_amount} = + $self->format_amount($myconfig, $skonto_amount, 2); + + if ($self->{"language_id"}) { + $query = + qq|SELECT t.description_long, 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); } } - $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; + 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; + $main::lxdebug->leave_sub(); } @@ -1213,10 +1318,9 @@ sub get_template_language { my $template_code = ""; if ($self->{language_id}) { - my $dbh = $self->dbconnect($myconfig); + my $dbh = $self->get_standard_dbh($myconfig); my $query = qq|SELECT template_code FROM language WHERE id = ?|; ($template_code) = selectrow_query($self, $dbh, $query, $self->{language_id}); - $dbh->disconnect; } $main::lxdebug->leave_sub(); @@ -1232,10 +1336,9 @@ sub get_printer_code { my $template_code = ""; if ($self->{printer_id}) { - my $dbh = $self->dbconnect($myconfig); + my $dbh = $self->get_standard_dbh($myconfig); my $query = qq|SELECT template_code, printer_command FROM printers WHERE id = ?|; ($template_code, $self->{printer_command}) = selectrow_query($self, $dbh, $query, $self->{printer_id}); - $dbh->disconnect; } $main::lxdebug->leave_sub(); @@ -1251,11 +1354,10 @@ sub get_shipto { my $template_code = ""; if ($self->{shipto_id}) { - my $dbh = $self->dbconnect($myconfig); + my $dbh = $self->get_standard_dbh($myconfig); my $query = qq|SELECT * FROM shipto WHERE shipto_id = ?|; my $ref = selectfirst_hashref_query($self, $dbh, $query, $self->{shipto_id}); map({ $self->{$_} = $ref->{$_} } keys(%$ref)); - $dbh->disconnect; } $main::lxdebug->leave_sub(); @@ -1312,7 +1414,7 @@ sub add_shipto { shiptocontact, shiptophone, shiptofax, shiptoemail, module) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|; do_query($self, $dbh, $query, $id, @values, $module); - } + } } } @@ -1325,8 +1427,8 @@ sub get_employee { my ($self, $dbh) = @_; my $query = qq|SELECT id, name FROM employee WHERE login = ?|; - ($self->{employee_id}, $self->{employee}) = selectrow_query($self, $dbh, $query, $self->{login}); - $self->{employee_id} *= 1; + ($self->{"employee_id"}, $self->{"employee"}) = selectrow_query($self, $dbh, $query, $self->{login}); + $self->{"employee_id"} *= 1; $main::lxdebug->leave_sub(); } @@ -1338,7 +1440,7 @@ sub get_salesman { $main::lxdebug->leave_sub() and return unless $salesman_id; - my $dbh = $self->dbconnect($myconfig); + my $dbh = $self->get_standard_dbh($myconfig); my ($login) = selectrow_query($self, $dbh, qq|SELECT login FROM employee WHERE id = ?|, @@ -1357,8 +1459,6 @@ sub get_salesman { map({ $self->{"salesman_$_"} =~ s/\\n/\n/g; } qw(address company)); } - $dbh->disconnect(); - $main::lxdebug->leave_sub(); } @@ -1367,10 +1467,9 @@ sub get_duedate { my ($self, $myconfig) = @_; - my $dbh = $self->dbconnect($myconfig); + my $dbh = $self->get_standard_dbh($myconfig); my $query = qq|SELECT current_date + terms_netto FROM payment_terms WHERE id = ?|; ($self->{duedate}) = selectrow_query($self, $dbh, $query, $self->{payment_id}); - $dbh->disconnect(); $main::lxdebug->leave_sub(); } @@ -1451,10 +1550,7 @@ sub _get_shipto { $key = "all_shipto" unless ($key); # get shipping addresses - my $query = - qq|SELECT shipto_id, shiptoname, shiptodepartment_1 | . - qq|FROM shipto | . - qq|WHERE trans_id = ?|; + my $query = qq|SELECT * FROM shipto WHERE trans_id = ?|; $self->{$key} = selectall_hashref_query($self, $dbh, $query, $vc_id); @@ -1468,7 +1564,7 @@ sub _get_printers { $key = "all_printers" unless ($key); - my $query = qq|SELECT id, printer_description, printer_command FROM printers|; + my $query = qq|SELECT id, printer_description, printer_command, template_code FROM printers|; $self->{$key} = selectall_hashref_query($self, $dbh, $query); @@ -1486,7 +1582,7 @@ sub _get_charts { my $transdate = quote_db_date($params->{transdate}); my $query = - qq|SELECT c.accno, c.description, c.link, tk.taxkey_id, tk.tax_id | . + qq|SELECT c.id, 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 | . @@ -1513,14 +1609,27 @@ sub _get_taxcharts { $main::lxdebug->leave_sub(); } -sub _get_employees { +sub _get_taxzones { $main::lxdebug->enter_sub(); my ($self, $dbh, $key) = @_; - $key = "all_employees" unless ($key); - $self->{$key} = - selectall_hashref_query($self, $dbh, qq|SELECT * FROM employee|); + $key = "all_taxzones" unless ($key); + + my $query = qq|SELECT * FROM tax_zones ORDER BY id|; + + $self->{$key} = selectall_hashref_query($self, $dbh, $query); + + $main::lxdebug->leave_sub(); +} + +sub _get_employees { + $main::lxdebug->enter_sub(); + + my ($self, $dbh, $default_key, $key) = @_; + + $key = $default_key unless ($key); + $self->{$key} = selectall_hashref_query($self, $dbh, qq|SELECT * FROM employee ORDER BY name|); $main::lxdebug->leave_sub(); } @@ -1537,13 +1646,111 @@ sub _get_business_types { $main::lxdebug->leave_sub(); } +sub _get_languages { + $main::lxdebug->enter_sub(); + + my ($self, $dbh, $key) = @_; + + $key = "all_languages" unless ($key); + + my $query = qq|SELECT * FROM language ORDER BY id|; + + $self->{$key} = selectall_hashref_query($self, $dbh, $query); + + $main::lxdebug->leave_sub(); +} + +sub _get_dunning_configs { + $main::lxdebug->enter_sub(); + + my ($self, $dbh, $key) = @_; + + $key = "all_dunning_configs" unless ($key); + + my $query = qq|SELECT * FROM dunning_config ORDER BY dunning_level|; + + $self->{$key} = selectall_hashref_query($self, $dbh, $query); + + $main::lxdebug->leave_sub(); +} + +sub _get_currencies { +$main::lxdebug->enter_sub(); + + my ($self, $dbh, $key) = @_; + + $key = "all_currencies" unless ($key); + + my $query = qq|SELECT curr AS currency FROM defaults|; + + $self->{$key} = [split(/\:/ , selectfirst_hashref_query($self, $dbh, $query)->{currency})]; + + $main::lxdebug->leave_sub(); +} + +sub _get_payments { +$main::lxdebug->enter_sub(); + + my ($self, $dbh, $key) = @_; + + $key = "all_payments" unless ($key); + + my $query = qq|SELECT * FROM payment_terms ORDER BY id|; + + $self->{$key} = selectall_hashref_query($self, $dbh, $query); + + $main::lxdebug->leave_sub(); +} + +sub _get_customers { + $main::lxdebug->enter_sub(); + + my ($self, $dbh, $key) = @_; + + $key = "all_customers" unless ($key); + + my $query = qq|SELECT * FROM customer WHERE NOT obsolete ORDER BY name|; + + $self->{$key} = selectall_hashref_query($self, $dbh, $query); + + $main::lxdebug->leave_sub(); +} + +sub _get_vendors { + $main::lxdebug->enter_sub(); + + my ($self, $dbh, $key) = @_; + + $key = "all_vendors" unless ($key); + + my $query = qq|SELECT * FROM vendor WHERE NOT obsolete ORDER BY name|; + + $self->{$key} = selectall_hashref_query($self, $dbh, $query); + + $main::lxdebug->leave_sub(); +} + +sub _get_departments { + $main::lxdebug->enter_sub(); + + my ($self, $dbh, $key) = @_; + + $key = "all_departments" unless ($key); + + my $query = qq|SELECT * FROM department ORDER BY description|; + + $self->{$key} = selectall_hashref_query($self, $dbh, $query); + + $main::lxdebug->leave_sub(); +} + sub get_lists { $main::lxdebug->enter_sub(); my $self = shift; my %params = @_; - my $dbh = $self->dbconnect(\%main::myconfig); + my $dbh = $self->get_standard_dbh(\%main::myconfig); my ($sth, $query, $ref); my $vc = $self->{"vc"} eq "customer" ? "customer" : "vendor"; @@ -1567,6 +1774,10 @@ sub get_lists { $self->_get_printers($dbh, $params{"printers"}); } + if ($params{"languages"}) { + $self->_get_languages($dbh, $params{"languages"}); + } + if ($params{"charts"}) { $self->_get_charts($dbh, $params{"charts"}); } @@ -1575,15 +1786,45 @@ sub get_lists { $self->_get_taxcharts($dbh, $params{"taxcharts"}); } + if ($params{"taxzones"}) { + $self->_get_taxzones($dbh, $params{"taxzones"}); + } + if ($params{"employees"}) { - $self->_get_employees($dbh, $params{"employees"}); + $self->_get_employees($dbh, "all_employees", $params{"employees"}); + } + + if ($params{"salesmen"}) { + $self->_get_employees($dbh, "all_salesmen", $params{"salesmen"}); } if ($params{"business_types"}) { $self->_get_business_types($dbh, $params{"business_types"}); } - $dbh->disconnect(); + if ($params{"dunning_configs"}) { + $self->_get_dunning_configs($dbh, $params{"dunning_configs"}); + } + + if($params{"currencies"}) { + $self->_get_currencies($dbh, $params{"currencies"}); + } + + if($params{"customers"}) { + $self->_get_customers($dbh, $params{"customers"}); + } + + if($params{"vendors"}) { + $self->_get_vendors($dbh, $params{"vendors"}); + } + + if($params{"payments"}) { + $self->_get_payments($dbh, $params{"payments"}); + } + + if($params{"departments"}) { + $self->_get_departments($dbh, $params{"departments"}); + } $main::lxdebug->leave_sub(); } @@ -1595,7 +1836,7 @@ sub get_name { my ($self, $myconfig, $table) = @_; # connect to database - my $dbh = $self->dbconnect($myconfig); + my $dbh = $self->get_standard_dbh($myconfig); $table = $table eq "customer" ? "customer" : "vendor"; my $arap = $self->{arap} eq "ar" ? "ar" : "ap"; @@ -1644,7 +1885,7 @@ sub all_vc { my ($self, $myconfig, $table, $module) = @_; my $ref; - my $dbh = $self->dbconnect($myconfig); + my $dbh = $self->get_standard_dbh($myconfig); $table = $table eq "customer" ? "customer" : "vendor"; @@ -1714,8 +1955,6 @@ sub all_vc { $self->{payment_terms} = selectall_hashref_query($self, $dbh, $query); - $dbh->disconnect; - $main::lxdebug->leave_sub(); } @@ -1724,7 +1963,7 @@ sub language_payment { my ($self, $myconfig) = @_; - my $dbh = $self->dbconnect($myconfig); + my $dbh = $self->get_standard_dbh($myconfig); # get languages my $query = qq|SELECT id, description FROM language @@ -1752,7 +1991,6 @@ sub language_payment { $self->{BUCHUNGSGRUPPEN} = selectall_hashref_query($self, $dbh, $query); - $dbh->disconnect; $main::lxdebug->leave_sub(); } @@ -1762,7 +2000,7 @@ sub all_departments { my ($self, $myconfig, $table) = @_; - my $dbh = $self->dbconnect($myconfig); + my $dbh = $self->get_standard_dbh($myconfig); my $where; if ($table eq 'customer') { @@ -1777,15 +2015,13 @@ sub all_departments { delete($self->{all_departments}) unless (@{ $self->{all_departments} }); - $dbh->disconnect; - $main::lxdebug->leave_sub(); } sub create_links { $main::lxdebug->enter_sub(); - my ($self, $module, $myconfig, $table) = @_; + my ($self, $module, $myconfig, $table, $provided_dbh) = @_; my ($fld, $arap); if ($table eq "customer") { @@ -1802,7 +2038,7 @@ sub create_links { # get last customers or vendors my ($query, $sth, $ref); - my $dbh = $self->dbconnect($myconfig); + my $dbh = $provided_dbh ? $provided_dbh : $self->get_standard_dbh($myconfig); my %xkeyref = (); if (!$self->{id}) { @@ -1821,7 +2057,7 @@ sub create_links { $sth = $dbh->prepare($query); - do_statement($form, $sth, $query, '%' . $module . '%'); + do_statement($self, $sth, $query, '%' . $module . '%'); $self->{accounts} = ""; while ($ref = $sth->fetchrow_hashref(NAME_lc)) { @@ -1846,16 +2082,12 @@ sub create_links { # get taxkeys and description $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|; - $self->{TAXZONE} = selectall_hashref_query($form, $dbh, $query); + $self->{TAXKEY} = selectall_hashref_query($self, $dbh, $query); if (($module eq "AP") || ($module eq "AR")) { # get tax rates and description $query = qq|SELECT * FROM tax|; - $self->{TAX} = selectall_hashref_query($form, $dbh, $query); + $self->{TAX} = selectall_hashref_query($self, $dbh, $query); } if ($self->{id}) { @@ -1885,17 +2117,16 @@ 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 - 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%') - 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.id = (SELECT id FROM taxkeys WHERE taxkeys.chart_id = c.id AND startdate <= $transdate ORDER BY startdate DESC LIMIT 1) + OR c.link LIKE '%_tax%') + ORDER BY c.accno|; $sth = $dbh->prepare($query); - do_statement($form, $sth, $query, "%" . $module . "%"); + do_statement($self, $sth, $query, "%$module%"); $self->{accounts} = ""; while ($ref = $sth->fetchrow_hashref(NAME_lc)) { @@ -1940,7 +2171,7 @@ sub create_links { AND a.fx_transaction = '0' ORDER BY a.oid, a.transdate|; $sth = $dbh->prepare($query); - do_statement($form, $sth, $query, $self->{id}); + do_statement($self, $sth, $query, $self->{id}); # get exchangerate for currency $self->{exchangerate} = @@ -2001,8 +2232,6 @@ sub create_links { } - $dbh->disconnect; - $main::lxdebug->leave_sub(); } @@ -2050,7 +2279,7 @@ sub current_date { my ($self, $myconfig, $thisdate, $days) = @_; - my $dbh = $self->dbconnect($myconfig); + my $dbh = $self->get_standard_dbh($myconfig); my $query; $days *= 1; @@ -2065,8 +2294,6 @@ sub current_date { ($thisdate) = selectrow_query($self, $dbh, $query); - $dbh->disconnect; - $main::lxdebug->leave_sub(); return $thisdate; @@ -2239,6 +2466,7 @@ sub save_status { # $main::locale->text('PRINTED') # $main::locale->text('MAILED') # $main::locale->text('SCREENED') +# $main::locale->text('CANCELED') # $main::locale->text('invoice') # $main::locale->text('proforma') # $main::locale->text('sales_order') @@ -2260,10 +2488,10 @@ sub save_history { } 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}); + qq|INSERT INTO history_erp (trans_id, employee_id, addition, what_done, snumbers) | . + qq|VALUES (?, (SELECT id FROM employee WHERE login = ?), ?, ?, ?)|; + my @values = (conv_i($self->{id}), $self->{login}, + $self->{addition}, $self->{what_done}, "$self->{snumbers}"); do_query($self, $dbh, $query, @values); $main::lxdebug->leave_sub(); @@ -2272,30 +2500,31 @@ sub save_history { sub get_history { $main::lxdebug->enter_sub(); - my $self = shift(); - my $dbh = shift(); - my $trans_id = shift(); - my $restriction = shift(); + my ($self, $dbh, $trans_id, $restriction, $order) = @_; + my ($orderBy, $desc) = split(/\-\-/, $order); + $order = " ORDER BY " . ($order eq "" ? " h.itime " : ($desc == 1 ? $orderBy . " DESC " : $orderBy . " ")); 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|SELECT h.employee_id, h.itime::timestamp(0) AS itime, h.addition, h.what_done, emp.name, h.snumbers, h.trans_id AS id | . qq|FROM history_erp h | . qq|LEFT JOIN employee emp ON (emp.id = h.employee_id) | . - qq|WHERE trans_id = ? | - . $restriction; - + qq|WHERE trans_id = | . $trans_id + . $restriction . qq| | + . $order; + my $sth = $dbh->prepare($query) || $self->dberror($query); - $sth->execute($trans_id) || $self->dberror("$query ($trans_id)"); + $sth->execute() || $self->dberror("$query"); 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}); + $hash_ref->{snumbers} =~ s/^.+_(.*)$/$1/g; $tempArray[$i++] = $hash_ref; } - $main::lxdebug->leave_sub() and return \@tempArray + $main::lxdebug->leave_sub() and return \@tempArray if ($i > 0 && $tempArray[0] ne ""); } $main::lxdebug->leave_sub(); @@ -2320,11 +2549,8 @@ sub update_defaults { my ($var) = $sth->fetchrow_array; $sth->finish; - if ($var =~ /^(.*?)(\d+)$/) { - $var = "$1" . ($2 + 1); - } else { - $var++; - } + $var =~ s/\d+$/ sprintf '%0*d', length($&), $&+1 /e; + $var ||= 1; $query = qq|UPDATE defaults SET $fld = ?|; do_query($self, $dbh, $query, $var); @@ -2355,13 +2581,8 @@ sub update_business { WHERE id = ? FOR UPDATE|; my ($var) = selectrow_query($self, $dbh, $query, $business_id); - if ($var ne "") { - if ($var =~ /^(.*?)(\d+)$/) { - $var = "$1" . ($2 + 1); - } else { - $var++; - } - } + $var =~ s/\d+$/ sprintf '%0*d', length($&), $&+1 /e; + $query = qq|UPDATE business SET customernumberinit = ? WHERE id = ?|; @@ -2382,7 +2603,7 @@ sub get_partsgroup { my ($self, $myconfig, $p) = @_; - my $dbh = $self->dbconnect($myconfig); + my $dbh = $self->get_standard_dbh($myconfig); my $query = qq|SELECT DISTINCT pg.id, pg.partsgroup FROM partsgroup pg @@ -2419,9 +2640,8 @@ sub get_partsgroup { @values = ($p->{language_code}); } - $self->{all_partsgroups} = selectall_hashref_query($self, $dbh, $query, @values); + $self->{all_partsgroup} = selectall_hashref_query($self, $dbh, $query, @values); - $dbh->disconnect; $main::lxdebug->leave_sub(); } @@ -2430,7 +2650,7 @@ sub get_pricegroup { my ($self, $myconfig, $p) = @_; - my $dbh = $self->dbconnect($myconfig); + my $dbh = $self->get_standard_dbh($myconfig); my $query = qq|SELECT p.id, p.pricegroup FROM pricegroup p|; @@ -2444,8 +2664,6 @@ sub get_pricegroup { $self->{all_pricegroup} = selectall_hashref_query($self, $dbh, $query); - $dbh->disconnect; - $main::lxdebug->leave_sub(); } @@ -2458,11 +2676,7 @@ sub all_years { my ($self, $myconfig, $dbh) = @_; - my $disconnect = 0; - if (! $dbh) { - $dbh = $self->dbconnect($myconfig); - $disconnect = 1; - } + $dbh ||= $self->get_standard_dbh($myconfig); # get years my $query = qq|SELECT (SELECT MIN(transdate) FROM acc_trans), @@ -2487,12 +2701,35 @@ sub all_years { push @all_years, $enddate--; } - $dbh->disconnect if $disconnect; - return @all_years; $main::lxdebug->leave_sub(); } +sub mark_as_paid { + $main::lxdebug->enter_sub(); + + my ($self, $myconfig, $db_name) = @_; + + if($self->{mark_as_paid}) { + my $dbh ||= $self->get_standard_dbh($myconfig); + my $query = qq|UPDATE $db_name SET paid = amount WHERE id = ?|; + do_query($self, $dbh, $query, $self->{id}); + $dbh->commit(); + $self->redirect($main::locale->text("Marked as paid")); + } + else { + my $referer = $ENV{HTTP_REFERER}; + $referer =~ s/^(.*)action\=.*\&(.*)$/$1action\=mark_as_paid\&mark_as_paid\=1\&login\=$self->{login}\&password\=$self->{password}\&id\=$self->{id}\&$2/; + $self->header(); + print qq||; + print qq|
|.$main::locale->text('Mark as paid?').qq|
|; + print qq| |; + print qq||; + print qq||; + } + + $main::lxdebug->leave_sub(); +} 1;