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 vc.linet-services.de:public/lx-office-erp
[kivitendo-erp.git]
/
SL
/
CT.pm
diff --git
a/SL/CT.pm
b/SL/CT.pm
index
467fb08
..
3be8ce9
100644
(file)
--- a/
SL/CT.pm
+++ b/
SL/CT.pm
@@
-69,6
+69,9
@@
sub get_tuple {
map { $form->{$_} = $ref->{$_} } keys %$ref;
map { $form->{$_} = $ref->{$_} } keys %$ref;
+ # remove any trailing whitespace
+ $form->{curr} =~ s/\s*$//;
+
$sth->finish;
if ( $form->{salesman_id} ) {
my $query =
$sth->finish;
if ( $form->{salesman_id} ) {
my $query =
@@
-315,7
+318,8
@@
sub save_customer {
qq|taxzone_id = ?, | .
qq|user_password = ?, | .
qq|c_vendor_id = ?, | .
qq|taxzone_id = ?, | .
qq|user_password = ?, | .
qq|c_vendor_id = ?, | .
- qq|klass = ? | .
+ qq|klass = ?, | .
+ qq|curr = ? | .
qq|WHERE id = ?|;
my @values = (
$form->{customernumber},
qq|WHERE id = ?|;
my @values = (
$form->{customernumber},
@@
-357,6
+361,7
@@
sub save_customer {
$form->{user_password},
$form->{c_vendor_id},
conv_i($form->{klass}),
$form->{user_password},
$form->{c_vendor_id},
conv_i($form->{klass}),
+ substr($form->{currency}, 0, 3),
$form->{id}
);
do_query( $form, $dbh, $query, @values );
$form->{id}
);
do_query( $form, $dbh, $query, @values );
@@
-524,7
+529,8
@@
sub save_vendor {
qq| language_id = ?, | .
qq| username = ?, | .
qq| user_password = ?, | .
qq| language_id = ?, | .
qq| username = ?, | .
qq| user_password = ?, | .
- qq| v_customer_id = ? | .
+ qq| v_customer_id = ?, | .
+ qq| curr = ? | .
qq|WHERE id = ?|;
my @values = (
$form->{vendornumber},
qq|WHERE id = ?|;
my @values = (
$form->{vendornumber},
@@
-564,6
+570,7
@@
sub save_vendor {
$form->{username},
$form->{user_password},
$form->{v_customer_id},
$form->{username},
$form->{user_password},
$form->{v_customer_id},
+ substr($form->{currency}, 0, 3),
$form->{id}
);
do_query($form, $dbh, $query, @values);
$form->{id}
);
do_query($form, $dbh, $query, @values);
@@
-696,7
+703,7
@@
sub search {
$form->{sort} = $sortorder;
my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
$form->{sort} = $sortorder;
my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
- if ($sortorder
ne 'id' && 1 >= scalar grep { $form->{$_} } qw(l_ordnumber l_quonumber l_invnumber
)) {
+ if ($sortorder
!~ /(business|id)/ && 1 >= scalar grep { $form->{$_} } qw(l_ordnumber l_quonumber l_invnumber
)) {
$sortorder = "lower($sortorder) ${sortdir}";
} else {
$sortorder .= " ${sortdir}";
$sortorder = "lower($sortorder) ${sortdir}";
} else {
$sortorder .= " ${sortdir}";