X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/7933b6bd762c5bac0f0a6bc401ede33c30ece67b..58b14f96d6a7aab3bad2ffac3f8930793cf15a09:/SL/IS.pm

diff --git a/SL/IS.pm b/SL/IS.pm
index c5950b15a..8643eaef2 100644
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -214,7 +214,7 @@ sub invoice_details {
           $taxbase{$item} += $taxbase;
         }
       }
-      $tax_rate = $taxrate*100;
+      $tax_rate = $taxrate * 100;
       push(@{ $form->{tax_rate} }, qq|$tax_rate|);
       if ($form->{"assembly_$i"}) {
         $sameitem = "";
@@ -368,7 +368,7 @@ sub customer_details {
 
 sub post_invoice {
   $main::lxdebug->enter_sub();
-print STDERR "IS.pm-post_invoice\n";
+
   my ($self, $myconfig, $form) = @_;
 
   # connect to database, turn off autocommit
@@ -552,7 +552,6 @@ print STDERR "IS.pm-post_invoice\n";
         ? qq|'$form->{"deliverydate_$i"}'|
         : "NULL";
 
-
       # get pricegroup_id and save ist
       ($null, my $pricegroup_id) = split /--/, $form->{"sellprice_drag_$i"};
       $pricegroup_id *= 1;
@@ -1114,7 +1113,7 @@ sub delete_invoice {
 
 sub retrieve_invoice {
   $main::lxdebug->enter_sub();
-print STDERR "IS.pm-retrieve_invoice\n";
+
   my ($self, $myconfig, $form) = @_;
 
   # connect to database
@@ -1532,11 +1531,11 @@ sub retrieve_item {
 ##########################
 # get pricegroups from database
 # build up selected pricegroup
-# if an exchange rate - change price 
+# if an exchange rate - change price
 # for each part
 #
 sub get_pricegroups_for_parts {
-print STDERR "IS.pm - get_pricegroups_for_parts\n";
+
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
@@ -1555,111 +1554,85 @@ print STDERR "IS.pm - get_pricegroups_for_parts\n";
       $id = $form->{"new_id_$i"};
     }
 
-    ($price, $selectedpricegroup_id) = split /--/, $form->{"sellprice_drag_$i"};
-#  print (STDERR "sellprice_drag_$i", Dumper($form->{"sellprice_drag_$i"}));
+    ($price, $selectedpricegroup_id) = split /--/,
+      $form->{"sellprice_drag_$i"};
 
     $pricegroup_old = $form->{"pricegroup_old_$i"};
-#  print (STDERR "pricegroup_old_i-$i", Dumper($pricegroup_old));
 
     $price_new = $form->{"price_new_$i"};
 
     $price_old = $form->{"price_old_$i"};
 
- 
-    $query = qq|SELECT pricegroup_id, (SELECT p.sellprice from parts p where p.id = $id) as default_sellprice,(SELECT pg.pricegroup FROM pricegroup pg WHERE id=pricegroup_id) AS pricegroup, price, '' AS selected FROM prices WHERE parts_id = $id UNION SELECT 0 as pricegroup_id,(SELECT sellprice FROM parts WHERE id=$id) as default_sellprice,'' as pricegroup, (SELECT DISTINCT sellprice from parts where id=$id) as price, 'selected' AS selected from prices ORDER BY pricegroup|;
+    $query =
+      qq|SELECT pricegroup_id, (SELECT p.sellprice from parts p where p.id = $id) as default_sellprice,(SELECT pg.pricegroup FROM pricegroup pg WHERE id=pricegroup_id) AS pricegroup, price, '' AS selected FROM prices WHERE parts_id = $id UNION SELECT 0 as pricegroup_id,(SELECT sellprice FROM parts WHERE id=$id) as default_sellprice,'' as pricegroup, (SELECT DISTINCT sellprice from parts where id=$id) as price, 'selected' AS selected from prices ORDER BY pricegroup|;
 
     $pkq = $dbh->prepare($query);
     $pkq->execute || $form->dberror($query);
     while ($pkr = $pkq->fetchrow_hashref(NAME_lc)) {
-#       push @{ $form->{PRICES}{$id} }, $pkr;
-        push @{ $form->{PRICES}{$i} }, $pkr;
-        $pkr->{id} = $id;
-        $pkr->{selected}  = '';
 
-    # if there is an exchange rate change price
+      #       push @{ $form->{PRICES}{$id} }, $pkr;
+      push @{ $form->{PRICES}{$i} }, $pkr;
+      $pkr->{id}       = $id;
+      $pkr->{selected} = '';
+
+      # if there is an exchange rate change price
       if (($form->{exchangerate} * 1) != 0) {
-# print STDERR "WECHSELKURS?-$form->{exchangerate}\n";
+
         $pkr->{price} /= $form->{exchangerate};
       }
-      $pkr->{price} = $form->format_amount($myconfig,$pkr->{price},5);
-
+      $pkr->{price} = $form->format_amount($myconfig, $pkr->{price}, 5);
 
       if ($selectedpricegroup_id eq undef) {
         if ($pkr->{pricegroup_id} eq $form->{customer_klass}) {
-print STDERR "   INIT ROW \n";
-#print (STDERR "   PREIS", Dumper($pkr->{price}));
+
           $pkr->{selected}  = ' selected';
           $last->{selected} = '';
-# print (STDERR "   SELLPRICE", Dumper($form->{"sellprice_$i"}));
 
-        # no customer pricesgroup set 
+          # no customer pricesgroup set
           if ($pkr->{price} == $pkr->{default_sellprice}) {
-print (STDERR "   PREIS IST DEFAULT-SELLPRICE", Dumper($form->{"sellprice_$i"}));
-           $pkr->{price} = $form->{"sellprice_$i"};
 
-#  if ($form->{tradediscount}){
-#  print (STDERR "TRADE--", Dumper($pkr->{price}));
-#               $pkr->{price} =$pkr->{price} * (1 - $form->{tradediscount});
-#               $pkr->{price} = $form->format_amount($myconfig,$pkr->{price},5);
-#  print (STDERR "TRADE--", Dumper($pkr->{price}));
-#  }
+            $pkr->{price} = $form->{"sellprice_$i"};
 
           } else {
-print STDERR "   PREIS IST NICHT NULL\n";
-             $form->{"sellprice_$i"} = $pkr->{price};
+
+            $form->{"sellprice_$i"} = $pkr->{price};
           }
-# print (STDERR "           PRICE", Dumper($pkr->{price}));
 
         } else {
-print STDERR "   INIT ROW but what\n";
-print (STDERR "   PREIS -", Dumper($pkr->{price}), "Default", Dumper($pkr->{default_sellprice}));
           if ($pkr->{price} == $pkr->{default_sellprice}) {
-print (STDERR "   PREIS IST DEFAULT-", Dumper($form->{"sellprice_$i"}));
-            $pkr->{price} = $form->{"sellprice_$i"};
-            $pkr->{selected}                    = ' selected';
+
+            $pkr->{price}    = $form->{"sellprice_$i"};
+            $pkr->{selected} = ' selected';
           }
         }
       }
-      if ($selectedpricegroup_id or $selectedpricegroup_id == 0){
+      if ($selectedpricegroup_id or $selectedpricegroup_id == 0) {
         if ($selectedpricegroup_id ne $pricegroup_old) {
           if ($pkr->{pricegroup_id} eq $selectedpricegroup_id) {
             if ($price_new != $form->{"sellprice_$i"}) {
-print STDERR "   MANUELLEN PREIS WÄHLEN\n";
             } else {
-print STDERR "   UPDATE CHANGE PRICEGROUP\n";
-              $pkr->{selected}                    = ' selected';
-              $last->{selected}                   = '';
-#$form->{"pricegroup_old_$i"} = $pkr->{$pricegroup_id};
+              $pkr->{selected}  = ' selected';
+              $last->{selected} = '';
             }
           }
-        } else { 
+        } else {
           if (($price_new != $form->{"sellprice_$i"}) and ($price_new ne 0)) {
             if ($pkr->{pricegroup_id} == 0) {
-print STDERR "   UPDATE CHANGE PRICEGROUP with price manuelly\n";
-print (STDERR "  SELLPRICE??? ---", Dumper($form->{"sellprice_$i"}));
-print (STDERR "  NEWPRICE??? ---", Dumper($price_new));
-              $pkr->{price} = $form->{"sellprice_$i"};
-              $pkr->{selected}                    = ' selected';
-              $last->{selected}                   = '';
-       #$form->{"sellprice_$i"} = $form->format_amount($myconfig, $price_new, 2);
-# print (STDERR "----5555---", Dumper($pkr));
+              $pkr->{price}     = $form->{"sellprice_$i"};
+              $pkr->{selected}  = ' selected';
+              $last->{selected} = '';
             }
           } else {
             if ($pkr->{pricegroup_id} eq $selectedpricegroup_id) {
-print STDERR "   UPDATE NO CHANGE\n";
-              $pkr->{selected}                    = ' selected';
-              $last->{selected}                   = '';
-print STDERR "  DEFAULTPRICE??? ---$pkr->{default_sellprice}\n";
-print (STDERR "  SELLPRICE??? ---", Dumper($form->{"sellprice_$i"}));
-# print (STDERR "  HIER DER SELLPRICE DEFAULT??? ---", Dumper($form));
-print STDERR "  NEWPRICE??? ---$price_new_\n";
-              if (($pkr->{pricegroup_id} == 0) and ($pkr->{price} == $form->{"sellprice_$i"})) {
-print (STDERR "  UPDATE NO CHANGE BUT PRICE MANUELLY SET", Dumper($pkr->{price}));
+              $pkr->{selected}  = ' selected';
+              $last->{selected} = '';
+              if (    ($pkr->{pricegroup_id} == 0)
+                  and ($pkr->{price} == $form->{"sellprice_$i"})) {
+
                 # $pkr->{price}                         = $form->{"sellprice_$i"};
-              } else {
+                  } else {
                 $pkr->{price} = $form->{"sellprice_$i"};
               }
-#print (STDERR "   FEHLER", Dumper($form->{"sellprice_$i"}));
             }
           }
         }
@@ -1672,8 +1645,6 @@ print (STDERR "  UPDATE NO CHANGE BUT PRICE MANUELLY SET", Dumper($pkr->{price})
 
   $dbh->disconnect;
 
-#        print (STDERR "TEST", Dumper($form->{PRICES}));
-# print (STDERR "TEST id_$i", Dumper($form->{"id_$i"}));
   $main::lxdebug->leave_sub();
 }