Skip to content

Commit

Permalink
Merge pull request #162 from leon-mbs/dev
Browse files Browse the repository at this point in the history
hotfix
  • Loading branch information
leon-mbs authored May 23, 2021
2 parents 8de4916 + 68b487b commit 3dc08e1
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
5 changes: 3 additions & 2 deletions www/app/entity/doc/document.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ class Document extends \ZCL\DB\Entity
const STATE_FAIL = 17; // Аннулирован
const STATE_FINISHED = 18; // Закончен
const STATE_APPROVED = 19; // Готов к выполнению
const STATE_READYTOSHIP = 20; // готов к отправке
const STATE_READYTOSHIP = 20; // готов к отправке

// типы экспорта
const EX_WORD = 1; // Word
const EX_EXCEL = 2; // Excel
Expand Down Expand Up @@ -571,7 +572,7 @@ protected function afterDelete() {

$conn->Execute("delete from docstatelog where document_id=" . $this->document_id);
$conn->Execute("delete from paylist where document_id=" . $this->document_id);
$conn->Execute("delete from iostate where document_id=" . $this->document_id);
// $conn->Execute("delete from iostate where document_id=" . $this->document_id);
$conn->Execute("delete from messages where item_type=" . \App\Entity\Message::TYPE_DOC . " and item_id=" . $this->document_id);
$conn->Execute("delete from files where item_type=" . \App\Entity\Message::TYPE_DOC . " and item_id=" . $this->document_id);
$conn->Execute("delete from filesdata where file_id not in (select file_id from files)");
Expand Down
4 changes: 2 additions & 2 deletions www/app/entity/doc/inventory.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function Execute() {
$io->amount = $qty * $stock->partion;
$io->iotype = \App\Entity\IOState::TYPE_OVER;

// $io->save();
// $io->save();


}
Expand All @@ -64,7 +64,7 @@ public function Execute() {
$io->amount = 0-$qty * $stock->partion;
$io->iotype = \App\Entity\IOState::TYPE_LOST;

// $io->save();
// $io->save();


}
Expand Down
2 changes: 1 addition & 1 deletion www/app/entity/doc/orderfood.php
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public function Execute() {
$io->amount = 0-$st->quantity * $st->partion * $lost;
$io->iotype = \App\Entity\IOState::TYPE_TRASH;

// $io->save();
// $io->save();

}

Expand Down
2 changes: 1 addition & 1 deletion www/app/entity/pay.php
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public static function addPayment($document_id, $paydate, $amount, $mf_id, $type
$io->amount = $amount;
$io->iotype = $type;

// $io->save();
//$io->save();


$mf = \App\Entity\MoneyFund::load($mf_id);
Expand Down

0 comments on commit 3dc08e1

Please sign in to comment.