From bdb05c747a3be0556473cf496a088c5ad9206171 Mon Sep 17 00:00:00 2001
From: OpenXE <>
Date: Sun, 1 Oct 2023 19:48:21 +0200
Subject: [PATCH] Wareneingang bugfix abschliessen, removed edit from
 minidetail

---
 www/pages/content/wareneingang_minidetail.tpl |  8 +++--
 www/pages/wareneingang.php                    | 32 ++++---------------
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/www/pages/content/wareneingang_minidetail.tpl b/www/pages/content/wareneingang_minidetail.tpl
index bab0ae81..ebf1d36c 100644
--- a/www/pages/content/wareneingang_minidetail.tpl
+++ b/www/pages/content/wareneingang_minidetail.tpl
@@ -1,7 +1,11 @@
+<!--
 <table id="table[MD5]">
-<tr><td>{|Lieferschein|}:</td><td><input type="checkbox" onchange="lsclick[MD5]();" id="beiback_lieferschein[MD5]" disabled value="1" [BEIPACK_LIEFERSCHEIN] /></td><td><span id="lsnr[MD5]">[LSNR]</span></td><td><input type="button" value="{|Belege &auml;ndern|}" style="cursor:hand;" onclick="editclick[MD5]();" /></td></tr>
+<tr><td>{|Lieferschein|}:</td><td><input type="checkbox" onchange="lsclick[MD5]();" id="beiback_lieferschein[MD5]" disabled value="1" [BEIPACK_LIEFERSCHEIN] /></td><td><span id="lsnr[MD5]">[LSNR]</span></td>
+<td><input type="button" value="{|Belege &auml;ndern|}" style="cursor:hand;" onclick="editclick[MD5]();" /></td>
+</tr>
 <tr><td>{|Rechnung|}:</td><td><input type="checkbox" onchange="reclick[MD5]();" id="beiback_rechnung[MD5]" disabled value="1" [BEIPACK_RECHNUNG] /></td><td><span id="renr[MD5]">[RENR]</span></td><td></td></tr>
 </table>
+-->
 
 <table width="100%">
 <tr><td width="100%">[ARTIKEL]</td></tr>
@@ -110,4 +114,4 @@ $(document).ready(function() {
     });
   
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/www/pages/wareneingang.php b/www/pages/wareneingang.php
index aaccc010..4dfe3e59 100644
--- a/www/pages/wareneingang.php
+++ b/www/pages/wareneingang.php
@@ -1843,6 +1843,12 @@ class Wareneingang {
                 }
                 break;
             case 'abschliessen':
+                // Save header and finish
+                $sql = "UPDATE paketannahme SET status='abgeschlossen' WHERE id='$id'";
+                $this->app->DB->Update($sql);
+
+                $this->app->erp->RunHook('wareneinang_paketannahme_abschliessen', 1, $id);
+                $this->app->Location->execute('index.php?module=wareneingang&action=list');
                 break;
         }
 
@@ -2001,31 +2007,7 @@ class Wareneingang {
         $this->app->Tpl->Set('MESSAGE1',$msg);
 
         $this->app->Tpl->Parse('PAGE', 'wareneingang_paketinhalt.tpl');
-
-        $returnordergeprueft = $this->app->Secure->GetPOST('returnordergeprueft');
-        $abschliessen = $this->app->Secure->GetPOST('abschliessen');
-        if ($abschliessen != '' || $returnordergeprueft != '') {
-            // paketannahme auf abgeschlossen setzten
-
-            $returnOrderId = empty($returnordergeprueft) ? null : $this->app->DB->Select(
-                            sprintf(
-                                    'SELECT return_order_id FROM receiptdocument WHERE parcel_receipt_id = %d',
-                                    $id
-                            )
-            );
-
-            // Save header and finish
-            $this->app->DB->Update(
-                    "UPDATE paketannahme SET 
-          status='abgeschlossen', 
-          lsnr='" . $lsnr . "',
-          renr='" . $renr . "',
-          bemerkung='" . $bemerkung . "'
-           WHERE id='$id' LIMIT 1");
-
-            $this->app->erp->RunHook('wareneinang_paketannahme_abschliessen', 1, $id);
-            $this->app->Location->execute('index.php?module=wareneingang&action=list');
-        }
+       
     }
 
     // END WareneingangPaketDistriInhalt