屏蔽Notify Me向服务器发送邮箱地址。

修复离线Item Search下Filter选中没有子节点的Category查询没有结果。
修改Contact Info，在打开Shop Order的情况下隐藏Assign按钮。
屏蔽邮箱地址格式检查

RedAnt ERP Mobile/common/Functions/cart/CartViewController.m

@@ -2846,9 +2846,10 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
     emailAddrVC.textHandler = ^(NSString *text){
         
         // 验证邮箱格式是否正确
-        NSString *match = EMAIL_MATCHES;
-        NSPredicate *predicate = [NSPredicate predicateWithFormat:@"SELF MATCHES %@",match];
-        BOOL isEmailAddr = [predicate evaluateWithObject:text];
+//        NSString *match = EMAIL_MATCHES;
+//        NSPredicate *predicate = [NSPredicate predicateWithFormat:@"SELF MATCHES %@",match];
+//        BOOL isEmailAddr = [predicate evaluateWithObject:text];
+        BOOL isEmailAddr = YES;
         if (isEmailAddr) {
             
             // 验证是邮件地址，发送邮件
@@ -2943,9 +2944,10 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
     emailAddrVC.textHandler = ^(NSString *text){
         
         // 验证邮箱格式是否正确
-        NSString *match = EMAIL_MATCHES;
-        NSPredicate *predicate = [NSPredicate predicateWithFormat:@"SELF MATCHES %@",match];
-        BOOL isEmailAddr = [predicate evaluateWithObject:text];
+//        NSString *match = EMAIL_MATCHES;
+//        NSPredicate *predicate = [NSPredicate predicateWithFormat:@"SELF MATCHES %@",match];
+//        BOOL isEmailAddr = [predicate evaluateWithObject:text];
+        BOOL isEmailAddr = YES;
         if (isEmailAddr) {
             
             // 验证是邮件地址，发送邮件

RedAnt ERP Mobile/common/Functions/contact/CustomerInfoViewController.m

@@ -282,12 +282,16 @@
     
 //    self.btn_reset.tintColor = UIColorFromRGB(0x996633);
     
-//     AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+     AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
     
     if(self.edit_icon)
         [items addObject:self.btn_edit];
-    if(self.assig_icon)
-        [items addObject:self.btn_assign];
+    if (appDelegate.user_type == USER_ROLE_CUSTOMER && appDelegate.order_code.length > 0 && ![Singleton sharedInstance].currentOrderIsMerged) {
+        // shop order 隐藏assign
+    } else {
+        if(self.assig_icon)
+            [items addObject:self.btn_assign];
+    }
     if(self.reset_icon)
         [items addObject:self.btn_reset];
     

RedAnt ERP Mobile/common/Functions/modelDetail/DetailViewController.m

@@ -1878,9 +1878,10 @@ self.isrefreshing=false;
     emailAddrVC.textHandler = ^(NSString *text){
         
         // 验证邮箱格式是否正确
-        NSString *match = EMAIL_MATCHES;
-        NSPredicate *predicate = [NSPredicate predicateWithFormat:@"SELF MATCHES %@",match];
-        BOOL isEmailAddr = [predicate evaluateWithObject:text];
+//        NSString *match = EMAIL_MATCHES;
+//        NSPredicate *predicate = [NSPredicate predicateWithFormat:@"SELF MATCHES %@",match];
+//        BOOL isEmailAddr = [predicate evaluateWithObject:text];
+        BOOL isEmailAddr = YES;
         if (isEmailAddr) {
             
             // 验证是邮件地址，发送邮件

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

@@ -7609,7 +7609,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
                 cate_id_array = [@[category_id] mutableCopy];
             }
             /*-----------*/
-            NSMutableDictionary *cateDic = [[filter objectForKey:@"category"] mutableCopy];
+            NSMutableDictionary *cateDic = [[filter objectForKey:@"category"] mutableCopy];// 老子
             
             
             for (int i = 0; i < cate_id_array.count; i++) {
@@ -7618,12 +7618,13 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
                     
                     if ([key0 containsString:@"category_"]) {
                         
-                        NSMutableDictionary *category0 = [[cateDic objectForKey:key0] mutableCopy];
+                        NSMutableDictionary *category0 = [[cateDic objectForKey:key0] mutableCopy]; // 儿子
+                        
                         for (NSString *key1 in category0.allKeys) {
                             
                             if ([key1 containsString:@"category_"]) {
                                 
-                                NSMutableDictionary *category1 = [[category0 objectForKey:key1] mutableCopy];
+                                NSMutableDictionary *category1 = [[category0 objectForKey:key1] mutableCopy]; // 孙子
                                 [category1 setValue:[NSNumber numberWithInteger:0] forKey:@"check"];
                                 if ([[category1 objectForKey:@"cid"] isEqualToString:cate_id_array[i]]) {
                                     
@@ -7639,6 +7640,21 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
                                     
                                 }
                                 
+                            } else if ([key1 isEqualToString:@"cid"]) { // 2017-03-10 修复Item Search父节点下没有子节点的情况下选中父节点查询没有结果
+                                
+                                if ([[category0 objectForKey:@"cid"] isEqualToString:cate_id_array[i]]) {
+                                    
+                                    cate_id_array[i] = [category0 objectForKey:@"id"];
+                                    if (i == 0) {
+                                        [cateWhere appendFormat:@"category like'%%#%@#%%'",cate_id_array[i]];
+                                    } else {
+                                        [cateWhere appendFormat:@"or category like'%%#%@#%%'",cate_id_array[i]];
+                                    }
+                                    [category0 setValue:[NSNumber numberWithInteger:1] forKey:@"check"];
+                                    [cateDic setValue:category0 forKey:key0];
+                                    
+                                }
+                                
                             }
                             
                         }

RedAnt ERP Mobile/common/data_provider/iSalesNetwork.m

@@ -3986,12 +3986,12 @@ repeat:
         [dic setValue:addr forKey:@"email"];
     } else {
         // employee选择了Contact，并且Contact有Email
-        if (appDelegate.user_type == USER_ROLE_EMPLOYEE && appDelegate.customerInfo) {
-            NSString *email = [appDelegate.customerInfo objectForKey:@"customer_email"];
-            if (email) {
-                [dic setValue:email forKey:@"email"];
-            }
-        }
+//        if (appDelegate.user_type == USER_ROLE_EMPLOYEE && appDelegate.customerInfo) {
+//            NSString *email = [appDelegate.customerInfo objectForKey:@"customer_email"];
+//            if (email) {
+//                [dic setValue:email forKey:@"email"];
+//            }
+//        }
     }