1.修改NPD离线Category Filter错误。

RedAnt ERP Mobile/common/CommonEditor/CommonEditorViewController.m

@@ -4090,7 +4090,8 @@
             if ([availability integerValue] > 0) {
                 available_str = [NSString stringWithFormat:@"Available: %@",availability];
             } else {
-                available_str = @"Available: In Production";
+//                available_str = @"Available: In Production";
+                available_str = @"Available: Out of Stock";
             }
             cell.avalibilityLabel.text = available_str;
             

RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.m

@@ -336,7 +336,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
          else
          {
               if ([s_qty isEqualToString:@"null"] && [s_availability isEqualToString:@"0"])
-                  str_availability=@"<b>Availability:</b> In Production";
+                  str_availability=@"<b>Availability:</b> Out of Stock";
          }
         
         if([params[@"color"] boolValue]==false || color.length==0 )
@@ -7403,7 +7403,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
         // where bestseller > 0 order by bestseller desc
         // sql query: alert     availability(int)   best_seller(int)    price    qty
         
-        sqlQuery = [NSString stringWithFormat:@"select m.name,m.description,m.product_id,w._id,m.closeout,c._id,w.is_delete,m.category,m.more_color from (select name,description,product_id,closeout,best_seller,category from product where %@ %@ %@ %@ %@ %@ and is_active = 1) m left join wishlist w on m.product_id=w.product_id left join (select _id,product_id from offline_cart where so_no='%@') c on c.product_id=m.product_id order by %@ %@;",cateWhere,best_seller,alert,available_condition,qty,price,appDelegate.order_code,order_best_seller,limit_str];
+        sqlQuery = [NSString stringWithFormat:@"select m.name,m.description,m.product_id,w._id,m.closeout,c._id,w.is_delete,m.category,m.more_color from (select name,description,product_id,closeout,best_seller,category,more_color from product where %@ %@ %@ %@ %@ %@ and is_active = 1) m left join wishlist w on m.product_id=w.product_id left join (select _id,product_id from offline_cart where so_no='%@') c on c.product_id=m.product_id order by %@ %@;",cateWhere,best_seller,alert,available_condition,qty,price,appDelegate.order_code,order_best_seller,limit_str];
         
         
         where =[NSString stringWithFormat:@"%@ %@ %@ %@ %@ %@ and is_active = 1",cateWhere,best_seller,alert,available_condition,qty,price];
@@ -7786,7 +7786,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
         // where bestseller > 0 order by bestseller desc
         // sql query: alert     availability(int)   best_seller(int)    price    qty
         
-        sqlQuery = [NSString stringWithFormat:@"select m.name,m.description,m.product_id,w._id,m.closeout,c._id,w.is_delete,m.more_color from (select name,description,product_id,closeout,best_seller from product where %@ %@ %@ %@ %@ %@ and is_active = 1) m left join wishlist w on m.product_id=w.product_id  left join (select _id,product_id from offline_cart where so_no='%@') c on c.product_id=m.product_id order by %@ %@;", cateWhere,best_seller,alert,available_condition,qty,price,appDelegate.order_code,order_best_seller,limit_str];
+        sqlQuery = [NSString stringWithFormat:@"select m.name,m.description,m.product_id,w._id,m.closeout,c._id,w.is_delete,m.more_color from (select name,description,product_id,closeout,best_seller,more_color from product where %@ %@ %@ %@ %@ %@ and is_active = 1) m left join wishlist w on m.product_id=w.product_id  left join (select _id,product_id from offline_cart where so_no='%@') c on c.product_id=m.product_id order by %@ %@;", cateWhere,best_seller,alert,available_condition,qty,price,appDelegate.order_code,order_best_seller,limit_str];
         
         
         // count

RedAnt ERP Mobile/iSales-NPD/category.json

@@ -32,7 +32,7 @@
         "value_id" : "1"
       },
       "val_2" : {
-        "value" : "In Production",
+        "value" : "Out of Stock",
         "value_id" : "2"
       }
     },
@@ -108,4 +108,4 @@
   "items" : {},
   "mode" : "Regular Mode",
   "result" : 2
-}
+}