X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FCommon.pm;h=ff6c7218abb0f302d845093d41a5913674e69758;hb=e770cd180600810fecd3554e104546236a9c9597;hp=fe2196df1cf8a681bc6af88aad48483006005483;hpb=e807eba3fbc473e29d49fa1dde0e18c9e7b74080;p=kivitendo-erp.git diff --git a/SL/Common.pm b/SL/Common.pm index fe2196df1..ff6c7218a 100644 --- a/SL/Common.pm +++ b/SL/Common.pm @@ -8,11 +8,15 @@ 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" }, @@ -39,7 +43,22 @@ sub unique_id { } sub tmpname { - return "/tmp/lx-office-tmp-" . unique_id(); + return "/tmp/kivitendo-tmp-" . unique_id(); +} + +sub truncate { + my ($text, %params) = @_; + + $params{at} //= 50; + $params{at} = 3 if 3 > $params{at}; + + $params{strip} //= ''; + + $text =~ s/[\r\n]+$//g if $params{strip} =~ m/^(?: 1 | newlines? | full )$/x; + $text =~ s/[\r\n]+/ /g if $params{strip} =~ m/^(?: newlines? | full )$/x; + + return $text if length($text) <= $params{at}; + return substr($text, 0, $params{at} - 3) . '...'; } sub retrieve_parts { @@ -51,7 +70,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 +78,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 +94,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 +213,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 +226,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|); @@ -286,8 +302,9 @@ sub retrieve_vendor { 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) . ")"); @@ -334,7 +351,7 @@ sub webdav_folder { my ($form) = @_; return $main::lxdebug->leave_sub() - unless ($main::webdav && $form->{id}); + unless ($::lx_office_conf{features}->{webdav} && $form->{id}); my ($path, $number); @@ -348,6 +365,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") { @@ -366,10 +387,9 @@ sub webdav_folder { 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|/$||; - # wo kommt der wert für dir her? es wird doch gar nichts übergeben? fix für strict my $dir jb 21.2. + # 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 '..')); @@ -384,7 +404,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'), }; } @@ -436,6 +456,9 @@ sub get_vc_details { $query = qq|SELECT * FROM contacts WHERE (cp_cv_id = ?)|; $form->{CONTACTS} = selectall_hashref_query($form, $dbh, $query, $vc_id); + # Only show default pricegroup for customer, not vendor, which is why this is outside the main query + ($form->{pricegroup}) = selectrow_query($form, $dbh, qq|SELECT pricegroup FROM pricegroup WHERE id = ?|, $form->{klass}); + $dbh->disconnect(); $main::lxdebug->leave_sub(); @@ -491,8 +514,8 @@ sub save_email_status { $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" @@ -519,6 +542,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 +557,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)); } } @@ -564,3 +591,46 @@ sub check_params_x { } 1; +__END__ + +=pod + +=encoding utf8 + +=head1 NAME + +Common - Common routines used in a lot of places. + +=head1 SYNOPSIS + + my $short_text = Common::truncate($long_text, at => 10); + +=head1 FUNCTIONS + +=over 4 + +=item C + +Truncates C<$text> at a position and insert an ellipsis if the text is +longer. The maximum number of characters to return is given with the +paramter C which defaults to 50. + +The optional parameter C can be used to remove unwanted line +feed/carriage return characters from the text before truncation. It +can be set to C<1> (only strip those at the end of C<$text>) or +C (replace consecutive line feed/carriage return characters in +the middle by a single space and remove tailing line feed/carriage +return characters). + +=back + +=head1 BUGS + +Nothing here yet. + +=head1 AUTHOR + +Moritz Bunkus Em.bunkus@linet-services.deE, +Sven Schöling Es.schoeling@linet-services.deE + +=cut