projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dokumentation für Flags in Variablen in Druckvorlagen
[kivitendo-erp.git]
/
SL
/
DO.pm
diff --git
a/SL/DO.pm
b/SL/DO.pm
index
f6c56b6
..
0d2a5ec
100644
(file)
--- a/
SL/DO.pm
+++ b/
SL/DO.pm
@@
-408,7
+408,7
@@
sub mark_orders_if_delivered {
'to_table' => 'delivery_orders',
'to_id' => $params{do_id});
'to_table' => 'delivery_orders',
'to_id' => $params{do_id});
- my
($oe_id) = $links[0]->{from_id} if (scalar @links)
;
+ my
$oe_id = @links ? $links[0]->{from_id} : undef
;
return $main::lxdebug->leave_sub() if (!$oe_id);
return $main::lxdebug->leave_sub() if (!$oe_id);
@@
-888,7
+888,9
@@
sub order_details {
}
}
}
}
- 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 };
}
$h_pg->finish();
}
$h_pg->finish();
@@
-1097,7
+1099,7
@@
sub get_shipped_qty {
my $all_units = AM->retrieve_all_units();
foreach my $entry (@{ $entries }) {
my $all_units = AM->retrieve_all_units();
foreach my $entry (@{ $entries }) {
- $entry->{qty} *=
$all_units->{$entry->{unit}}->{factor} / $all_units->{$entry->{partunit}}->{factor}
;
+ $entry->{qty} *=
AM->convert_unit($entry->{unit}, $entry->{partunit}, $all_units)
;
if (!$ship{$entry->{parts_id}}) {
$ship{$entry->{parts_id}} = $entry;
if (!$ship{$entry->{parts_id}}) {
$ship{$entry->{parts_id}} = $entry;