Merge pull request #82 from leon-mbs/dev

hotfix
leon-mbs · May 7, 2020 · 47045ac · 47045ac
2 parents 2fb0cf9 + 690897e
commit 47045ac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/www/app/acl.php b/www/app/acl.php
@@ -319,7 +319,7 @@ public static function getStoreBranchConstraint() {
         if (strlen($user->aclbranch) == 0) {
             return " (0)";
         } //нет доступа  ни  к  одному филиалу
-        return "select stacl.store_id  from stores stacl where branch_id in {$user->aclbranch} ";
+        return "select stacl.store_id  from stores stacl where branch_id in ({$user->aclbranch} ) ";
     }
 
     /**
@@ -345,7 +345,7 @@ public static function getMFBranchConstraint() {
         if (strlen($user->aclbranch) == 0) {
             return " (0)";
         } //нет доступа  ни  к  одному филиалу
-        return "select stacl.mf_id  from mfund stacl where branch_id in {$user->aclbranch} ";
+        return "select stacl.mf_id  from mfund stacl where branch_id in ({$user->aclbranch}) ";
     }
 
     /**
@@ -371,7 +371,7 @@ public static function getEmpBranchConstraint() {
         if (strlen($user->aclbranch) == 0) {
             return " (0)";
         } //нет доступа  ни  к  одному филиалу
-        return "select stacl.employee_id  from employees stacl where branch_id in {$user->aclbranch} ";
+        return "select stacl.employee_id  from employees stacl where branch_id in ({$user->aclbranch}) ";
     }
 
     /**
@@ -397,7 +397,7 @@ public static function getDocBranchConstraint() {
         if (strlen($user->aclbranch) == 0) {
             return " (0)";
         } //нет доступа  ни  к  одному филиалу
-        return "select stacl.document_id  from documents stacl where branch_id in {$user->aclbranch} ";
+        return "select stacl.document_id  from documents stacl where branch_id in ({$user->aclbranch})";
     }
 
     /**

diff --git a/www/app/entity/stock.php b/www/app/entity/stock.php
@@ -92,6 +92,7 @@ public static function getStock($store_id, $item_id, $price, $snumber = "", $sda
             $stock->item_id = $item_id;
             $stock->partion = $price;
             $stock->snumber = $snumber;
+            $stock->sdate =  null;
             if ($sdate > 0) {
                 $stock->sdate = $sdate;
             }