Merge branch 'master-new-wgg' of wugg/phpstock into master-new

app/admin/controller/Goodup.php

@@ -1401,7 +1401,7 @@ class Goodup extends Base
             if($up){
                 if($out_tax_id>0){
                     $goodTax->out_tax_id=$out_tax_id;
-                    $goodTax->out_tax=$out_tax;
+                    $goodTax->out_tax=str_replace("%","",$out_tax);
                     $goodTax->status=2;
                     $goodTax->save();
                 }

app/admin/controller/Sale.php

@@ -1230,9 +1230,10 @@ class Sale extends Base
 				        'open_type'=>$zxinfo['open_type'],
 				        'tax'=>$zxinfo['tax'],
 				        "out_tax_id"=>$zxinfo['out_tax_id'],
-				        'out_tax'=>$zxinfo['out_tax'],
+				        'out_tax'=> str_replace("%","",$zxinfo['out_tax']),
 				        'cgd_tax_id'=>$zxinfo['cgd_tax_id'],
-                        'cgd_tax'=>$zxinfo['cgd_tax'],
+                        'cgd_tax'=>str_replace('%','',$zxinfo['cgd_tax']),
+                        "status"=>2,
 				        'createrid' => $zxinfo['createrid'],
 	                    'creater' => $zxinfo['creater'],
 				    ];
@@ -1837,7 +1838,10 @@ class Sale extends Base
             				        'inv_good_name'=>$goodinfo['inv_good_name'],
             				        'tax'=>$goodinfo['tax'],
             				        'out_tax_id'=>$goodinfo['out_tax_id'],
-				                    'out_tax'=>$goodinfo['out_tax'],
+				                    'out_tax'=>str_replace('%','',$goodinfo['out_tax']),
+				                     'cgd_tax_id'=>$goodinfo['cgd_tax_id'],
+                                    'cgd_tax'=>str_replace('%','',$goodinfo['cgd_tax']),
+				                    'status'=>2,
             				        'createrid' => $goodinfo['createrid'],
             	                    'creater' => $goodinfo['creater'],
             				    ];

app/admin/model/ConsultTemp.php

@@ -94,9 +94,10 @@ class ConsultTemp extends Model
                     'inv_good_name'=>$item['inv_good_name'],
                     'tax'=>$item['tax'],
                     'out_tax_id'=>$item['out_tax_id'],
-				    'out_tax'=>$item['out_tax'],
+				    'out_tax'=>str_replace('%','',$item['out_tax']),
                     "cgd_tax_id"=>$item['cgd_tax_id'],
-                    "cgd_tax"=>$item['cgd_tax'],
+                    "cgd_tax"=>str_replace("%","",$item['cgd_tax']),
+                    "status"=>2,
                     'createrid' => $marage['createrid'],
                     'creater' => $marage['creater'],
                     ];