X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FCVar.pm;h=f006fd9ca563fb81159e1ec947b150d546001b3b;hb=b8ee6b6ed46e55095b955ee1800b8a4b8d8ccc3f;hp=0264d8ab09ceadb707dc80006d6f7b081e6fccfd;hpb=36703a86a998c7c395f110f94b3b3feebc2a3a80;p=kivitendo-erp.git diff --git a/SL/CVar.pm b/SL/CVar.pm index 0264d8ab0..f006fd9ca 100644 --- a/SL/CVar.pm +++ b/SL/CVar.pm @@ -100,11 +100,12 @@ sub get_custom_variables { my $trans_id = $params{trans_id} ? 'OR (v.trans_id = ?) ' : ''; + my $sub_module = $params{sub_module} ? $params{sub_module} : ''; + my $q_var = qq|SELECT text_value, timestamp_value, timestamp_value::date AS date_value, number_value, bool_value FROM custom_variables - WHERE (config_id = ?) AND (trans_id = ?)|; - $q_var .= qq| AND (sub_module = ?)| if $params{sub_module}; + WHERE (config_id = ?) AND (trans_id = ?) AND (sub_module = ?)|; my $h_var = prepare_query($form, $dbh, $q_var); my $custom_variables = $self->get_configs(module => $params{module}); @@ -129,8 +130,7 @@ sub get_custom_variables { my ($act_var, $valid); if ($params{trans_id}) { - my @values = (conv_i($cvar->{id}), conv_i($params{trans_id})); - push @values, $params{sub_module} if $params{sub_module}; + my @values = (conv_i($cvar->{id}), conv_i($params{trans_id}), $sub_module); do_statement($form, $h_var, $q_var, @values); $act_var = $h_var->fetchrow_hashref();