|
|
@@ -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])
|