X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FCommon.pm;h=fae93413b9f9cbd424034a8b090d513901c04bf4;hb=4c19594dc3035082cf79a81b285000f419429624;hp=fe2196df1cf8a681bc6af88aad48483006005483;hpb=e807eba3fbc473e29d49fa1dde0e18c9e7b74080;p=kivitendo-erp.git diff --git a/SL/Common.pm b/SL/Common.pm index fe2196df1..fae93413b 100644 --- a/SL/Common.pm +++ b/SL/Common.pm @@ -9,10 +9,13 @@ package Common; 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); + +use strict; @db_encodings = ( { "label" => "ASCII", "dbencoding" => "SQL_ASCII", "charset" => "ASCII" }, @@ -51,7 +54,7 @@ sub retrieve_parts { my (@filter_values, $filter); - foreach (qw(partnumber description)) { + foreach (qw(partnumber description ean)) { next unless $form->{$_}; $filter .= qq| AND ($_ ILIKE ?)|; @@ -59,17 +62,14 @@ sub retrieve_parts { } 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='t'|; # alles was assembly ist rausgeben erweiterung für bin/mozilla/wh.pl -> transfer_assembly_update_part -# eigentlich möchte ich diesen filter abbilden: -# select distinct partnumber from parts inner join assembly on (parts.id = assembly.id) where assembly='t'; -# und so common ist die anweisung gar nicht. wie wäre es mit auslagern in WH.pm? -> get_all_working_assemblies? jb 21.2.2009 + $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); @@ -78,7 +78,7 @@ sub retrieve_parts { $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); @@ -197,7 +197,7 @@ sub retrieve_customers_or_vendors { 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|); @@ -210,7 +210,7 @@ sub retrieve_customers_or_vendors { 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|); @@ -348,6 +348,10 @@ sub webdav_folder { ($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") { @@ -384,7 +388,7 @@ sub webdav_folder { 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'), }; } @@ -519,6 +523,8 @@ sub check_params { 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') { @@ -532,6 +538,8 @@ sub check_params { 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)); } }