Alter Auftrags/Angebotscontroller weitere quotations die gestört haben

rausgenommen

Author: wernerhahn

SL/OE.pm

@@ -658,8 +658,8 @@ sub _save {
     $query = qq|SELECT nextval('id')|;
     ($form->{id}) = selectrow_query($form, $dbh, $query);
 
-    $query = qq|INSERT INTO oe (id, ordnumber, employee_id, currency_id, taxzone_id) VALUES (?, '', ?, (SELECT currency_id FROM defaults), ?)|;
-    do_query($form, $dbh, $query, $form->{id}, $form->{employee_id}, $form->{taxzone_id});
+    $query = qq|INSERT INTO oe (id, ordnumber, employee_id, currency_id, taxzone_id, record_type) VALUES (?, '', ?, (SELECT currency_id FROM defaults), ?, ?)|;
+    do_query($form, $dbh, $query, $form->{id}, $form->{employee_id}, $form->{taxzone_id}, $form->{type});
   }
 
   my $amount    = 0;

SL/TransNumber.pm

@@ -62,15 +62,15 @@ sub _get_filters {
     $filters{trans_number}  = "ordnumber";
     $filters{numberfield}   = $type eq 'sales_order' ? "sonumber" : "ponumber";
     $filters{table}         = "oe";
-    $filters{where}         = 'NOT COALESCE(quotation, FALSE)';
-    $filters{where}        .= $type =~ /^sales/ ? ' AND (customer_id IS NOT NULL)' : ' AND (vendor_id IS NOT NULL)';
+    $filters{where}         = "record_type = ?";
+    $filters{values}        = [ $::form->{type} ];
 
   } elsif ($type =~ /^sales_order_intake$/) {
     $filters{trans_number}  = "ordnumber";
     $filters{numberfield}   = "soinumber";
     $filters{table}         = "oe";
-    $filters{where}         = 'NOT COALESCE(quotation, FALSE)';
-    $filters{where}        .= $type =~ /^sales/ ? ' AND (customer_id IS NOT NULL)' : ' AND (vendor_id IS NOT NULL)';
+    $filters{where}         = "record_type = ?";
+    $filters{values}        = $type;
 
   } elsif ($type =~ /^purchase_order_confirmation$/) {
     $filters{trans_number}  = "ordnumber";
@@ -83,14 +83,15 @@ sub _get_filters {
     $filters{trans_number}  = "quonumber";
     $filters{numberfield}   = $type eq 'sales_quotation' ? "sqnumber" : "rfqnumber";
     $filters{table}         = "oe";
-    $filters{where}         = 'COALESCE(quotation, FALSE)';
-    $filters{where}        .= $type =~ /^sales/ ? ' AND (customer_id IS NOT NULL)' : ' AND (vendor_id IS NOT NULL)';
+    $filters{where}         = "record_type = ?";
+    $filters{values}        = $type;
 
   } elsif ($type =~ /^purchase_quotation_intake$/) {
     $filters{trans_number}  = "quonumber";
     $filters{numberfield}   = "pqinumber";
     $filters{table}         = "oe";
-    $filters{where}         = 'COALESCE(quotation, FALSE) AND (vendor_id IS NOT NULL)';
+    $filters{where}         = "record_type = ?";
+    $filters{values}        = $type;
 
   } elsif ($type =~ /^(part|service|assembly|assortment)$/) {
     $filters{trans_number}  = "partnumber";