Auslagern in VK-Rechnung: Löschen der Lagerbewegung beim Löschen/Storno der Rechnung

diff --git a/SL/IS.pm b/SL/IS.pm
index 6a8ef46351ae3e6d2cf293c1dff23987185bc9f8..9ae4307612c5281ecca9110a079e8ffc2d69ea93 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -587,8 +587,12 @@ sub post_invoice {
   my $all_units = AM->retrieve_units($myconfig, $form);
 
   if (!$payments_only) {
   my $all_units = AM->retrieve_units($myconfig, $form);
 
   if (!$payments_only) {

+    if ($form->{storno}) {
+      _delete_transfers($dbh, $form, $form->{storno_id});
+    }

     if ($form->{id}) {
       &reverse_invoice($dbh, $form);
     if ($form->{id}) {
       &reverse_invoice($dbh, $form);

+      _delete_transfers($dbh, $form, $form->{id});

 
     } else {
       my $trans_number   = SL::TransNumber->new(type => $form->{type}, dbh => $dbh, number => $form->{invnumber}, save => 1);
 
     } else {
       my $trans_number   = SL::TransNumber->new(type => $form->{type}, dbh => $dbh, number => $form->{invnumber}, save => 1);


@@ -1348,6 +1352,19 @@ sub _determine_wh_and_bin {
   return ($wh_id, $bin_id);
 }
 
   return ($wh_id, $bin_id);
 }
 

+sub _delete_transfers {
+  $::lxdebug->enter_sub;
+
+  my ($dbh, $form, $id) = @_;
+
+  my $query = qq|DELETE FROM inventory WHERE invoice_id
+                  IN (SELECT id FROM invoice WHERE trans_id = ?)|;
+
+  do_query($form, $dbh, $query, $id);
+
+  $::lxdebug->leave_sub;
+}
+

 sub _delete_payments {
   $main::lxdebug->enter_sub();
 
 sub _delete_payments {
   $main::lxdebug->enter_sub();
 


@@ -1654,6 +1671,7 @@ sub delete_invoice {
   my $dbh = $form->get_standard_dbh;
 
   &reverse_invoice($dbh, $form);
   my $dbh = $form->get_standard_dbh;
 
   &reverse_invoice($dbh, $form);

+  _delete_transfers($dbh, $form, $form->{id});

 
   my @values = (conv_i($form->{id}));
 
 
   my @values = (conv_i($form->{id}));
 

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 0bcd3c3609c8b4711a7f2f463d89cf72895894f1..7e14454dfed6c298e9dca0984effa36dbd2b015e 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -782,7 +782,7 @@ sub post {
 
   # If transfer_out is requested, get rose db handle and do post and
   # transfer out in one transaction. Otherwise just post the invoice.
 
   # If transfer_out is requested, get rose db handle and do post and
   # transfer out in one transaction. Otherwise just post the invoice.

-  if ($::instance_conf->get_is_transfer_out) {
+  if ($::instance_conf->get_is_transfer_out && $form->{type} ne 'credit_note' && !$form->{storno}) {

     require SL::DB::Inventory;
     my $rose_db = SL::DB::Inventory->new->db;
     my $error;
     require SL::DB::Inventory;
     my $rose_db = SL::DB::Inventory->new->db;
     my $error;