X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FCommon.pm;h=e63b698a18b4738018549a82ce6891f15b24d2cb;hb=0d1bb5102f01eb03da55bc87b52ac52cd7ae7534;hp=8207032db08fad02fe1b2ade3dc5bb53e02f878c;hpb=ff296f5fbc1a4c2d681be64b9696671e00b6aa78;p=kivitendo-erp.git diff --git a/SL/Common.pm b/SL/Common.pm index 8207032db..e63b698a1 100644 --- a/SL/Common.pm +++ b/SL/Common.pm @@ -8,39 +8,37 @@ package Common; +use utf8; +use strict; + +use Carp; use Time::HiRes qw(gettimeofday); use Data::Dumper; use SL::DBUtils; -use vars qw(@db_encodings %db_encoding_to_charset); - -@db_encodings = ( - { "label" => "ASCII", "dbencoding" => "SQL_ASCII", "charset" => "ASCII" }, - { "label" => "UTF-8 Unicode", "dbencoding" => "UNICODE", "charset" => "UTF-8" }, - { "label" => "ISO 8859-1", "dbencoding" => "LATIN1", "charset" => "ISO-8859-1" }, - { "label" => "ISO 8859-2", "dbencoding" => "LATIN2", "charset" => "ISO-8859-2" }, - { "label" => "ISO 8859-3", "dbencoding" => "LATIN3", "charset" => "ISO-8859-3" }, - { "label" => "ISO 8859-4", "dbencoding" => "LATIN4", "charset" => "ISO-8859-4" }, - { "label" => "ISO 8859-5", "dbencoding" => "LATIN5", "charset" => "ISO-8859-5" }, - { "label" => "ISO 8859-15", "dbencoding" => "LATIN9", "charset" => "ISO-8859-15" }, - { "label" => "KOI8-R", "dbencoding" => "KOI8", "charset" => "KOI8-R" }, - { "label" => "Windows CP1251", "dbencoding" => "WIN", "charset" => "CP1251" }, - { "label" => "Windows CP866", "dbencoding" => "ALT", "charset" => "CP866" }, -); - -%db_encoding_to_charset = map { $_->{dbencoding}, $_->{charset} } @db_encodings; -%charset_to_db_encoding = map { $_->{charset}, $_->{dbencoding} } @db_encodings; - -use constant DEFAULT_CHARSET => 'ISO-8859-15'; - sub unique_id { my ($a, $b) = gettimeofday(); return "${a}-${b}-${$}"; } 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 { @@ -67,7 +65,7 @@ sub retrieve_parts { } if ($form->{no_services}) { - $filter .= qq| AND (inventory_accno_id is not NULL or assembly=TRUE)|; # @mb hier nochmal optimieren ... nach kurzer ruecksprache alles i.o. + $filter .= qq| AND (inventory_accno_id is not NULL or assembly=TRUE)|; } substr($filter, 1, 3) = "WHERE" if ($filter); @@ -76,7 +74,8 @@ sub retrieve_parts { $order_dir = $order_dir ? "ASC" : "DESC"; my $query = - qq|SELECT id, partnumber, description, ean | . + qq|SELECT id, partnumber, description, ean, | . + qq| warehouse_id, bin_id | . qq|FROM parts $filter | . qq|ORDER BY $order_by $order_dir|; my $sth = $dbh->prepare($query); @@ -284,8 +283,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) . ")"); @@ -332,7 +332,9 @@ sub webdav_folder { my ($form) = @_; return $main::lxdebug->leave_sub() - unless ($main::webdav && $form->{id}); + unless ($::lx_office_conf{features}->{webdav} && $form->{id}); + + croak "No client set in \$::auth" unless $::auth->client; my ($path, $number); @@ -346,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") { @@ -358,16 +364,14 @@ sub webdav_folder { $number =~ s|[/\\]|_|g; - $path = "webdav/${path}/${number}"; + $path = "webdav/" . $::auth->client->{id} . "/${path}/${number}"; if (!-d $path) { 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. if (opendir my $dir, $path) { foreach my $file (sort { lc $a cmp lc $b } readdir $dir) { next if (($file eq '.') || ($file eq '..')); @@ -382,7 +386,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'), }; } @@ -434,6 +438,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(); @@ -476,6 +483,8 @@ sub save_email_status { } elsif ($form->{script} eq 'ir.pl') { $table = 'ap'; + } elsif ($form->{script} eq 'do.pl') { + $table = 'delivery_orders'; } return $main::lxdebug->leave_sub() if (!$form->{id} || !$table || !$form->{formname}); @@ -489,8 +498,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" @@ -566,3 +575,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