From: Jan Büren <jan@lx-office-hosting.de>
Date: Wed, 3 Mar 2010 13:29:36 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.1beta1~48
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/964b978f634c75359b1f55a134a36b66f6dd822c?hp=-c

Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
---

964b978f634c75359b1f55a134a36b66f6dd822c
diff --combined bin/mozilla/oe.pl
index e6ec1f943,fd019eedc..cd7c1eeab
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@@ -558,7 -558,7 +558,7 @@@ sub update 
      $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"$form->{vc}_discount"} * 100);
  
      if ($rows) {
-       $form->{"qty_$i"} = 1 unless ($form->{"qty_$i"});
+       $form->{"qty_$i"} = 1 unless ($form->parse_amount(\%myconfig, $form->{"qty_$i"}));
  
        if ($rows > 1) {
  
@@@ -1777,17 -1777,14 +1777,17 @@@ sub poso 
  
    map { $form->{$_} = $saved_vars{$_} } keys %saved_vars;
  
 -  &prepare_order;
 -
    # prepare_order assumes that the discount is in db-notation (0.05) and not user-notation (5)
 -  # and therefore multiplies the values by 100 in the case of reading from db or making an order from several quotation, so we convert this back into percent-notation for the user interface by multiplying with 0.01
 +  # and therefore multiplies the values by 100 in the case of reading from db or making an order
 +  # from several quotation, so we convert this back into percent-notation for the user interface by multiplying with 0.01
 +  # ergänzung 03.10.2010 muss vor prepare_order passieren (s.a. Svens Kommentar zu Bug 1017)
 +  # das parse_amount wird oben schon ausgeführt, deswegen an dieser stelle raus (wichtig: kommawerte bei discount testen)
    for my $i (1 .. $form->{rowcount}) {
 -    $form->{"discount_$i"}  = $form->format_amount(\%myconfig, $form->{"discount_$i"} * 0.01);
 +    $form->{"discount_$i"} /=100;
    };
  
 +  &prepare_order;
 +
    # format amounts
    for my $i (1 .. $form->{rowcount} - 1) {
      map { $form->{"${_}_$i"} =~ s/\"/&quot;/g } qw(partnumber description unit);