Artikelstammdatenmaske: bei "Erneuern" Fließkommazahlen exakt einmal parsen

Fixt #2341.

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index cfe6451d7e1ba88caf1886f2fd43e0d2c1fdef39..267c427b6db52bc545976729f08543ab28e62b3b 100644 (file)
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -1773,14 +1773,18 @@ sub update {
 
   # parse pricegroups. and no, don't rely on check_form for this...
   map { $form->{"price_$_"} = $form->parse_amount(\%myconfig, $form->{"price_$_"}) } 1 .. $form->{price_rows};
 
   # parse pricegroups. and no, don't rely on check_form for this...
   map { $form->{"price_$_"} = $form->parse_amount(\%myconfig, $form->{"price_$_"}) } 1 .. $form->{price_rows};

-  $form->{sellprice} = $form->parse_amount(\%myconfig, $form->{sellprice});
+  $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) for qw(sellprice listprice ve gv);
+
+  if ($form->{item} eq 'part') {
+    $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) for qw(weight rop);
+  }

 
   # same for makemodel lastcosts
   # but parse_amount not necessary for assembly component lastcosts
   unless ($form->{item} eq "assembly") {
     map { $form->{"lastcost_$_"} = $form->parse_amount(\%myconfig, $form->{"lastcost_$_"}) } 1 .. $form->{"makemodel_rows"};
 
   # same for makemodel lastcosts
   # but parse_amount not necessary for assembly component lastcosts
   unless ($form->{item} eq "assembly") {
     map { $form->{"lastcost_$_"} = $form->parse_amount(\%myconfig, $form->{"lastcost_$_"}) } 1 .. $form->{"makemodel_rows"};

-  };
-  $form->{listprice} = $form->parse_amount(\%myconfig, $form->{listprice});
+    $form->{lastcost} = $form->parse_amount(\%myconfig, $form->{lastcost});
+  }

 
   if ($form->{item} eq "assembly") {
     my $i = $form->{assembly_rows};
 
   if ($form->{item} eq "assembly") {
     my $i = $form->{assembly_rows};

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 0ca15d4e26e465f7b507df7ca621a2aea86c8de8..8f2882e04fc3cb1ae724f02fb83095adec8049b7 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -669,11 +669,7 @@ sub check_form {
   my $count = 0;
 
   # remove any makes or model rows
   my $count = 0;
 
   # remove any makes or model rows

-  if ($form->{item} eq 'part') {
-    map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
-      qw(listprice sellprice lastcost weight rop);
-
-  } elsif ($form->{item} eq 'assembly') {
+  if ($form->{item} eq 'assembly') {

 
     # fuer assemblies auskommentiert. seiteneffekte? ;-) wird die woanders benoetigt?
     #$form->{sellprice} = 0;
 
     # fuer assemblies auskommentiert. seiteneffekte? ;-) wird die woanders benoetigt?
     #$form->{sellprice} = 0;


@@ -706,10 +702,7 @@ sub check_form {
     $form->redo_rows(\@flds, \@a, $count, $form->{assembly_rows});
     $form->{assembly_rows} = $count;
 
     $form->redo_rows(\@flds, \@a, $count, $form->{assembly_rows});
     $form->{assembly_rows} = $count;
 

-  } elsif ($form->{item} eq 'service') {
-    map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(listprice sellprice lastcost);
-
-  } else {
+  } elsif ($form->{item} !~ m{^(?:part|service)$}) {

     remove_emptied_rows(1);
 
     $form->{creditremaining} -= &invoicetotal;
     remove_emptied_rows(1);
 
     $form->{creditremaining} -= &invoicetotal;