fix remove from process for receipts and revisions

This commit is contained in:
Uwe Steinmann 2017-07-31 14:13:02 +02:00
parent 014b7ac201
commit 07d760d7d8

View File

@ -790,7 +790,7 @@ class SeedDMS_Core_User { /* {{{ */
$receiptStatus = $this->getReceiptStatus();
foreach ($receiptStatus["indstatus"] as $ri) {
if($ri['status'] != -2 && (!$states || in_array($ri['status'], $states))) {
if($ri['status'] != -2 && (empty($states['receipt']) || in_array($ri['status'], $states['receipt']))) {
$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
"VALUES ('". $ri["receiptID"] ."', '-2', 'Recipient removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
$res=$db->getResult($queryStr);
@ -802,7 +802,7 @@ class SeedDMS_Core_User { /* {{{ */
$revisionStatus = $this->getRevisionStatus();
foreach ($revisionStatus["indstatus"] as $ri) {
if($ri['status'] != -2 && (!$states || in_array($ri['status'], $states))) {
if($ri['status'] != -2 && (empty($states['revision']) || in_array($ri['status'], $states['revision']))) {
$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
"VALUES ('". $ri["revisionID"] ."', '-2', 'Revisor removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
$res=$db->getResult($queryStr);