DBUpgrade: Warnings in Tests unterdrücken

[mfinanz.git] / SL / DB / Helper / FlattenToForm.pm

diff --git a/SL/DB/Helper/FlattenToForm.pm b/SL/DB/Helper/FlattenToForm.pm
index 0b2c5e93effee753ea4f6e28324848667c495d05..9c34958c86d46daca56adc45e3c4fff208289966 100644 (file)
--- a/SL/DB/Helper/FlattenToForm.pm
+++ b/SL/DB/Helper/FlattenToForm.pm
@@ -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;
     }
   }