From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 25 Jan 2011 10:31:21 +0000 (+0100)
Subject: "discount" auf "0" setzen, wenn gleich 0, und nicht formatiert auf "0,00"
X-Git-Tag: release-2.6.3~61^2~7^2~1^2~2^2~4
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=abc7d88b97193fe5c1c23071cd56b62e928b1fd9;p=kivitendo-erp.git

"discount" auf "0" setzen, wenn gleich 0, und nicht formatiert auf "0,00"

Zwecks Kompatibilität mit Druckvariante im Legacy-Code.
---

diff --git a/SL/DB/Helper/FlattenToForm.pm b/SL/DB/Helper/FlattenToForm.pm
index 9fc9b5c22..35480d4d9 100644
--- a/SL/DB/Helper/FlattenToForm.pm
+++ b/SL/DB/Helper/FlattenToForm.pm
@@ -49,7 +49,8 @@ sub flatten_to_form {
   $form->{rowcount}   = scalar(@{ $self->items });
 
   my $idx = 0;
-  my $format_amounts = $params{format_amounts};
+  my $format_amounts = $params{format_amounts} ? 1 : 0;
+  my $format_notnull = $params{format_amounts} ? 2 : 0;
   foreach my $item (@{ $self->items }) {
     next if _has($item, 'assemblyitem');
 
@@ -57,9 +58,10 @@ sub flatten_to_form {
 
     $form->{"id_${idx}"}     = $item->parts_id;
     $form->{"number_${idx}"} = $item->part->partnumber;
-    _copy($item,          $form, '',         "_${idx}", 0,              qw(description project_id ship serialnumber pricegroup_id ordnumber cusordnumber unit
+    _copy($item,          $form, '',        "_${idx}", 0,               qw(description project_id ship serialnumber pricegroup_id ordnumber cusordnumber unit
                                                                            subtotal longdescription price_factor_id marge_price_factor approved_sellprice reqdate transdate));
-    _copy($item,          $form, '',        "_${idx}", $format_amounts, qw(qty sellprice discount marge_total marge_percent lastcost));
+    _copy($item,          $form, '',        "_${idx}", $format_amounts, qw(qty sellprice marge_total marge_percent lastcost));
+    _copy($item,          $form, '',        "_${idx}", $format_notnull, 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}");
@@ -78,8 +80,11 @@ sub _has {
 sub _copy {
   my ($src, $form, $prefix, $postfix, $format_amounts, @columns) = @_;
 
-  map { $form->{"${prefix}${_}${postfix}"} = ref($src->$_) eq 'DateTime' ? $src->$_->to_lxoffice : $src->$_ if $src->can($_) } @columns if !$format_amounts;
-  map { $form->{"${prefix}${_}${postfix}"} = $::form->format_amount(\%::myconfig, $src->$_ * 1, 2) if $src->can($_)          } @columns if  $format_amounts;
+  @columns = grep { $src->can($_) } @columns;
+
+  map { $form->{"${prefix}${_}${postfix}"} = ref($src->$_) eq 'DateTime' ? $src->$_->to_lxoffice : $src->$_            } @columns if !$format_amounts;
+  map { $form->{"${prefix}${_}${postfix}"} =                $::form->format_amount(\%::myconfig, $src->$_ * 1, 2)      } @columns if  $format_amounts == 1;
+  map { $form->{"${prefix}${_}${postfix}"} = $src->$_ * 1 ? $::form->format_amount(\%::myconfig, $src->$_ * 1, 2) : 0  } @columns if  $format_amounts == 2;
 
   return $src;
 }