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

diff --git a/SL/CT.pm b/SL/CT.pm
index b36cfa3e88bc3a55d6daf90e16331285e78d2e01..6d801d4881717b8b605adaece9eaa3fd45db404c 100644 (file)
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -1045,7 +1045,24 @@ sub delete_shipto {
   my %myconfig  = %main::myconfig;
   my $dbh       = $form->get_standard_dbh(\%myconfig);
 
-  do_query($form, $dbh, qq|UPDATE contacts SET cp_cv_id = NULL WHERE cp_id = ?|, $shipto_id);
+  do_query($form, $dbh, qq|UPDATE shipto SET trans_id = NULL WHERE shipto_id = ?|, $shipto_id);
+
+  $dbh->commit();
+
+  $main::lxdebug->leave_sub();
+}
+
+sub delete_contact {
+  $main::lxdebug->enter_sub();
+
+  my $self      = shift;
+  my $cp_id     = shift;
+
+  my $form      = $main::form;
+  my %myconfig  = %main::myconfig;
+  my $dbh       = $form->get_standard_dbh(\%myconfig);
+
+  do_query($form, $dbh, qq|UPDATE contacts SET cp_cv_id = NULL WHERE cp_id = ?|, $cp_id);
 
   $dbh->commit();
 

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 4121ac5e439868247cddb5bb49b38d19431c8bc3..b25509ec6c0c8ddbd350f2791feaa12491b25329 100644 (file)
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -717,7 +717,7 @@ sub delete_contact {
   CT->get_contact(\%myconfig, \%$form);
 
   unless ($form->{cp_used}) {
-    CT->delete_shipto($form->{cp_id});
+    CT->delete_contact($form->{cp_id});
     @$form{ grep /^cp_/, keys %$form } = undef;
   }