projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rose-Modell f. Buchungsgruppen: Relation zu Chart für inventory_account korrigiert.
[kivitendo-erp.git]
/
SL
/
CT.pm
diff --git
a/SL/CT.pm
b/SL/CT.pm
index
44707f9
..
8ceab3a
100644
(file)
--- a/
SL/CT.pm
+++ b/
SL/CT.pm
@@
-322,7
+322,8
@@
sub save_customer {
qq|c_vendor_id = ?, | .
qq|klass = ?, | .
qq|currency_id = (SELECT id FROM currencies WHERE name = ?), | .
qq|c_vendor_id = ?, | .
qq|klass = ?, | .
qq|currency_id = (SELECT id FROM currencies WHERE name = ?), | .
- qq|taxincluded_checked = ? | .
+ qq|taxincluded_checked = ?, | .
+ qq|delivery_term_id = ? | .
qq|WHERE id = ?|;
my @values = (
$form->{customernumber},
qq|WHERE id = ?|;
my @values = (
$form->{customernumber},
@@
-366,6
+367,7
@@
sub save_customer {
conv_i($form->{klass}),
$form->{currency},
$form->{taxincluded_checked} ne '' ? $form->{taxincluded_checked} : undef,
conv_i($form->{klass}),
$form->{currency},
$form->{taxincluded_checked} ne '' ? $form->{taxincluded_checked} : undef,
+ conv_i($form->{delivery_term_id}),
$form->{id}
);
do_query( $form, $dbh, $query, @values );
$form->{id}
);
do_query( $form, $dbh, $query, @values );
@@
-473,7
+475,8
@@
sub save_vendor {
qq| username = ?, | .
qq| user_password = ?, | .
qq| v_customer_id = ?, | .
qq| username = ?, | .
qq| user_password = ?, | .
qq| v_customer_id = ?, | .
- qq| currency_id = (SELECT id FROM currencies WHERE name = ?) | .
+ qq| currency_id = (SELECT id FROM currencies WHERE name = ?), | .
+ qq| delivery_term_id = ? | .
qq|WHERE id = ?|;
my @values = (
$form->{vendornumber},
qq|WHERE id = ?|;
my @values = (
$form->{vendornumber},
@@
-514,6
+517,7
@@
sub save_vendor {
$form->{user_password},
$form->{v_customer_id},
$form->{currency},
$form->{user_password},
$form->{v_customer_id},
$form->{currency},
+ conv_i($form->{delivery_term_id}),
$form->{id}
);
do_query($form, $dbh, $query, @values);
$form->{id}
);
do_query($form, $dbh, $query, @values);
@@
-634,6
+638,7
@@
sub search {
"zipcode" => "ct.zipcode",
"city" => "ct.city",
"country" => "ct.country",
"zipcode" => "ct.zipcode",
"city" => "ct.city",
"country" => "ct.country",
+ "discount" => "ct.discount",
"salesman" => "e.name"
);
"salesman" => "e.name"
);
@@
-649,7
+654,7
@@
sub search {
}
my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
}
my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
- if ($sortorder !~ /(business|id)/ && !$join_records) {
+ if ($sortorder !~ /(business|id
|discount
)/ && !$join_records) {
$sortorder = "lower($sortorder) ${sortdir}";
} else {
$sortorder .= " ${sortdir}";
$sortorder = "lower($sortorder) ${sortdir}";
} else {
$sortorder .= " ${sortdir}";