160622 add HMLG PROJECT

RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -401,7 +401,7 @@
     [super viewDidLoad];
     
     
-    
+    self.automaticallyAdjustsScrollViewInsets = NO;
     NSString* value =[DefaultAppearance get_noneappearance_value:@"DefaultColor" valuename:@"labelcolor"];
     
     if(value==nil)

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

@@ -214,9 +214,6 @@
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    //    if(tableView==self.itemListTable)
-    //    {
-    
     
     
     NSString *CellIdentifier = @"BundleModelCell";
@@ -225,7 +222,10 @@
 
     
     cell.labelModel.text = [item_json valueForKey:@"model"];
-    cell.labelPrice.text=[NSString stringWithFormat:@"$ %.2f",[[item_json valueForKey:@"unit_price"] floatValue]];
+    if([ [NSString stringWithFormat:@"%@", [item_json valueForKey:@"unit_price"] ] isEqualToString:@"No Price"])
+        cell.labelPrice.text=@"No Price";
+    else
+        cell.labelPrice.text=[NSString stringWithFormat:@"$ %.2f",[[item_json valueForKey:@"unit_price"] floatValue]];
     cell.labelQTY.text=[NSString stringWithFormat:@"%d",[[item_json valueForKey:@"modulus"] intValue]];
     
     cell.labelDescription.text = [item_json valueForKey:@"description"];

RedAnt ERP Mobile/common/Functions/portfolio/PortfolioViewController.m

@@ -1089,7 +1089,8 @@
                 cell.available_qty_value_label.hidden=true;
             }
     NSString* str_price =[NSString stringWithFormat:@"%.2f",price * (1.0-discount/100)];
-    if(price<0)
+    bool noprice =[[item_json valueForKey:@"is_no_price"]boolValue];
+    if(noprice)
         str_price=@"No Price";
     if(appDelegate.can_see_price&&appDelegate.price_hidden==false)
     {

RedAnt ERP Mobile/common/Functions/watchlist/WatchListViewController.m

@@ -594,18 +594,18 @@
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
 }
--(void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
-{
-
-    [super didRotateFromInterfaceOrientation:fromInterfaceOrientation];
-    
-   
-    
-//    [self.itemListTable reloadData];
-  NSLog(@"%@",NSStringFromCGRect(self.itemListTable.frame));
-    
-    
-}
+//-(void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
+//{
+//
+//    [super didRotateFromInterfaceOrientation:fromInterfaceOrientation];
+//    
+//   
+//    
+////    [self.itemListTable reloadData];
+//  NSLog(@"%@",NSStringFromCGRect(self.itemListTable.frame));
+//    
+//    
+//}
 #pragma mark - Table view data source
 
 //- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section