Bug 1647 - Lieferanten-Einkaufspreise verlieren Nachkommastellen nicht mehr

diff --git a/SL/IC.pm b/SL/IC.pm
index b6007d9dce3e3aff60068730dd9e28b9b2466789..cf7c99c36e6b0c265cc4ba095b9727067307211f 100644 (file)
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -502,7 +502,7 @@ sub save {
       if (($form->{"make_$i"}) || ($form->{"model_$i"})) {
         #hli
         $value = $form->parse_amount($myconfig, $form->{"lastcost_$i"});
       if (($form->{"make_$i"}) || ($form->{"model_$i"})) {
         #hli
         $value = $form->parse_amount($myconfig, $form->{"lastcost_$i"});

-        if ($value == $form->{"old_lastcost_$i"})
+        if ($value == $form->parse_amount($myconfig, $form->{"old_lastcost_$i"}))

         {
             if ($form->{"lastupdate_$i"} eq "") {
                 $lastupdate = 'now()';
         {
             if ($form->{"lastupdate_$i"} eq "") {
                 $lastupdate = 'now()';


@@ -1663,7 +1663,7 @@ sub prepare_parts_for_printing {
   }
 
   my $placeholders = join ', ', ('?') x scalar(@part_ids);
   }
 
   my $placeholders = join ', ', ('?') x scalar(@part_ids);

-  my $query        = qq|SELECT mm.parts_id, mm.model, v.name AS make
+  my $query        = qq|SELECT mm.parts_id, mm.model, mm.lastcost, v.name AS make

                         FROM makemodel mm
                         LEFT JOIN vendor v ON (mm.make = v.id)
                         WHERE mm.parts_id IN ($placeholders)|;
                         FROM makemodel mm
                         LEFT JOIN vendor v ON (mm.make = v.id)
                         WHERE mm.parts_id IN ($placeholders)|;

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index e56178206e6cf03c600b6ee54683a997df3730cb..13e0a5ac285166c11f2eb3805b6023f7f8a45537 100644 (file)
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -1703,6 +1703,9 @@ 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};
 

+  # same for lastcosts
+  map { $form->{"lastcost_$_"} = $form->parse_amount(\%myconfig, $form->{"lastcost_$_"}) } 1 .. $form->{"makemodel_rows"};
+

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