Procházet zdrojové kódy

20170124
Fix
offline portfolio missing model bug

Ray Zhang před 9 roky
rodič
revize
b7d1a0c4e5

+ 10 - 9
RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.m

@@ -221,15 +221,9 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
          
          
 
-        if(is_percentage==0&&qty==0&&!show_stockout)
-        {
-            return;
-        }
+
         
-        if((is_percentage!=0||s_is_percentage.length==0)&&availability==0&&!show_stockout)
-        {
-            return;
-        }
+
         if(s_percent.length==0||is_percentage==0)
         {
             percent=100.0;
@@ -266,7 +260,14 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
              }
          }
          
-         
+         if(is_percentage==0&&qty==0&&!show_stockout)
+         {
+             return;
+         }
+         if((is_percentage!=0||s_is_percentage.length!=0)&&qty==0&&!show_stockout)
+         {
+             return;
+         }
          
          NSString* set_price=@"";
          if([params[@"entered_price"] boolValue])

+ 1 - 1
RedAnt ERP Mobile/common/Functions/portfolio/PDFListViewController.m

@@ -500,7 +500,7 @@
     NSString* name=[self.content_data[indexPath.row] valueForKey:@"tear_name"];
     NSString* url= [self.content_data[indexPath.row] valueForKey:@"pdf_path"];
     
-    if(url==nil)
+    if(true)//(url==nil)
     {
         
         NSMutableDictionary* params = [RAUtils string2dict:[self.content_data[indexPath.row] valueForKey:@"off_params"]];