X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FHelper%2FFlattenToForm.pm;h=09966e0ac93147a213299abfc802931af603e6fc;hb=3e0ecaf37c67f6bdcfecede665ffbc04a2806194;hp=8beccf22ed7ff5d621d4188d281176ff0700d294;hpb=995e58424f9ed6d45ce5cd03ec8120f98c06df1e;p=kivitendo-erp.git diff --git a/SL/DB/Helper/FlattenToForm.pm b/SL/DB/Helper/FlattenToForm.pm index 8beccf22e..09966e0ac 100644 --- a/SL/DB/Helper/FlattenToForm.pm +++ b/SL/DB/Helper/FlattenToForm.pm @@ -47,6 +47,7 @@ sub flatten_to_form { $form->{employee} = $self->employee->name if _has($self, 'employee_id'); $form->{language} = $self->language->template_code if _has($self, 'language_id'); $form->{department} = $self->department->description if _has($self, 'department_id'); + $form->{business} = $self->$vc->business->description if _has($self->$vc, 'business_id'); $form->{rowcount} = scalar(@{ $self->items }); my $items_name = ref($self) eq 'SL::DB::Order' ? 'orderitems' @@ -65,16 +66,16 @@ sub flatten_to_form { $idx++; $form->{"partsgroup_${idx}"} = $item->part->partsgroup->partsgroup if _has($item->part, 'partsgroup_id'); - _copy($item, $form, "${items_name}_", "_${idx}", 0, qw(id)) if $items_name; - _copy($item->part, $form, '', "_${idx}", 0, qw(id partnumber weight)); - _copy($item->part, $form, '', "_${idx}", 0, qw(listprice)); - _copy($item, $form, '', "_${idx}", 0, qw(description project_id ship serialnumber pricegroup_id ordnumber donumber cusordnumber unit - subtotal longdescription price_factor_id marge_price_factor approved_sellprice reqdate transdate - active_price_source active_discount_source)); - _copy($item, $form, '', "_${idx}", $format_noround, qw(qty sellprice)); - _copy($item, $form, '', "_${idx}", $format_amounts, qw(marge_total marge_percent lastcost)); - _copy($item, $form, '', "_${idx}", $format_percent, qw(discount)); - _copy($item->project, $form, 'project', "_${idx}", 0, qw(number description)) if _has($item, 'project_id'); + _copy($item, $form, "${items_name}_", "_${idx}", 0, qw(id)) if $items_name; + _copy($item->part, $form, '', "_${idx}", 0, qw(id partnumber weight)); + _copy($item->part, $form, '', "_${idx}", 0, qw(listprice)); + _copy($item, $form, '', "_${idx}", 0, qw(description project_id ship serialnumber pricegroup_id ordnumber donumber cusordnumber unit + subtotal longdescription price_factor_id marge_price_factor approved_sellprice reqdate transdate + active_price_source active_discount_source)); + _copy($item, $form, '', "_${idx}", $format_noround, qw(qty sellprice)); + _copy($item, $form, '', "_${idx}", $format_amounts, qw(marge_total marge_percent lastcost)); + _copy($item, $form, '', "_${idx}", $format_percent, qw(discount)); + _copy($item->project, $form, 'project', "_${idx}", 0, qw(number description)) if _has($item, 'project_id'); _copy_custom_variables($item, $form, 'ic_cvar_', "_${idx}");