nicht vorhandene Variable "approved_sellprice" entfernt

[kivitendo-erp.git] / SL / DB / Helper / FlattenToForm.pm

diff --git a/SL/DB/Helper/FlattenToForm.pm b/SL/DB/Helper/FlattenToForm.pm
index 7a3922c..dff9e1d 100644 (file)
--- a/SL/DB/Helper/FlattenToForm.pm
+++ b/SL/DB/Helper/FlattenToForm.pm
@@ -52,6 +52,13 @@ sub flatten_to_form {
   _copy($self->salesman,                $form, 'salesman_',     '', 0, map { $_->name } SL::DB::Employee->meta->columns)                   if _has($self, 'salesman_id');
   _copy($self->acceptance_confirmed_by, $form, 'acceptance_confirmed_by_', '', 0, map { $_->name } SL::DB::Employee->meta->columns)        if _has($self, 'acceptance_confirmed_by_id');
 
+  if (_has($self, 'employee_id')) {
+    my $user = User->new(login => $self->employee->login);
+    $form->{"employee_$_"} = $user->{$_} for qw(tel email fax);
+  }
+  # company is employee and login independent
+  $form->{"${_}_company"}  = $::instance_conf->get_company for qw (employee salesman);
+
   $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');
@@ -77,10 +84,11 @@ sub flatten_to_form {
 
     $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 assembly));
+    # TODO: is part_type correct here? Do we need to set part_type as default?
+    _copy($item->part,    $form, '',               "_${idx}", 0,               qw(id partnumber weight part_type));
     _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
+                                                                                  subtotal longdescription price_factor_id marge_price_factor 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));