X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDO.pm;h=49dbb9f4ddd8ea5ef98d3b9569f065268caceb4b;hb=1c603341fc02e3a5a7b5126cd7df6478d2e34700;hp=e847f5e3387556fbde2a681a68c809e6fb8e5dbd;hpb=566d2e3d39ec9f699aeb32b244ccb912b4c90718;p=kivitendo-erp.git diff --git a/SL/DO.pm b/SL/DO.pm index e847f5e33..49dbb9f4d 100644 --- a/SL/DO.pm +++ b/SL/DO.pm @@ -41,6 +41,7 @@ use SL::Common; use SL::CVar; use SL::DBUtils; use SL::RecordLinks; +use SL::IC; sub transactions { $main::lxdebug->enter_sub(); @@ -80,10 +81,10 @@ sub transactions { } if ($form->{project_id}) { - $query .= + push @where, qq|(dord.globalproject_id = ?) OR EXISTS (SELECT * FROM delivery_order_items doi - WHERE (doi.project_id = ?) AND (oi.delivery_order_id = dord.id))|; + WHERE (doi.project_id = ?) AND (doi.delivery_order_id = dord.id))|; push @values, conv_i($form->{project_id}), conv_i($form->{project_id}); } @@ -659,7 +660,7 @@ sub retrieve { doi.reqdate, doi.project_id, doi.serialnumber, doi.lastcost, doi.ordnumber, doi.transdate, doi.cusordnumber, doi.longdescription, doi.price_factor_id, doi.price_factor, doi.marge_price_factor, - pr.projectnumber, + pr.projectnumber, dord.transdate AS dord_transdate, pg.partsgroup FROM delivery_order_items doi JOIN parts p ON (doi.parts_id = p.id) @@ -777,12 +778,17 @@ sub order_details { my $ic_cvar_configs = CVar->get_configs(module => 'IC'); + $form->{TEMPLATE_ARRAYS} = { }; + IC->prepare_parts_for_printing(); + my @arrays = qw(runningnumber number description longdescription qty unit partnotes serialnumber reqdate projectnumber si_runningnumber si_number si_description si_warehouse si_bin si_chargenumber si_qty si_unit); + map { $form->{TEMPLATE_ARRAYS}->{$_} = [] } (@arrays, @tax_arrays); + push @arrays, map { "ic_cvar_$_->{name}" } @{ $ic_cvar_configs }; my $sameitem = "";