X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/a2aca2e1d8136681d2a95fefd240d509581c8bc8..ca12e8dfc4773aabc13818a0398e06e44028e2bc:/SL/CT.pm diff --git a/SL/CT.pm b/SL/CT.pm index 31ba176ee..933ec15c9 100644 --- a/SL/CT.pm +++ b/SL/CT.pm @@ -155,8 +155,9 @@ sub populate_drop_down_boxes { # get shipto address $query = - qq|SELECT shipto_id, shiptoname, shiptodepartment_1 | . - qq|FROM shipto WHERE (trans_id = ?) AND (module = 'CT')|; + qq|SELECT shipto_id, shiptoname, shiptodepartment_1, shiptostreet, shiptocity + FROM shipto + WHERE (trans_id = ?) AND (module = 'CT')|; $form->{SHIPTO} = selectall_hashref_query($form, $dbh, $query, $form->{id}); # get contacts @@ -307,6 +308,7 @@ sub save_customer { qq|bank_code = ?, | . qq|bank = ?, | . qq|obsolete = ?, | . + qq|direct_debit = ?, | . qq|ustid = ?, | . qq|username = ?, | . qq|salesman_id = ?, | . @@ -346,6 +348,7 @@ sub save_customer { $form->{bank_code}, $form->{bank}, $form->{obsolete} ? 't' : 'f', + $form->{direct_debit} ? 't' : 'f', $form->{ustid}, $form->{username}, conv_i($form->{salesman_id}), @@ -512,6 +515,7 @@ sub save_vendor { qq| bank_code = ?, | . qq| bank = ?, | . qq| obsolete = ?, | . + qq| direct_debit = ?, | . qq| ustid = ?, | . qq| payment_id = ?, | . qq| taxzone_id = ?, | . @@ -549,6 +553,7 @@ sub save_vendor { $form->{bank_code}, $form->{bank}, $form->{obsolete} ? 't' : 'f', + $form->{direct_debit} ? 't' : 'f', $form->{ustid}, conv_i($form->{payment_id}), conv_i($form->{taxzone_id}, 0), @@ -687,9 +692,9 @@ sub search { my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC'; if ($sortorder eq "address") { - $sortorder = "lower(country) ${sortdir}, lower(city) ${sortdir}, lower(street) ${sortdir}"; + $sortorder = "lower(country) ${sortdir}, lower(city) ${sortdir}, lower(street) ${sortdir}"; } elsif ($sortorder ne 'id') { - $sortorder = "lower($sortorder) ${sortdir}"; + $sortorder = "lower($sortorder) ${sortdir}"; } else { $sortorder .= " ${sortdir}"; }