Und der eigentliche Loeschmechanismus.

Loeschen in diesem Fall heisst den Eintrag verwaisen, d.h. der Eintrag ist noch im System, aber keinem Kunden zugeordnet.

diff --git a/SL/CT.pm b/SL/CT.pm
index d22017d4fbbe9a799b4d5b4c750815666ec7b014..6cd9b91db97afe7d38b8a1f16d3703f12e39f02c 100644 (file)
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -986,4 +986,21 @@ sub _delete_selected_notes {
   $main::lxdebug->leave_sub();
 }
 
+sub delete_shipto {
+  $main::lxdebug->enter_sub();
+
+  my $self      = shift;
+  my $shipto_id = shift;
+
+  my $form      = $main::form;
+  my %myconfig  = %main::myconfig;
+  my $dbh       = $form->get_standard_dbh(\%myconfig);
+
+  do_query($form, $dbh, qq|UPDATE shipto SET trans_id = NULL WHERE shipto_id = ?|, $shipto_id);
+
+  $dbh->commit();
+
+  $main::lxdebug->leave_sub();
+}
+
 1;

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 8223a6ef7a5811994dc1792d58642180f4f275ee..f72362e033b8f81cbf8536774b73ac6b3b5efbfb 100644 (file)
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -594,4 +594,18 @@ sub get_delivery {
   $lxdebug->leave_sub();
 }
 
+sub delete_shipto {
+  $main::lxdebug->enter_sub();
+
+  $auth->assert('customer_vendor_edit');
+
+  CT->delete_shipto($form->{shipto_id});
+
+  @$form{ grep /^shipto/, keys %$form } = undef;
+
+  display();
+
+  $main::lxdebug->leave_sub();
+}
+
 sub continue { call_sub($form->{nextsub}); }

diff --git a/locale/de/all b/locale/de/all
index 418df68b492ca44dfd6d0c74e85b04fe90548797..4835f11030c6a004a007b87995e6f7590a361880 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -438,7 +438,7 @@ aktualisieren wollen?',
   'Delete'                      => 'Löschen',
   'Delete Account'              => 'Konto löschen',
   'Delete Dataset'              => 'Datenbank löschen',
-  'Delete Shipto'               => 'Lieferadresse löschen',
+  'Delete Shipto'               => 'Lieferadresse löschen',
   'Delete delivery order'       => 'Lieferschein löschen',
   'Delete drafts'               => 'Entwürfe löschen',
   'Delete group'                => 'Gruppe löschen',

diff --git a/locale/de/ct b/locale/de/ct
index e7bacf87259e8d145341a525f63539870630a78c..a2d15c631415fc55da17d7a299f22f44218c2842 100644 (file)
--- a/locale/de/ct
+++ b/locale/de/ct
@@ -197,6 +197,7 @@ $self->{subs} = {
   'continue'                    => 'continue',
   'cov_selection_internal'      => 'cov_selection_internal',
   'delete'                      => 'delete',
+  'delete_shipto'               => 'delete_shipto',
   'delivery_customer_selection' => 'delivery_customer_selection',
   'display'                     => 'display',
   'edit'                        => 'edit',
@@ -235,7 +236,7 @@ $self->{subs} = {
   'erfassen'                    => 'add',
   'weiter'                      => 'continue',
   'löschen'                     => 'delete',
-  'lieferadresse_löschen'  => 'delete_shipto',
+  'lieferadresse_löschen'       => 'delete_shipto',
   'neue_ware'                   => 'new_part',
   'speichern'                   => 'save',
   'speichern_und_debitorenbuchung_erfassen' => 'save_and_ar_transaction',

diff --git a/templates/webpages/ct/form_header_de.html b/templates/webpages/ct/form_header_de.html
index 7ba5558273d206e687468b910be42f3e11f056b2..77a226a579104d931ef83ab8abfd6f742b51b30e 100644 (file)
--- a/templates/webpages/ct/form_header_de.html
+++ b/templates/webpages/ct/form_header_de.html
@@ -302,7 +302,7 @@
      </tr>
     </table>
 
-    <input type="submit" id="delete_shipto" name="delete_shipto" value="Lieferadresse l&ouml;schen" disabled>
+    <input type="submit" id="delete_shipto" name="action" value="Lieferadresse löschen" disabled>
     <br style="clear: left" />
    </div>
 

diff --git a/templates/webpages/ct/form_header_master.html b/templates/webpages/ct/form_header_master.html
index b79d19a642afe8702ce7110354ffae05c4c18f4c..0dadc080fc2613757f697cb728d13838e95e361a 100644 (file)
--- a/templates/webpages/ct/form_header_master.html
+++ b/templates/webpages/ct/form_header_master.html
@@ -302,7 +302,7 @@
      </tr>
     </table>
 
-    <input type="submit" id="delete_shipto" name="delete_shipto" value="<translate>Delete Shipto</translate>" disabled>
+    <input type="submit" id="delete_shipto" name="action" value="<translate>Delete Shipto</translate>" disabled>
     <br style="clear: left" />
    </div>