From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 8 Jul 2008 11:38:52 +0000 (+0000)
Subject: Bei Wandlung von Angeboten/Preisanfragen in Aufträge erst beim Speichern der Aufträge... 
X-Git-Tag: release-2.6.0beta1~65
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=b7b5192aac08c3d4fae53ae9d29cb7f2b1d9f45a;p=kivitendo-erp.git

Bei Wandlung von Angeboten/Preisanfragen in Aufträge erst beim Speichern der Aufträge das Angebot/die Preisanfrage schließen.
---

diff --git a/SL/OE.pm b/SL/OE.pm
index 846590166..10b52e5c9 100644
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -467,15 +467,25 @@ sub save {
   $form->save_status($dbh);
 
   # Link this record to the records it was created from.
-  RecordLinks->create_links('dbh'        => $dbh,
-                            'mode'       => 'ids',
-                            'from_table' => 'oe',
-                            'from_ids'   => $form->{convert_from_oe_ids},
-                            'to_table'   => 'oe',
-                            'to_id'      => $form->{id},
-    );
+  $form->{convert_from_oe_ids} =~ s/^\s+//;
+  $form->{convert_from_oe_ids} =~ s/\s+$//;
+  my @convert_from_oe_ids      =  split m/\s+/, $form->{convert_from_oe_ids};
   delete $form->{convert_from_oe_ids};
 
+  if (scalar @convert_from_oe_ids) {
+    RecordLinks->create_links('dbh'        => $dbh,
+                              'mode'       => 'ids',
+                              'from_table' => 'oe',
+                              'from_ids'   => \@convert_from_oe_ids,
+                              'to_table'   => 'oe',
+                              'to_id'      => $form->{id},
+      );
+
+    $self->_close_quotations_rfqs('dbh'     => $dbh,
+                                  'from_id' => \@convert_from_oe_ids,
+                                  'to_id'   => $form->{id});
+  }
+
   if (($form->{currency} ne $form->{defaultcurrency}) && !$exchangerate) {
     if ($form->{vc} eq 'customer') {
       $form->update_exchangerate($dbh, $form->{currency}, $form->{transdate}, $form->{exchangerate}, 0);
@@ -498,40 +508,48 @@ sub save {
   return $rc;
 }
 
-# this function closes multiple orders given in $form->{ordnumber_#}.
-# use this for multiple orders that don't have to be saved back
-# single orders should use OE::save instead.
-sub close_orders {
+sub _close_quotations_rfqs {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form) = @_;
+  my $self     = shift;
+  my %params   = @_;
 
-  # get ids from $form
-  map { push @ids, $form->{"ordnumber_$_"} if $form->{"ordnumber_$_"} }
-    (1 .. $form->{rowcount});
+  Common::check_params(\%params, qw(from_id to_id));
 
-  my $dbh = $form->dbconnect($myconfig);
-  $query = qq|UPDATE oe SET | .
-           qq|closed = TRUE | .
-           qq|WHERE ordnumber IN (|
-    . join(', ', map { $dbh->quote($_) } @ids) . qq|)|;
-  $dbh->do($query) || $form->dberror($query);
-  $dbh->disconnect;
+  my $myconfig = \%main::myconfig;
+  my $form     = $main::form;
 
-  $main::lxdebug->leave_sub();
-}
+  my $dbh      = $params{dbh} || $form->get_standard_dbh($myconfig);
 
-sub close_order {
-  $main::lxdebug->enter_sub();
+  my $query    = qq|SELECT quotation FROM oe WHERE id = ?|;
+  my $sth      = prepare_query($form, $dbh, $query);
 
-  my ($self, $myconfig, $form) = @_;
+  do_statement($form, $sth, $query, conv_i($params{to_id}));
 
-  return $main::lxdebug->leave_sub() unless ($form->{"id"});
+  my ($quotation) = $sth->fetchrow_array();
 
-  my $dbh = $form->dbconnect($myconfig);
-  do_query($form, $dbh, qq|UPDATE oe SET closed = TRUE where id = ?|,
-           $form->{"id"});
-  $dbh->disconnect;
+  if ($quotation) {
+    $main::lxdebug->leave_sub();
+    return;
+  }
+
+  my @close_ids;
+
+  foreach my $from_id (@{ $params{from_id} }) {
+    $from_id = conv_i($from_id);
+    do_statement($form, $sth, $query, $from_id);
+    ($quotation) = $sth->fetchrow_array();
+    push @close_ids, $from_id if ($quotation);
+  }
+
+  $sth->finish();
+
+  if (scalar @close_ids) {
+    $query = qq|UPDATE oe SET closed = TRUE WHERE id IN (| . join(', ', ('?') x scalar @close_ids) . qq|)|;
+    do_query($form, $dbh, $query, @close_ids);
+
+    $dbh->commit() unless ($params{dbh});
+  }
 
   $main::lxdebug->leave_sub();
 }
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 44690ddb6..73216f824 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -1769,11 +1769,6 @@ sub purchase_order {
     check_for_direct_delivery();
   }
 
-  if (   $form->{type} eq 'sales_quotation'
-      || $form->{type} eq 'request_quotation') {
-    OE->close_order(\%myconfig, \%$form);
-  }
-
   if ($form->{type} =~ /^sales_/) {
     delete($form->{ordnumber});
   }
@@ -1795,11 +1790,6 @@ sub sales_order {
   check_oe_access();
   $auth->assert('sales_order_edit');
 
-  if (   $form->{type} eq 'sales_quotation'
-      || $form->{type} eq 'request_quotation') {
-    OE->close_order(\%myconfig, $form);
-  }
-
   if ($form->{type} eq "purchase_order") {
     delete($form->{ordnumber});
   }