X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FDB%2FHelper%2FFlattenToForm.pm;h=9cf2d119f773a02f791f575f37f202eca7e93656;hb=ae87c27e82eaa39a78e2380c9c069abe674ced86;hp=0b2c5e93effee753ea4f6e28324848667c495d05;hpb=de7609414010f5dfa6c47091633a6319d0106c48;p=kivitendo-erp.git

diff --git a/SL/DB/Helper/FlattenToForm.pm b/SL/DB/Helper/FlattenToForm.pm
index 0b2c5e93e..9cf2d119f 100644
--- a/SL/DB/Helper/FlattenToForm.pm
+++ b/SL/DB/Helper/FlattenToForm.pm
@@ -16,7 +16,7 @@ sub flatten_to_form {
 
   _copy($self, $form, '', '', 0, qw(id type taxzone_id ordnumber quonumber invnumber donumber cusordnumber taxincluded shippingpoint shipvia notes intnotes cp_id
                                     employee_id salesman_id closed department_id language_id payment_id delivery_customer_id delivery_vendor_id shipto_id proforma
-                                    globalproject_id delivered transaction_description container_type accepted_by_customer invoice terms storno storno_id dunning_config_id
+                                    globalproject_id delivered transaction_description container_type accepted_by_customer invoice storno storno_id dunning_config_id
                                     orddate quodate reqdate gldate duedate deliverydate datepaid transdate delivery_term_id));
   $form->{currency} = $form->{curr} = $self->currency_id ? $self->currency->name || '' : '';
 
@@ -62,7 +62,7 @@ sub flatten_to_form {
 
     $form->{"partsgroup_${idx}"} = $item->part->partsgroup->partsgroup if _has($item->part, 'partsgroup_id');
     _copy($item->part,    $form, '',        "_${idx}", 0,               qw(id partnumber weight));
-    _copy($item->part,    $form, '',        "_${idx}", $format_amounts, qw(listprice));
+    _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));
     _copy($item,          $form, '',        "_${idx}", $format_amounts, qw(qty sellprice marge_total marge_percent lastcost));
@@ -72,8 +72,9 @@ sub flatten_to_form {
     _copy_custom_variables($item, $form, 'ic_cvar_', "_${idx}");
 
     if (ref($self) eq 'SL::DB::Invoice') {
-      $form->{"deliverydate_oe_${idx}"} = $item->deliverydate->to_lxoffice;
-      $form->{"reqdate_${idx}"}         = $item->deliverydate->to_lxoffice;
+      my $date                          = $item->deliverydate ? $item->deliverydate->to_lxoffice : undef;
+      $form->{"deliverydate_oe_${idx}"} = $date;
+      $form->{"reqdate_${idx}"}         = $date;
     }
   }