s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-11-15 04:27:14 +01:00
Code Issues Projects Releases Wiki Activity

Wareneingang bugfix abschliessen, removed edit from minidetail

Browse Source
This commit is contained in:
OpenXE 2023-10-01 19:48:21 +02:00
parent b613a99791
commit bdb05c747a
2 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/pages/content/wareneingang_minidetail.tpl
View File

@ -1,7 +1,11 @@
<!--
<table id="table[MD5]"> <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> <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>
-->
<table width="100%"> <table width="100%">
<tr><td width="100%">[ARTIKEL]</td></tr> <tr><td width="100%">[ARTIKEL]</td></tr>

30
www/pages/wareneingang.php
View File

@ -1843,6 +1843,12 @@ class Wareneingang {
} }
break; break;
case 'abschliessen': 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; break;
} }
@ -2002,30 +2008,6 @@ class Wareneingang {
$this->app->Tpl->Parse('PAGE', 'wareneingang_paketinhalt.tpl'); $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 // END WareneingangPaketDistriInhalt