From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 19 Nov 2012 08:51:50 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta2~11^2~6
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/5931bb01914a73d37c0cb415ff8809f0c720c666?hp=69ff27ee9f54215f1c6e7e9ff983e842516f68e3

Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
---

diff --git a/SL/IS.pm b/SL/IS.pm
index 554bddc4d..edc02d9c3 100644
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -2136,12 +2136,14 @@ sub get_pricegroups_for_parts {
 
           $pkr->{selected}  = ' selected'; # unless $form->{selected};
           # no customer pricesgroup set
-          if ($pkr->{price_unfmt} == $pkr->{default_sellprice} || $form->{'sellprice_'.$i} * 1 > 1) {
+          if ($pkr->{price_unfmt} == $pkr->{default_sellprice}) {
 
             $pkr->{price} = $form->{"sellprice_$i"};
 
           } else {
 
+# this sub should not set anything and only return. --sschoeling, 20090506
+# is this correct? put in again... -- grichardson 20110119
             $form->{"sellprice_$i"} = $pkr->{price};
           }