X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/da99c7bcf4a8ec82d9bc1d0c75aaba6ba4cd69ea..d259fd6622ef7b39fe643bb561bc58a44f5257b0:/SL/DO.pm diff --git a/SL/DO.pm b/SL/DO.pm index 841f454db..17d896f6e 100644 --- a/SL/DO.pm +++ b/SL/DO.pm @@ -663,7 +663,7 @@ sub retrieve { # stuff different from the whole will not be overwritten, but saved with a suffix. $query = qq|SELECT doi.id AS delivery_order_items_id, - p.partnumber, p.assembly, doi.description, doi.qty, + p.partnumber, p.assembly, p.listprice, doi.description, doi.qty, doi.sellprice, doi.parts_id AS id, doi.unit, doi.discount, p.bin, p.notes AS partnotes, doi.reqdate, doi.project_id, doi.serialnumber, doi.lastcost, doi.ordnumber, doi.transdate, doi.cusordnumber, doi.longdescription, @@ -860,7 +860,6 @@ sub order_details { $sameitem = ($ref->{partsgroup}) ? $ref->{partsgroup} : "--"; push(@{ $form->{description} }, $sameitem); } - push(@{ $form->{description} }, $form->format_amount($myconfig, $ref->{qty} * $form->{"qty_$i"}) . qq|, $ref->{partnumber}, $ref->{description}|); map({ push(@{ $form->{$_} }, "") } grep({ $_ ne "description" } @arrays)); @@ -889,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();