X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FIC.pm;h=7f076072a20a4ae76c1ab68b3c7c57a86d9ec12f;hb=0b749d12146e361b25af606af074438d71282954;hp=1ef9dd18e0d6a0c85446a8af5131b8b1410e87e1;hpb=66881e5e25590cf9a71b2df6f408efaad144c984;p=kivitendo-erp.git

diff --git a/SL/IC.pm b/SL/IC.pm
index 1ef9dd18e..7f076072a 100644
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -370,9 +370,7 @@ sub save {
   $form->{onhand}   *= 1;
   $form->{ve}       *= 1;
   $form->{ge}       *= 1;
-  $form->{alu}       *= 1;
   $form->{buchungsgruppen_id}       *= 1;
-  $form->{adr_id}       *= 1;
   $form->{not_discountable}       *= 1;
   $form->{payment_id}       *= 1;
 
@@ -491,7 +489,6 @@ sub save {
 	      rop = $form->{rop},
 	      bin = '$form->{bin}',
 	      buchungsgruppen_id = '$form->{buchungsgruppen_id}',
-	      adr_id = '$form->{adr_id}',
 	      payment_id = '$form->{payment_id}',
 	      inventory_accno_id = (SELECT c.id FROM chart c
 				    WHERE c.accno = '$form->{inventory_accno}'),
@@ -505,7 +502,6 @@ sub save {
 	      shop = '$form->{shop}',
               ve = '$form->{ve}',
               gv = '$form->{gv}',
-              alu = '$form->{alu}',
               not_discountable = '$form->{not_discountable}',
 	      microfiche = '$form->{microfiche}',
 	      partsgroup_id = $partsgroup_id
@@ -797,6 +793,11 @@ sub delete {
   # connect to database, turn off AutoCommit
   my $dbh = $form->dbconnect_noauto($myconfig);
 
+  # first delete prices of pricegroup 
+  my $query = qq|DELETE FROM prices
+           WHERE parts_id = $form->{id}|;
+  $dbh->do($query) || $form->dberror($query);
+
   my $query = qq|DELETE FROM parts
  	         WHERE id = $form->{id}|;
   $dbh->do($query) || $form->dberror($query);
@@ -904,15 +905,10 @@ sub all_parts {
   my $group;
   my $limit;
 
-  foreach my $item (qw(partnumber drawing microfiche make)) {
+  foreach my $item (qw(partnumber drawing microfiche)) {
     if ($form->{$item}) {
       $var = $form->like(lc $form->{$item});
-
-      # make will build later Bugfix 145
-      # model will build later too - Bugfix 331
-      if ($item ne 'make') {
-        $where .= " AND lower(p.$item) LIKE '$var'";
-      }
+      $where .= " AND lower(p.$item) LIKE '$var'";
     }
   }
 
@@ -1511,19 +1507,6 @@ sub create_links {
   }
   $sth->finish;
 
-  # get adr
-  $query = qq|SELECT id, adr_description, adr_code
-              FROM adr|;
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-
-  $form->{ADR} = [];
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    push @{ $form->{ADR} }, $ref;
-  }
-  $sth->finish;
-
   # get payment terms
   $query = qq|SELECT id, description
               FROM payment_terms