package Common;
+use utf8;
+use strict;
+
use Time::HiRes qw(gettimeofday);
+use Data::Dumper;
use SL::DBUtils;
-use vars qw(@db_encodings %db_encoding_to_charset);
+use vars qw(@db_encodings %db_encoding_to_charset %charset_to_db_encoding);
@db_encodings = (
{ "label" => "ASCII", "dbencoding" => "SQL_ASCII", "charset" => "ASCII" },
}
sub tmpname {
- return "/tmp/lx-office-tmp-" . unique_id();
+ return "/tmp/kivitendo-tmp-" . unique_id();
}
sub retrieve_parts {
my (@filter_values, $filter);
- foreach (qw(partnumber description)) {
+ foreach (qw(partnumber description ean)) {
next unless $form->{$_};
$filter .= qq| AND ($_ ILIKE ?)|;
}
if ($form->{no_assemblies}) {
- $filter .= qq| AND (NOT COALESCE(assembly, 'f'))|;
+ $filter .= qq| AND (NOT COALESCE(assembly, FALSE))|;
+ }
+ if ($form->{assemblies}) {
+ $filter .= qq| AND assembly=TRUE|;
}
if ($form->{no_services}) {
- $filter .= qq| AND (COALESCE(inventory_accno_id, 0) > 0)|;
+ $filter .= qq| AND (inventory_accno_id is not NULL or assembly=TRUE)|; # @mb hier nochmal optimieren ... nach kurzer ruecksprache alles i.o.
}
substr($filter, 1, 3) = "WHERE" if ($filter);
$order_dir = $order_dir ? "ASC" : "DESC";
my $query =
- qq|SELECT id, partnumber, description | .
+ qq|SELECT id, partnumber, description, ean | .
qq|FROM parts $filter | .
qq|ORDER BY $order_by $order_dir|;
my $sth = $dbh->prepare($query);
push(@queries, qq|SELECT
c.id, c.name, 0 AS customer_is_vendor,
c.street, c.zipcode, c.city,
- ct.cp_greeting, ct.cp_title, ct.cp_givenname, ct.cp_name
+ ct.cp_gender, ct.cp_title, ct.cp_givenname, ct.cp_name
FROM customer c
LEFT JOIN contacts ct ON (c.id = ct.cp_cv_id)
$c_filter|);
push(@queries, qq|SELECT
v.id, v.name, 1 AS customer_is_vendor,
v.street, v.zipcode, v.city,
- ct.cp_greeting, ct.cp_title, ct.cp_givenname, ct.cp_name
+ ct.cp_gender, ct.cp_title, ct.cp_givenname, ct.cp_name
FROM vendor v
LEFT JOIN contacts ct ON (v.id = ct.cp_cv_id)
$v_filter|);
my $query =
qq!SELECT id, name, customernumber, (street || ', ' || zipcode || city) AS address FROM customer ! .
- qq!WHERE $filter business_id = (SELECT id FROM business WHERE description = 'Händler') ! .
+ qq!WHERE $filter business_id = (SELECT id FROM business WHERE description = ?') ! .
qq!ORDER BY $order_by $order_dir!;
+ push @filter_values, $::locale->{iconv_utf8}->convert('Händler');
my $sth = $dbh->prepare($query);
$sth->execute(@filter_values) ||
$form->dberror($query . " (" . join(", ", @filter_values) . ")");
my ($form) = @_;
return $main::lxdebug->leave_sub()
- unless ($main::webdav && $form->{id});
+ unless ($::lx_office_conf{features}->{webdav} && $form->{id});
my ($path, $number);
($path, $number) = ("anfragen", $form->{quonumber});
} elsif ($form->{type} eq "purchase_order") {
($path, $number) = ("lieferantenbestellungen", $form->{ordnumber});
+ } elsif ($form->{type} eq "sales_delivery_order") {
+ ($path, $number) = ("verkaufslieferscheine", $form->{donumber});
+ } elsif ($form->{type} eq "purchase_delivery_order") {
+ ($path, $number) = ("einkaufslieferscheine", $form->{donumber});
} elsif ($form->{type} eq "credit_note") {
($path, $number) = ("gutschriften", $form->{invnumber});
} elsif ($form->{vc} eq "customer") {
mkdir_with_parents($path);
} else {
- my $base_path = substr($ENV{'SCRIPT_NAME'}, 1);
+ my $base_path = $ENV{'SCRIPT_NAME'};
$base_path =~ s|[^/]+$||;
- $base_path =~ s|/$||;
-
- if (opendir $dir, $path) {
+ # wo kommt der wert für dir her? es wird doch gar nichts übergeben? fix für strict my $dir jb 21.2.
+ if (opendir my $dir, $path) {
foreach my $file (sort { lc $a cmp lc $b } readdir $dir) {
next if (($file eq '.') || ($file eq '..'));
push @{ $form->{WEBDAV} }, {
'name' => $fname,
- 'link' => ($ENV{"HTTPS"} ? "https://" : "http://") . $ENV{'SERVER_NAME'} . "/$base_path/$file",
+ 'link' => $base_path . $file,
'type' => $is_directory ? $main::locale->text('Directory') : $main::locale->text('File'),
};
}
$intnotes .= "\n\n" if ($intnotes);
- my $cc = $main::locale->text('Cc') . ": $form->{cc}\n" if $form->{cc};
- my $bcc = $main::locale->text('Bcc') . ": $form->{bcc}\n" if $form->{bcc};
+ my $cc = $form->{cc} ? $main::locale->text('Cc') . ": $form->{cc}\n" : '';
+ my $bcc = $form->{bcc} ? $main::locale->text('Bcc') . ": $form->{bcc}\n" : '';
my $now = scalar localtime;
$intnotes .= $main::locale->text('[email]') . "\n"
foreach my $key (@_) {
if ((ref $key eq '') && !defined $params->{$key}) {
my $subroutine = (caller(1))[3];
+ $main::lxdebug->message(LXDebug->BACKTRACE_ON_ERROR, "[Common::check_params] failed, params object dumped below");
+ $main::lxdebug->message(LXDebug->BACKTRACE_ON_ERROR, Dumper($params));
$main::form->error($main::locale->text("Missing parameter #1 in call to sub #2.", $key, $subroutine));
} elsif (ref $key eq 'ARRAY') {
my $found = 0;
- foreach $subkey (@{ $key }) {
+ foreach my $subkey (@{ $key }) {
if (defined $params->{$subkey}) {
$found = 1;
last;
if (!$found) {
my $subroutine = (caller(1))[3];
+ $main::lxdebug->message(LXDebug->BACKTRACE_ON_ERROR, "[Common::check_params] failed, params object dumped below");
+ $main::lxdebug->message(LXDebug->BACKTRACE_ON_ERROR, Dumper($params));
$main::form->error($main::locale->text("Missing parameter (at least one of #1) in call to sub #2.", join(', ', @{ $key }), $subroutine));
}
}
} elsif (ref $key eq 'ARRAY') {
my $found = 0;
- foreach $subkey (@{ $key }) {
+ foreach my $subkey (@{ $key }) {
if (exists $params->{$subkey}) {
$found = 1;
last;