Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Purch.php

@@ -686,7 +686,7 @@ class Purch extends Base
                 $uname = $this->uname;
 
                 foreach ($cgdNo as $vlue) {
-                    if ($status == 1 || $status == 2) {
+                    if ($status == 2 || $status == 3) {
 //                    $orderinfo = Db::name('sale')
 //                    ->alias('a')
 //                    ->field('a.id,a.orderCode,a.is_stock,a.order_type,a.cgderid')