projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Speicherroutine darf nur auf "customer_vendor_edit" testen
[kivitendo-erp.git]
/
SL
/
Common.pm
diff --git
a/SL/Common.pm
b/SL/Common.pm
index
51cec86
..
726c4c8
100644
(file)
--- a/
SL/Common.pm
+++ b/
SL/Common.pm
@@
-8,11
+8,15
@@
package Common;
package Common;
+use utf8;
+use strict;
+
use Time::HiRes qw(gettimeofday);
use Time::HiRes qw(gettimeofday);
+use Data::Dumper;
use SL::DBUtils;
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" },
@db_encodings = (
{ "label" => "ASCII", "dbencoding" => "SQL_ASCII", "charset" => "ASCII" },
@@
-39,7
+43,7
@@
sub unique_id {
}
sub tmpname {
}
sub tmpname {
- return "/tmp/
lx-office
-tmp-" . unique_id();
+ return "/tmp/
kivitendo
-tmp-" . unique_id();
}
sub retrieve_parts {
}
sub retrieve_parts {
@@
-51,7
+55,7
@@
sub retrieve_parts {
my (@filter_values, $filter);
my (@filter_values, $filter);
- foreach (qw(partnumber description)) {
+ foreach (qw(partnumber description
ean
)) {
next unless $form->{$_};
$filter .= qq| AND ($_ ILIKE ?)|;
next unless $form->{$_};
$filter .= qq| AND ($_ ILIKE ?)|;
@@
-62,14
+66,11
@@
sub retrieve_parts {
$filter .= qq| AND (NOT COALESCE(assembly, FALSE))|;
}
if ($form->{assemblies}) {
$filter .= qq| AND (NOT COALESCE(assembly, FALSE))|;
}
if ($form->{assemblies}) {
- $filter .= qq| AND assembly=TRUE|; # 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}) {
}
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)|; # @mb hier nochmal optimieren ... nach kurzer ruecksprache alles i.o.
}
substr($filter, 1, 3) = "WHERE" if ($filter);
}
substr($filter, 1, 3) = "WHERE" if ($filter);
@@
-78,12
+79,11
@@
sub retrieve_parts {
$order_dir = $order_dir ? "ASC" : "DESC";
my $query =
$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);
$sth->execute(@filter_values) || $form->dberror($query . " (" . join(", ", @filter_values) . ")");
qq|FROM parts $filter | .
qq|ORDER BY $order_by $order_dir|;
my $sth = $dbh->prepare($query);
$sth->execute(@filter_values) || $form->dberror($query . " (" . join(", ", @filter_values) . ")");
- open STDERR, ">>/usr/local/src/lxoffice/users/de.log" or die $!; print STDERR "hier:" . $query . "filter " . $filter . "filterwerte:" . $filter_values[0] . "\n"; close STDERR;
my $parts = [];
while (my $ref = $sth->fetchrow_hashref()) {
push(@{$parts}, $ref);
my $parts = [];
while (my $ref = $sth->fetchrow_hashref()) {
push(@{$parts}, $ref);
@@
-198,7
+198,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,
push(@queries, qq|SELECT
c.id, c.name, 0 AS customer_is_vendor,
c.street, c.zipcode, c.city,
- ct.cp_g
reeting
, ct.cp_title, ct.cp_givenname, ct.cp_name
+ ct.cp_g
ender
, 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|);
FROM customer c
LEFT JOIN contacts ct ON (c.id = ct.cp_cv_id)
$c_filter|);
@@
-211,7
+211,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,
push(@queries, qq|SELECT
v.id, v.name, 1 AS customer_is_vendor,
v.street, v.zipcode, v.city,
- ct.cp_g
reeting
, ct.cp_title, ct.cp_givenname, ct.cp_name
+ ct.cp_g
ender
, 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|);
FROM vendor v
LEFT JOIN contacts ct ON (v.id = ct.cp_cv_id)
$v_filter|);
@@
-287,8
+287,9
@@
sub retrieve_vendor {
my $query =
qq!SELECT id, name, customernumber, (street || ', ' || zipcode || city) AS address FROM customer ! .
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!;
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 $sth = $dbh->prepare($query);
$sth->execute(@filter_values) ||
$form->dberror($query . " (" . join(", ", @filter_values) . ")");
@@
-335,7
+336,7
@@
sub webdav_folder {
my ($form) = @_;
return $main::lxdebug->leave_sub()
my ($form) = @_;
return $main::lxdebug->leave_sub()
- unless ($
main::webdav
&& $form->{id});
+ unless ($
::lx_office_conf{features}->{webdav}
&& $form->{id});
my ($path, $number);
my ($path, $number);
@@
-349,6
+350,10
@@
sub webdav_folder {
($path, $number) = ("anfragen", $form->{quonumber});
} elsif ($form->{type} eq "purchase_order") {
($path, $number) = ("lieferantenbestellungen", $form->{ordnumber});
($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") {
} elsif ($form->{type} eq "credit_note") {
($path, $number) = ("gutschriften", $form->{invnumber});
} elsif ($form->{vc} eq "customer") {
@@
-367,10
+372,9
@@
sub webdav_folder {
mkdir_with_parents($path);
} else {
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|[^/]+$||;
- $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 '..'));
if (opendir my $dir, $path) {
foreach my $file (sort { lc $a cmp lc $b } readdir $dir) {
next if (($file eq '.') || ($file eq '..'));
@@
-385,7
+389,7
@@
sub webdav_folder {
push @{ $form->{WEBDAV} }, {
'name' => $fname,
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'),
};
}
'type' => $is_directory ? $main::locale->text('Directory') : $main::locale->text('File'),
};
}
@@
-492,8
+496,8
@@
sub save_email_status {
$intnotes .= "\n\n" if ($intnotes);
$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"
my $now = scalar localtime;
$intnotes .= $main::locale->text('[email]') . "\n"
@@
-520,6
+524,8
@@
sub check_params {
foreach my $key (@_) {
if ((ref $key eq '') && !defined $params->{$key}) {
my $subroutine = (caller(1))[3];
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') {
$main::form->error($main::locale->text("Missing parameter #1 in call to sub #2.", $key, $subroutine));
} elsif (ref $key eq 'ARRAY') {
@@
-533,6
+539,8
@@
sub check_params {
if (!$found) {
my $subroutine = (caller(1))[3];
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));
}
}
$main::form->error($main::locale->text("Missing parameter (at least one of #1) in call to sub #2.", join(', ', @{ $key }), $subroutine));
}
}