projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Controller-Base: _controller_name in controller_name umbenennen; action_name() ergänzt
[kivitendo-erp.git]
/
SL
/
OE.pm
diff --git
a/SL/OE.pm
b/SL/OE.pm
index
5bf2a3d
..
07758a8
100644
(file)
--- a/
SL/OE.pm
+++ b/
SL/OE.pm
@@
-190,7
+190,7
@@
SQL
}
if ($form->{periodic_invoices_active} ne $form->{periodic_invoices_inactive}) {
}
if ($form->{periodic_invoices_active} ne $form->{periodic_invoices_inactive}) {
- my $not =
'NOT' if ($form->{periodic_invoices_inactive})
;
+ my $not =
$form->{periodic_invoices_inactive} ? 'NOT' : ''
;
$query .= qq| AND ${not} COALESCE(pcfg.active, 'f')|;
}
$query .= qq| AND ${not} COALESCE(pcfg.active, 'f')|;
}
@@
-725,9
+725,6
@@
sub retrieve {
my ($query, $query_add, @values, @ids, $sth);
my ($query, $query_add, @values, @ids, $sth);
- my $ic_cvar_configs = CVar->get_configs(module => 'IC',
- dbh => $dbh);
-
# translate the ids (given by id_# and trans_id_#) into one array of ids, so we can join them later
map {
push @ids, $form->{"trans_id_$_"}
# translate the ids (given by id_# and trans_id_#) into one array of ids, so we can join them later
map {
push @ids, $form->{"trans_id_$_"}
@@
-1296,7
+1293,9
@@
sub order_details {
$sth->finish;
}
$sth->finish;
}
- map { push @{ $form->{TEMPLATE_ARRAYS}->{"ic_cvar_$_->{name}"} }, $form->{"ic_cvar_$_->{name}_$i"} } @{ $ic_cvar_configs };
+ push @{ $form->{TEMPLATE_ARRAYS}->{"ic_cvar_$_->{name}"} },
+ CVar->format_to_template(CVar->parse($form->{"ic_cvar_$_->{name}_$i"}, $_), $_)
+ for @{ $ic_cvar_configs };
}
}
}
}