projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
todo strict
[kivitendo-erp.git]
/
SL
/
Common.pm
diff --git
a/SL/Common.pm
b/SL/Common.pm
index
b5e231c
..
7462d8b
100644
(file)
--- a/
SL/Common.pm
+++ b/
SL/Common.pm
@@
-9,10
+9,13
@@
package Common;
use Time::HiRes qw(gettimeofday);
package Common;
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);
+
+use strict;
@db_encodings = (
{ "label" => "ASCII", "dbencoding" => "SQL_ASCII", "charset" => "ASCII" },
@db_encodings = (
{ "label" => "ASCII", "dbencoding" => "SQL_ASCII", "charset" => "ASCII" },
@@
-194,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,
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|);
@@
-207,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,
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|);
@@
-345,6
+348,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") {
@@
-516,6
+523,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') {
@@
-529,6
+538,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));
}
}