projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Anpassung Rose-Funktionen auf Umstellung currencies
[kivitendo-erp.git]
/
SL
/
CT.pm
diff --git
a/SL/CT.pm
b/SL/CT.pm
index
37550e4
..
39c29b0
100644
(file)
--- a/
SL/CT.pm
+++ b/
SL/CT.pm
@@
-71,8
+71,8
@@
sub get_tuple {
$sth->finish;
#get name of currency instead of id:
$sth->finish;
#get name of currency instead of id:
- $query = qq|SELECT curr FROM currencies WHERE id=?|;
- ($form->{curr}) = selectrow_query($form, $dbh, $query, conv_i($form->{curr}));
+ $query = qq|SELECT
name AS
curr FROM currencies WHERE id=?|;
+ ($form->{curr}) = selectrow_query($form, $dbh, $query, conv_i($form->{curr
ency_id
}));
if ( $form->{salesman_id} ) {
my $query =
if ( $form->{salesman_id} ) {
my $query =
@@
-276,7
+276,7
@@
sub save_customer {
$query = qq|SELECT nextval('id')|;
($form->{id}) = selectrow_query($form, $dbh, $query);
$query = qq|SELECT nextval('id')|;
($form->{id}) = selectrow_query($form, $dbh, $query);
- $query = qq|INSERT INTO customer (id, name
) VALUES (?, ''
)|;
+ $query = qq|INSERT INTO customer (id, name
, currency_id) VALUES (?, '', (SELECT currency_id FROM defaults)
)|;
do_query($form, $dbh, $query, $form->{id});
}
do_query($form, $dbh, $query, $form->{id});
}
@@
-320,7
+320,7
@@
sub save_customer {
qq|user_password = ?, | .
qq|c_vendor_id = ?, | .
qq|klass = ?, | .
qq|user_password = ?, | .
qq|c_vendor_id = ?, | .
qq|klass = ?, | .
- qq|curr
= (SELECT id FROM currencies WHERE curr
= ?), | .
+ qq|curr
ency_id = (SELECT id FROM currencies WHERE name
= ?), | .
qq|taxincluded_checked = ? | .
qq|WHERE id = ?|;
my @values = (
qq|taxincluded_checked = ? | .
qq|WHERE id = ?|;
my @values = (
@@
-423,7
+423,7
@@
sub save_vendor {
$query = qq|SELECT nextval('id')|;
($form->{id}) = selectrow_query($form, $dbh, $query);
$query = qq|SELECT nextval('id')|;
($form->{id}) = selectrow_query($form, $dbh, $query);
- $query = qq|INSERT INTO vendor (id, name
) VALUES (?, ''
)|;
+ $query = qq|INSERT INTO vendor (id, name
, currency_id) VALUES (?, '', (SELECT currency_id FROM defaults)
)|;
do_query($form, $dbh, $query, $form->{id});
my $vendornumber = SL::TransNumber->new(type => 'vendor',
do_query($form, $dbh, $query, $form->{id});
my $vendornumber = SL::TransNumber->new(type => 'vendor',
@@
-472,7
+472,7
@@
sub save_vendor {
qq| username = ?, | .
qq| user_password = ?, | .
qq| v_customer_id = ?, | .
qq| username = ?, | .
qq| user_password = ?, | .
qq| v_customer_id = ?, | .
- qq| curr
= (SELECT id FROM currencies WHERE curr
= ?) | .
+ qq| curr
ency_id = (SELECT id FROM currencies WHERE name
= ?) | .
qq|WHERE id = ?|;
my @values = (
$form->{vendornumber},
qq|WHERE id = ?|;
my @values = (
$form->{vendornumber},