projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://lx-office/~/lx-office-erp
[kivitendo-erp.git]
/
SL
/
CT.pm
diff --git
a/SL/CT.pm
b/SL/CT.pm
index
a8ea84e
..
2397fe7
100644
(file)
--- a/
SL/CT.pm
+++ b/
SL/CT.pm
@@
-194,13
+194,6
@@
sub query_titles_and_greetings {
my $dbh = $form->dbconnect($myconfig);
my $dbh = $form->dbconnect($myconfig);
- $query =
- qq|SELECT DISTINCT(cp_greeting) | .
- qq|FROM contacts | .
- qq|WHERE cp_greeting ~ '[a-zA-Z]' | .
- qq|ORDER BY cp_greeting|;
- $form->{GREETINGS} = [ selectall_array_query($form, $dbh, $query) ];
-
$query =
qq|SELECT DISTINCT(greeting) | .
qq|FROM customer | .
$query =
qq|SELECT DISTINCT(greeting) | .
qq|FROM customer | .
@@
-376,7
+369,6
@@
sub save_customer {
$query = undef;
if ( $form->{cp_id} ) {
$query = qq|UPDATE contacts SET | .
$query = undef;
if ( $form->{cp_id} ) {
$query = qq|UPDATE contacts SET | .
- qq|cp_greeting = ?, | .
qq|cp_title = ?, | .
qq|cp_givenname = ?, | .
qq|cp_name = ?, | .
qq|cp_title = ?, | .
qq|cp_givenname = ?, | .
qq|cp_name = ?, | .
@@
-392,10
+384,10
@@
sub save_customer {
qq|cp_project = ?, | .
qq|cp_privatphone = ?, | .
qq|cp_privatemail = ?, | .
qq|cp_project = ?, | .
qq|cp_privatphone = ?, | .
qq|cp_privatemail = ?, | .
- qq|cp_birthday = ? | .
+ qq|cp_birthday = ?, | .
+ qq|cp_gender = ? | .
qq|WHERE cp_id = ?|;
@values = (
qq|WHERE cp_id = ?|;
@values = (
- $form->{cp_greeting},
$form->{cp_title},
$form->{cp_givenname},
$form->{cp_name},
$form->{cp_title},
$form->{cp_givenname},
$form->{cp_name},
@@
-412,18
+404,18
@@
sub save_customer {
$form->{cp_privatphone},
$form->{cp_privatemail},
$form->{cp_birthday},
$form->{cp_privatphone},
$form->{cp_privatemail},
$form->{cp_birthday},
+ $form->{cp_gender} eq 'f' ? 'f' : 'm',
$form->{cp_id}
);
} elsif ( $form->{cp_name} || $form->{cp_givenname} ) {
$query =
$form->{cp_id}
);
} elsif ( $form->{cp_name} || $form->{cp_givenname} ) {
$query =
- qq|INSERT INTO contacts ( cp_cv_id, cp_
greeting, cp_
title, cp_givenname, | .
+ qq|INSERT INTO contacts ( cp_cv_id, cp_title, cp_givenname, | .
qq| cp_name, cp_email, cp_phone1, cp_phone2, cp_abteilung, cp_fax, cp_mobile1, | .
qq| cp_mobile2, cp_satphone, cp_satfax, cp_project, cp_privatphone, cp_privatemail, | .
qq| cp_name, cp_email, cp_phone1, cp_phone2, cp_abteilung, cp_fax, cp_mobile1, | .
qq| cp_mobile2, cp_satphone, cp_satfax, cp_project, cp_privatphone, cp_privatemail, | .
- qq| cp_birthday) | .
+ qq| cp_birthday
, cp_gender
) | .
qq|VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
@values = (
$form->{id},
qq|VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
@values = (
$form->{id},
- $form->{cp_greeting},
$form->{cp_title},
$form->{cp_givenname},
$form->{cp_name},
$form->{cp_title},
$form->{cp_givenname},
$form->{cp_name},
@@
-439,7
+431,8
@@
sub save_customer {
$form->{cp_project},
$form->{cp_privatphone},
$form->{cp_privatemail},
$form->{cp_project},
$form->{cp_privatphone},
$form->{cp_privatemail},
- $form->{cp_birthday}
+ $form->{cp_birthday},
+ $form->{cp_gender} eq 'f' ? 'f' : 'm',
);
}
do_query( $form, $dbh, $query, @values ) if ($query);
);
}
do_query( $form, $dbh, $query, @values ) if ($query);
@@
-581,7
+574,6
@@
sub save_vendor {
$query = undef;
if ( $form->{cp_id} ) {
$query = qq|UPDATE contacts SET | .
$query = undef;
if ( $form->{cp_id} ) {
$query = qq|UPDATE contacts SET | .
- qq|cp_greeting = ?, | .
qq|cp_title = ?, | .
qq|cp_givenname = ?, | .
qq|cp_name = ?, | .
qq|cp_title = ?, | .
qq|cp_givenname = ?, | .
qq|cp_name = ?, | .
@@
-597,10
+589,10
@@
sub save_vendor {
qq|cp_project = ?, | .
qq|cp_privatphone = ?, | .
qq|cp_privatemail = ?, | .
qq|cp_project = ?, | .
qq|cp_privatphone = ?, | .
qq|cp_privatemail = ?, | .
- qq|cp_birthday = ? | .
+ qq|cp_birthday = ?, | .
+ qq|cp_gender = ? | .
qq|WHERE cp_id = ?|;
@values = (
qq|WHERE cp_id = ?|;
@values = (
- $form->{cp_greeting},
$form->{cp_title},
$form->{cp_givenname},
$form->{cp_name},
$form->{cp_title},
$form->{cp_givenname},
$form->{cp_name},
@@
-617,18
+609,18
@@
sub save_vendor {
$form->{cp_privatphone},
$form->{cp_privatemail},
$form->{cp_birthday},
$form->{cp_privatphone},
$form->{cp_privatemail},
$form->{cp_birthday},
+ $form->{cp_gender} eq 'f' ? 'f' : 'm',
$form->{cp_id}
);
} elsif ( $form->{cp_name} || $form->{cp_givenname} ) {
$query =
$form->{cp_id}
);
} elsif ( $form->{cp_name} || $form->{cp_givenname} ) {
$query =
- qq|INSERT INTO contacts ( cp_cv_id, cp_
greeting, cp_
title, cp_givenname, | .
+ qq|INSERT INTO contacts ( cp_cv_id, cp_title, cp_givenname, | .
qq| cp_name, cp_email, cp_phone1, cp_phone2, cp_abteilung, cp_fax, cp_mobile1, | .
qq| cp_mobile2, cp_satphone, cp_satfax, cp_project, cp_privatphone, cp_privatemail, | .
qq| cp_name, cp_email, cp_phone1, cp_phone2, cp_abteilung, cp_fax, cp_mobile1, | .
qq| cp_mobile2, cp_satphone, cp_satfax, cp_project, cp_privatphone, cp_privatemail, | .
- qq| cp_birthday) | .
+ qq| cp_birthday
, cp_gender
) | .
qq|VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
@values = (
$form->{id},
qq|VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
@values = (
$form->{id},
- $form->{cp_greeting},
$form->{cp_title},
$form->{cp_givenname},
$form->{cp_name},
$form->{cp_title},
$form->{cp_givenname},
$form->{cp_name},
@@
-644,7
+636,8
@@
sub save_vendor {
$form->{cp_project},
$form->{cp_privatphone},
$form->{cp_privatemail},
$form->{cp_project},
$form->{cp_privatphone},
$form->{cp_privatemail},
- $form->{cp_birthday}
+ $form->{cp_birthday},
+ $form->{cp_gender}
);
}
do_query($form, $dbh, $query, @values) if ($query);
);
}
do_query($form, $dbh, $query, @values) if ($query);