Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision df0ca1fe

Von Moritz Bunkus vor mehr als 11 Jahren hinzugefügt

  • ID df0ca1fe6013573e9ff37f262018ec9a5318b4ea
  • Vorgänger 66f7ff40
  • Nachfolger 5ea712a2

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

Fixt #2341.

Unterschiede anzeigen:

bin/mozilla/ic.pl
1773 1773

  
1774 1774
  # parse pricegroups. and no, don't rely on check_form for this...
1775 1775
  map { $form->{"price_$_"} = $form->parse_amount(\%myconfig, $form->{"price_$_"}) } 1 .. $form->{price_rows};
1776
  $form->{sellprice} = $form->parse_amount(\%myconfig, $form->{sellprice});
1776
  $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) for qw(sellprice listprice ve gv);
1777

  
1778
  if ($form->{item} eq 'part') {
1779
    $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) for qw(weight rop);
1780
  }
1777 1781

  
1778 1782
  # same for makemodel lastcosts
1779 1783
  # but parse_amount not necessary for assembly component lastcosts
1780 1784
  unless ($form->{item} eq "assembly") {
1781 1785
    map { $form->{"lastcost_$_"} = $form->parse_amount(\%myconfig, $form->{"lastcost_$_"}) } 1 .. $form->{"makemodel_rows"};
1782
  };
1783
  $form->{listprice} = $form->parse_amount(\%myconfig, $form->{listprice});
1786
    $form->{lastcost} = $form->parse_amount(\%myconfig, $form->{lastcost});
1787
  }
1784 1788

  
1785 1789
  if ($form->{item} eq "assembly") {
1786 1790
    my $i = $form->{assembly_rows};
bin/mozilla/io.pl
669 669
  my $count = 0;
670 670

  
671 671
  # remove any makes or model rows
672
  if ($form->{item} eq 'part') {
673
    map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
674
      qw(listprice sellprice lastcost weight rop);
675

  
676
  } elsif ($form->{item} eq 'assembly') {
672
  if ($form->{item} eq 'assembly') {
677 673

  
678 674
    # fuer assemblies auskommentiert. seiteneffekte? ;-) wird die woanders benoetigt?
679 675
    #$form->{sellprice} = 0;
......
706 702
    $form->redo_rows(\@flds, \@a, $count, $form->{assembly_rows});
707 703
    $form->{assembly_rows} = $count;
708 704

  
709
  } elsif ($form->{item} eq 'service') {
710
    map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(listprice sellprice lastcost);
711

  
712
  } else {
705
  } elsif ($form->{item} !~ m{^(?:part|service)$}) {
713 706
    remove_emptied_rows(1);
714 707

  
715 708
    $form->{creditremaining} -= &invoicetotal;

Auch abrufbar als: Unified diff