X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FForm.pm;h=355d60aef9123f94b8ac5406af9ee1163b3db1ac;hb=1410996dd10264247f118f1ac6f3a8daaf5e55e6;hp=d8077528f03bb12bc7bf3f324e6838e8f1edb944;hpb=5b0ec556775824edf8fbf5f226dae1059a3ba1a5;p=kivitendo-erp.git
diff --git a/SL/Form.pm b/SL/Form.pm
index d8077528f..355d60aef 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -36,11 +36,15 @@
#======================================================================
package Form;
+
+#use strict;
+
use Data::Dumper;
use CGI;
use CGI::Ajax;
use Cwd;
+use IO::File;
use SL::Auth;
use SL::Auth::DB;
use SL::Auth::LDAP;
@@ -56,7 +60,7 @@ use List::Util qw(first max min sum);
my $standard_dbh;
-sub DESTROY {
+END {
if ($standard_dbh) {
$standard_dbh->disconnect();
undef $standard_dbh;
@@ -221,7 +225,7 @@ sub new {
$self->{action} = lc $self->{action};
$self->{action} =~ s/( |-|,|\#)/_/g;
- $self->{version} = "2.4.3";
+ $self->{version} = "2.6.0 beta 1";
$main::lxdebug->leave_sub();
@@ -470,7 +474,7 @@ sub isblank {
my ($self, $name, $msg) = @_;
my $curr = $self;
- foreach my $part (split /\./, $name) {
+ foreach my $part (split m/\./, $name) {
if (!$curr->{$part} || ($curr->{$part} =~ /^\s*$/)) {
$self->error($msg);
}
@@ -532,7 +536,7 @@ sub header {
return;
}
- my ($stylesheet, $favicon);
+ my ($stylesheet, $favicon, $pagelayout);
if ($ENV{HTTP_USER_AGENT}) {
my $doctype;
@@ -590,7 +594,7 @@ sub header {
? "$self->{title} - $self->{titlebar}"
: $self->{titlebar};
my $ajax = "";
- foreach $item (@ { $self->{AJAX} }) {
+ foreach my $item (@ { $self->{AJAX} }) {
$ajax .= $item->show_javascript();
}
@@ -598,17 +602,17 @@ sub header {
'charset' => $db_charset,);
print qq|${doctype}
+
$self->{titlebar}
$stylesheet
$pagelayout
$favicon
-
$jsscript
$ajax
-
+
@@ -638,6 +642,20 @@ sub header {
$main::lxdebug->leave_sub();
}
+sub ajax_response_header {
+ $main::lxdebug->enter_sub();
+
+ my ($self) = @_;
+
+ my $db_charset = $main::dbcharset ? $main::dbcharset : Common::DEFAULT_CHARSET;
+ my $cgi = $main::cgi || CGI->new('');
+ my $output = $cgi->header('-charset' => $db_charset);
+
+ $main::lxdebug->leave_sub();
+
+ return $output;
+}
+
sub _prepare_html_template {
$main::lxdebug->enter_sub();
@@ -690,6 +708,7 @@ sub _prepare_html_template {
$additional_params->{"myconfig_jsc_dateformat"} = $jsc_dateformat;
}
+ $additional_params->{"conf_dbcharset"} = $main::dbcharset;
$additional_params->{"conf_webdav"} = $main::webdav;
$additional_params->{"conf_lizenzen"} = $main::lizenzen;
$additional_params->{"conf_latex_templates"} = $main::latex;
@@ -729,19 +748,34 @@ sub parse_html_template {
map { $additional_params->{$_} ||= $self->{$_} } keys %{ $self };
+ my $in = IO::File->new($file, 'r');
+
+ if (!$in) {
+ print STDERR "Error opening template file: $!";
+ $main::lxdebug->leave_sub();
+ return '';
+ }
+
+ my $input = join('', <$in>);
+ $in->close();
+
+ if ($main::locale) {
+ $input = $main::locale->{iconv}->convert($input);
+ }
+
my $output;
- if (!$template->process($file, $additional_params, \$output)) {
+ if (!$template->process(\$input, $additional_params, \$output)) {
print STDERR $template->error();
}
- $output = $main::locale->{iconv}->convert($output) if ($main::locale);
-
$main::lxdebug->leave_sub();
return $output;
}
sub show_generic_error {
+ $main::lxdebug->enter_sub();
+
my ($self, $error, %params) = @_;
my $add_params = {
@@ -763,15 +797,19 @@ sub show_generic_error {
$add_params->{SHOW_BACK_BUTTON} = 1;
}
- $self->{title} = $title if ($title);
+ $self->{title} = $params{title} if $params{title};
$self->header();
print $self->parse_html_template("generic/error", $add_params);
+ $main::lxdebug->leave_sub();
+
die("Error: $error\n");
}
sub show_generic_information {
+ $main::lxdebug->enter_sub();
+
my ($self, $text, $title) = @_;
my $add_params = {
@@ -784,7 +822,9 @@ sub show_generic_information {
$self->header();
print $self->parse_html_template("generic/information", $add_params);
- die("Information: $error\n");
+ $main::lxdebug->leave_sub();
+
+ die("Information: $text\n");
}
# write Trigger JavaScript-Code ($qty = quantity of Triggers)
@@ -807,8 +847,8 @@ sub write_trigger {
"yyyy-mm-dd" => "%Y-%m-%d",
);
- my $ifFormat = defined($dateformats{$myconfig{"dateformat"}}) ?
- $dateformats{$myconfig{"dateformat"}} : "%d.%m.%Y";
+ my $ifFormat = defined($dateformats{$myconfig->{"dateformat"}}) ?
+ $dateformats{$myconfig->{"dateformat"}} : "%d.%m.%Y";
my @triggers;
while ($#_ >= 2) {
@@ -841,7 +881,7 @@ sub redirect {
if ($self->{callback}) {
- ($script, $argv) = split(/\?/, $self->{callback}, 2);
+ my ($script, $argv) = split(/\?/, $self->{callback}, 2);
$script =~ s|.*/||;
$script =~ s|[^a-zA-Z0-9_\.]||g;
exec("perl", "$script", $argv);
@@ -874,12 +914,12 @@ sub format_amount {
if ($amount eq "") {
$amount = 0;
}
-
+
# Hey watch out! The amount can be an exponential term like 1.13686837721616e-13
-
+
my $neg = ($amount =~ s/^-//);
my $exp = ($amount =~ m/[e]/) ? 1 : 0;
-
+
if (defined($places) && ($places ne '')) {
if (not $exp) {
if ($places < 0) {
@@ -951,6 +991,7 @@ sub format_amount_units {
$amount *= $conv_unit->{factor};
my @values;
+ my $num;
foreach my $unit (@$conv_units) {
my $last = $unit->{name} eq $part_unit->{name};
@@ -1078,13 +1119,11 @@ sub parse_template {
# 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
- co_ustid taxnumber duns));
+ if (!$self->{employee_id}) {
+ map { $self->{"employee_${_}"} = $myconfig->{$_}; } qw(email tel fax name signature company address businessnumber co_ustid taxnumber duns);
+ }
- map({ $self->{"${_}"} = $myconfig->{$_}; }
- qw(co_ustid));
-
+ map { $self->{"${_}"} = $myconfig->{$_}; } qw(co_ustid);
$self->{copies} = 1 if (($self->{copies} *= 1) <= 0);
@@ -1189,7 +1228,7 @@ sub parse_template {
open(OUT, $self->{OUT})
or $self->error($self->cleanup . "$self->{OUT} : $!");
} else {
- $self->{attachment_filename} = ($self->{attachment_filename})
+ $self->{attachment_filename} = ($self->{attachment_filename})
? $self->{attachment_filename}
: $self->generate_attachment_filename();
@@ -1279,14 +1318,19 @@ sub generate_attachment_filename {
my $attachment_filename = $main::locale->unquote_special_chars('HTML', $self->get_formname_translation());
my $prefix = $self->get_number_prefix_for_type();
- if ($attachment_filename && $self->{"${prefix}number"}) {
+ if ($self->{preview} && (first { $self->{type} eq $_ } qw(invoice credit_note))) {
+ $attachment_filename .= ' (' . $main::locale->text('Preview') . ')' . $self->get_extension_for_format();
+
+ } elsif ($attachment_filename && $self->{"${prefix}number"}) {
$attachment_filename .= "_" . $self->{"${prefix}number"} . $self->get_extension_for_format();
- $attachment_filename = $main::locale->quote_special_chars('filenames', $attachment_filename);
- $attachment_filename =~ s|[\s/\\]+|_|g;
+
} else {
$attachment_filename = "";
}
+ $attachment_filename = $main::locale->quote_special_chars('filenames', $attachment_filename);
+ $attachment_filename =~ s|[\s/\\]+|_|g;
+
return $attachment_filename;
}
@@ -1336,6 +1380,7 @@ sub datetonum {
$main::lxdebug->enter_sub();
my ($self, $date, $myconfig) = @_;
+ my ($yy, $mm, $dd);
if ($date && $date =~ /\D/) {
@@ -1392,9 +1437,9 @@ sub dbconnect_noauto {
$main::lxdebug->enter_sub();
my ($self, $myconfig) = @_;
-
+
# connect to database
- $dbh =
+ my $dbh =
DBI->connect($myconfig->{dbconnect}, $myconfig->{dbuser},
$myconfig->{dbpasswd}, { AutoCommit => 0 })
or $self->dberror;
@@ -1473,7 +1518,7 @@ sub update_exchangerate {
if ($curr eq '') {
$main::lxdebug->leave_sub();
return;
- }
+ }
$query = qq|SELECT curr FROM defaults|;
my ($currency) = selectrow_query($self, $dbh, $query);
@@ -1514,7 +1559,7 @@ sub update_exchangerate {
SET $set
WHERE curr = ?
AND transdate = ?|;
-
+
} else {
$query = qq|INSERT INTO exchangerate (curr, buy, sell, transdate)
VALUES (?, $buy, $sell, ?)|;
@@ -1583,6 +1628,10 @@ sub check_exchangerate {
my ($self, $myconfig, $currency, $transdate, $fld) = @_;
+ if ($fld !~/^buy|sell$/) {
+ $self->error('Fatal: check_exchangerate called with invalid buy/sell argument');
+ }
+
unless ($transdate) {
$main::lxdebug->leave_sub();
return "";
@@ -1825,7 +1874,7 @@ sub add_shipto {
shiptophone = ? AND
shiptofax = ? AND
shiptoemail = ? AND
- module = ? AND
+ module = ? AND
trans_id = ?|;
my $insert_check = selectfirst_hashref_query($self, $dbh, $query, @values, $module, $id);
if(!$insert_check){
@@ -1854,28 +1903,31 @@ sub get_employee {
$main::lxdebug->leave_sub();
}
-sub get_salesman {
+sub get_employee_data {
$main::lxdebug->enter_sub();
- my ($self, $myconfig, $salesman_id) = @_;
+ my $self = shift;
+ my %params = @_;
- $main::lxdebug->leave_sub() and return unless $salesman_id;
+ Common::check_params(\%params, qw(prefix));
+ Common::check_params_x(\%params, qw(id));
- my $dbh = $self->get_standard_dbh($myconfig);
+ if (!$params{id}) {
+ $main::lxdebug->leave_sub();
+ return;
+ }
- my ($login) =
- selectrow_query($self, $dbh, qq|SELECT login FROM employee WHERE id = ?|,
- $salesman_id);
+ my $myconfig = \%main::myconfig;
+ my $dbh = $params{dbh} || $self->get_standard_dbh($myconfig);
+
+ my ($login) = selectrow_query($self, $dbh, qq|SELECT login FROM employee WHERE id = ?|, conv_i($params{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;
+ my $user = User->new($login);
+ map { $self->{$params{prefix} . "_${_}"} = $user->{$_}; } qw(address businessnumber co_ustid company duns email fax name signature taxnumber tel);
- $self->{salesman_name} = $login
- if ($self->{salesman_name} eq "");
+ $self->{$params{prefix} . '_login'} = $login;
+ $self->{$params{prefix} . '_name'} ||= $login;
}
$main::lxdebug->leave_sub();
@@ -2005,6 +2057,7 @@ sub _get_charts {
$main::lxdebug->enter_sub();
my ($self, $dbh, $params) = @_;
+ my ($key);
$key = $params->{key};
$key = "all_charts" unless ($key);
@@ -2028,11 +2081,27 @@ sub _get_charts {
sub _get_taxcharts {
$main::lxdebug->enter_sub();
- my ($self, $dbh, $key) = @_;
+ my ($self, $dbh, $params) = @_;
+
+ my $key = "all_taxcharts";
+ my @where;
+
+ if (ref $params eq 'HASH') {
+ $key = $params->{key} if ($params->{key});
+ if ($params->{module} eq 'AR') {
+ push @where, 'taxkey NOT IN (8, 9, 18, 19)';
- $key = "all_taxcharts" unless ($key);
+ } elsif ($params->{module} eq 'AP') {
+ push @where, 'taxkey NOT IN (1, 2, 3, 12, 13)';
+ }
+
+ } elsif ($params) {
+ $key = $params;
+ }
- my $query = qq|SELECT * FROM tax ORDER BY taxkey|;
+ my $where = ' WHERE ' . join(' AND ', map { "($_)" } @where) if (@where);
+
+ my $query = qq|SELECT * FROM tax $where ORDER BY taxkey|;
$self->{$key} = selectall_hashref_query($self, $dbh, $query);
@@ -2112,7 +2181,7 @@ $main::lxdebug->enter_sub();
$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();
@@ -2126,7 +2195,7 @@ $main::lxdebug->enter_sub();
$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();
@@ -2138,7 +2207,7 @@ sub _get_customers {
my ($self, $dbh, $key, $limit) = @_;
$key = "all_customers" unless ($key);
- $limit_clause = "LIMIT $limit" if $limit;
+ my $limit_clause = "LIMIT $limit" if $limit;
my $query = qq|SELECT * FROM customer WHERE NOT obsolete ORDER BY name $limit_clause|;
@@ -2228,19 +2297,19 @@ sub _get_simple {
$main::lxdebug->leave_sub();
}
-sub _get_groups {
- $main::lxdebug->enter_sub();
-
- my ($self, $dbh, $key) = @_;
-
- $key ||= "all_groups";
-
- my $groups = $main::auth->read_groups();
-
- $self->{$key} = selectall_hashref_query($self, $dbh, $query);
-
- $main::lxdebug->leave_sub();
-}
+#sub _get_groups {
+# $main::lxdebug->enter_sub();
+#
+# my ($self, $dbh, $key) = @_;
+#
+# $key ||= "all_groups";
+#
+# my $groups = $main::auth->read_groups();
+#
+# $self->{$key} = selectall_hashref_query($self, $dbh, $query);
+#
+# $main::lxdebug->leave_sub();
+#}
sub get_lists {
$main::lxdebug->enter_sub();
@@ -2291,7 +2360,7 @@ sub get_lists {
if ($params{"employees"}) {
$self->_get_employees($dbh, "all_employees", $params{"employees"});
}
-
+
if ($params{"salesmen"}) {
$self->_get_employees($dbh, "all_salesmen", $params{"salesmen"});
}
@@ -2303,11 +2372,11 @@ sub get_lists {
if ($params{"dunning_configs"}) {
$self->_get_dunning_configs($dbh, $params{"dunning_configs"});
}
-
+
if($params{"currencies"}) {
$self->_get_currencies($dbh, $params{"currencies"});
}
-
+
if($params{"customers"}) {
if (ref $params{"customers"} eq 'HASH') {
$self->_get_customers($dbh, $params{"customers"}{key}, $params{"customers"}{limit});
@@ -2315,7 +2384,7 @@ sub get_lists {
$self->_get_customers($dbh, $params{"customers"});
}
}
-
+
if($params{"vendors"}) {
if (ref $params{"vendors"} eq 'HASH') {
$self->_get_vendors($dbh, $params{"vendors"}{key}, $params{"vendors"}{limit});
@@ -2323,7 +2392,7 @@ sub get_lists {
$self->_get_vendors($dbh, $params{"vendors"});
}
}
-
+
if($params{"payments"}) {
$self->_get_payments($dbh, $params{"payments"});
}
@@ -2340,9 +2409,10 @@ sub get_lists {
$self->_get_warehouses($dbh, $params{warehouses});
}
- if ($params{groups}) {
- $self->_get_groups($dbh, $params{groups});
- }
+# if ($params{groups}) {
+# $self->_get_groups($dbh, $params{groups});
+# }
+
if ($params{partsgroup}) {
$self->get_partsgroup(\%main::myconfig, { all => 1, target => $params{partsgroup} });
}
@@ -2581,7 +2651,7 @@ sub create_links {
do_statement($self, $sth, $query, '%' . $module . '%');
$self->{accounts} = "";
- while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+ while ($ref = $sth->fetchrow_hashref("NAME_lc")) {
foreach my $key (split(/:/, $ref->{link})) {
if ($key =~ /\Q$module\E/) {
@@ -2628,7 +2698,7 @@ sub create_links {
WHERE a.id = ?|;
$ref = selectfirst_hashref_query($self, $dbh, $query, $self->{id});
- foreach $key (keys %$ref) {
+ foreach my $key (keys %$ref) {
$self->{$key} = $ref->{$key};
}
@@ -2650,7 +2720,7 @@ sub create_links {
do_statement($self, $sth, $query, "%$module%");
$self->{accounts} = "";
- while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+ while ($ref = $sth->fetchrow_hashref("NAME_lc")) {
foreach my $key (split(/:/, $ref->{link})) {
if ($key =~ /\Q$module\E/) {
@@ -2700,7 +2770,7 @@ sub create_links {
my $index = 0;
# store amounts in {acc_trans}{$key} for multiple accounts
- while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+ while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
$ref->{exchangerate} =
$self->get_exchangerate($dbh, $self->{currency}, $ref->{transdate}, $fld);
if (!($xkeyref{ $ref->{accno} } =~ /tax/)) {
@@ -2866,7 +2936,7 @@ sub redo_rows {
# fill rows
foreach my $item (sort { $a->{num} <=> $b->{num} } @ndx) {
$i++;
- $j = $item->{ndx} - 1;
+ my $j = $item->{ndx} - 1;
map { $self->{"${_}_$i"} = $new->[$j]->{$_} } @{$flds};
}
@@ -3049,7 +3119,7 @@ sub get_history {
qq|WHERE trans_id = | . $trans_id
. $restriction . qq| |
. $order;
-
+
my $sth = $dbh->prepare($query) || $self->dberror($query);
$sth->execute() || $self->dberror("$query");
@@ -3060,7 +3130,7 @@ sub get_history {
$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();