Revert von Revision 2795: ic.pl enthielt Änderungen, die ich noch nicht committen...

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 86bddaa70deaa6a350c81959e381f76bebfc2dac..abd36a84d1f4f886c05afac37d9a605a14d77e5f 100644 (file)
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -1736,11 +1736,10 @@ sub generate_report {
     # fresh row, for inserting later
     my $row = { map { $_ => { 'data' => $ref->{$_} } } @columns };
 
     # fresh row, for inserting later
     my $row = { map { $_ => { 'data' => $ref->{$_} } } @columns };
 

-    $ref->{exchangerate} ||= 1;
-    $ref->{price_factor} ||= 1;
-    $ref->{sellprice}     *= $ref->{exchangerate} / $ref->{price_factor};
-    $ref->{listprice}     *= $ref->{exchangerate} / $ref->{price_factor};
-    $ref->{lastcost}      *= $ref->{exchangerate} / $ref->{price_factor};
+    $ref->{exchangerate}  = 1 unless $ref->{exchangerate};
+    $ref->{sellprice}    *= $ref->{exchangerate};
+    $ref->{listprice}    *= $ref->{exchangerate};
+    $ref->{lastcost}     *= $ref->{exchangerate};

 
     # use this for assemblies
     my $onhand = $ref->{onhand};
 
     # use this for assemblies
     my $onhand = $ref->{onhand};


@@ -1987,7 +1986,6 @@ sub form_header {
   my ($notdiscountableok, $notdiscountable);
   my ($formula, $formula_label, $imagelinks, $obsolete, $shopok, $shop);
 
   my ($notdiscountableok, $notdiscountable);
   my ($formula, $formula_label, $imagelinks, $obsolete, $shopok, $shop);
 

-  $form->get_lists('price_factors' => 'ALL_PRICE_FACTORS');

 
   map({ $form->{$_} = $form->format_amount(\%myconfig, $form->{$_}, -2) }
       qw(sellprice listprice lastcost gv));
 
   map({ $form->{$_} = $form->format_amount(\%myconfig, $form->{$_}, -2) }
       qw(sellprice listprice lastcost gv));


@@ -2328,22 +2326,6 @@ sub form_header {
     $unit_select .= AM->unit_select_html($units, "unit", $form->{"unit"});
   }
 
     $unit_select .= AM->unit_select_html($units, "unit", $form->{"unit"});
   }
 

-  my $price_factor;
-  if (0 < scalar @{ $form->{ALL_PRICE_FACTORS} }) {
-    my @values = ('', map { $_->{id}                      } @{ $form->{ALL_PRICE_FACTORS} });
-    my %labels =      map { $_->{id} => $_->{description} } @{ $form->{ALL_PRICE_FACTORS} };
-
-    $price_factor =
-        qq|<tr><th align="right">|
-      . $locale->text('Price Factor')
-      . qq|</th><td>|
-      . NTI($cgi->popup_menu('-name'    => 'price_factor_id',
-                             '-default' => $form->{price_factor_id},
-                             '-values'  => \@values,
-                             '-labels'  => \%labels))
-      . qq|</td></tr>|;
-  }
-

   $form->{fokus} = "ic.partnumber";
   $form->header;
 
   $form->{fokus} = "ic.partnumber";
   $form->header;
 


@@ -2457,7 +2439,6 @@ sub form_header {
                <td><input name=sellprice size=11 value=$form->{sellprice}></td>
              </tr>
              $lastcost
                <td><input name=sellprice size=11 value=$form->{sellprice}></td>
              </tr>
              $lastcost

-             $price_factor

              <tr>
                <th align="right" nowrap="true">| . $locale->text('Unit') . qq|</th>
                <td>$unit_select</td>
              <tr>
                <th align="right" nowrap="true">| . $locale->text('Unit') . qq|</th>
                <td>$unit_select</td>


@@ -2911,7 +2892,7 @@ sub save {
 
     # now take it apart and restore original values
     foreach my $item (split /&/, $previousform) {
 
     # now take it apart and restore original values
     foreach my $item (split /&/, $previousform) {

-      my ($key, $value) = split m/=/, $item, 2;
+      my ($key, $value) = split /=/, $item, 2;

       $value =~ s/%26/&/g;
       $form->{$key} = $value;
     }
       $value =~ s/%26/&/g;
       $form->{$key} = $value;
     }