Merge pull request #12 from leon-mbs/dev

v1.3.5
leon-mbs · Jun 7, 2019 · b7a56d1 · b7a56d1
2 parents 175b876 + bea0d2a
commit b7a56d1
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 CHANGELOG
 =========
+### v1.3.5 (2019-06-05)  
+
 ### v1.3.4 (2019-05-05)  
 * модуль интеграции с опенкарт
 

diff --git a/www/app/entity/doc/document.php b/www/app/entity/doc/document.php
@@ -238,7 +238,9 @@ protected function Cancel() {
         $conn->StartTrans();
         // если  метод не переопределен  в  наследнике удаляем  документ  со  всех  движений
         $conn->Execute("delete from entrylist where document_id =" . $this->document_id);
-
+        //удаляем освободившиеся стоки
+        $conn->Execute("delete from store_stock where stock_id not in (select stock_id from entrylist) ");
+
         $conn->CompleteTrans();
 
 

diff --git a/www/app/entity/item.php b/www/app/entity/item.php
@@ -67,6 +67,7 @@ protected function beforeDelete() {
     public function checkDelete() {
 
         $conn = \ZDB\DB::getConnect();
+
         $sql = "  select count(*)  from  store_stock where   item_id = {$this->item_id}";
         $cnt = $conn->GetOne($sql);
         return ($cnt > 0) ? false : true;

diff --git a/www/composer.lock b/www/composer.lock
diff --git a/www/templates/pages/userlogin.html b/www/templates/pages/userlogin.html
@@ -70,7 +70,7 @@
         </div>
         <div class="w-100"></div>
         <div class="col-4  " style="margin-top:200px;">
-            v1.3.4 © <a href="http://zippy.com.ua/">zippy.com.ua</a>
+            v1.3.5 © <a href="http://zippy.com.ua/">zippy.com.ua</a>
         </div>
     </div>