修改Set Category Price界面，增加提示信息。

修改编辑订单按钮，编辑状态图片。
修复打开Sales Order后，退出重新登录或释放订单后，Model Info在缺货时禁用Add To Cart，并显示Notify Me。

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

@@ -967,7 +967,7 @@ self.isrefreshing=false;
         if (appDelegate.user && appDelegate.user_type == USER_ROLE_CUSTOMER) {
             cell.btnaddPortfolio.hidden = YES;
             
-            if (!notifyMe_switch || [Singleton sharedInstance].currentOrderIsMerged) {
+            if (!notifyMe_switch || ![Singleton sharedInstance].currentOrderIsMerged) {
                 
                 cell.btnNotifyMe.hidden = YES;
                 CGRect wishListFrame = cell.btnaddWish.frame;

RedAnt ERP Mobile/common/Functions/order/OrderListViewController.m

@@ -1909,7 +1909,7 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
     }
     
     UIImage *gray = [UIImage imageNamed:@"Combinegray"];
-    UIImage *green = [[UIImage imageNamed:@"Combinegreen"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+    UIImage *green = [[UIImage imageNamed:@"converttopo"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];//converttopo
     
     if (self.table_order.isEditing) {
         [self mergeListButtonClick:nil];

RedAnt ERP Mobile/common/Singleton.m

@@ -11,11 +11,16 @@
 
 @implementation Singleton
 
+- (void)dealloc {
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
 + (instancetype)sharedInstance {
     static Singleton *singleton = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         singleton = [[Singleton alloc] init];
+        [[NSNotificationCenter defaultCenter] addObserver:singleton selector:@selector(handleLogin:) name:User_LoginOK_Notification object:nil];
     });
     return singleton;
 }
@@ -33,4 +38,8 @@
     _global_lock = YES;
 }
 
+- (void)handleLogin:(NSNotification *)notification {
+    self.currentOrderIsMerged = NO;
+}
+
 @end

RedAnt ERP Mobile/iSales-NPD/AppDelegate.m

@@ -398,6 +398,13 @@
         
         MainViewController * main_vc= (MainViewController*)self.main_vc;
         
+        if (self.user_type == USER_ROLE_CUSTOMER) {
+            if (So == nil) {
+                // 释放订单
+                [Singleton sharedInstance].currentOrderIsMerged = NO;
+            }
+        }
+        
         if(self.user==nil)
         {
             

RedAnt ERP Mobile/iSales-NPD/Base.lproj/OLM.storyboard

@@ -241,8 +241,8 @@
                                                 <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="hrK-DY-RbO">
                                                     <frame key="frameInset" minX="10" minY="32" width="21" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <state key="normal" image="A4686F55-7B95-48A4-8590-0052A83E62D9"/>
-                                                    <state key="selected" image="4FF1D888-1593-458A-BB0D-0C21D3B0962B"/>
+                                                    <state key="normal" image="5EAA396F-78E1-4A79-BFA4-49DC0A9ED42E"/>
+                                                    <state key="selected" image="E92EB74B-9217-46B9-9AC1-909020CAC00F"/>
                                                     <connections>
                                                         <action selector="checkButtonClick:" destination="XXr-fU-67o" eventType="touchUpInside" id="KeU-ld-H4J"/>
                                                     </connections>
@@ -422,50 +422,50 @@
         </scene>
     </scenes>
     <resources>
-        <image name="4FF1D888-1593-458A-BB0D-0C21D3B0962B" width="24" height="24">
+        <image name="5EAA396F-78E1-4A79-BFA4-49DC0A9ED42E" width="24" height="24">
             <mutableData key="keyedArchiveRepresentation">
 YnBsaXN0MDDUAQIDBAUGPT5YJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoK4HCBMU
 GR4fIyQrLjE3OlUkbnVsbNUJCgsMDQ4PEBESVk5TU2l6ZVYkY2xhc3NcTlNJbWFnZUZsYWdzVk5TUmVw
 c1dOU0NvbG9ygAKADRIgwAAAgAOAC1h7MjQsIDI0fdIVChYYWk5TLm9iamVjdHOhF4AEgArSFQoaHaIb
 HIAFgAaACRAA0iAKISJfEBROU1RJRkZSZXByZXNlbnRhdGlvboAHgAhPERGeTU0AKgAACQgAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcHBxcVFRVIKSkpgkdHR+NISEjnKSkphRcXF0sICAgZAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANDQ0tLi4u
-k0ZGRt9QUFD/UlJS/1BQUP9QUFD/UlJS/1BQUP9HR0fgLy8vlw8PDzEAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAgICCCcnJ31LS0vuU1NT/1FRUf9PT0//T09P/09PT/9PT0//T09P
-/09PT/9RUVH/U1NT/0xMTPEoKCiEAwMDCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAQQNjY2
-q1NTU/9QUFD/T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/1BQUP9TU1P/ODg4
-sgYGBhQAAAAAAAAAAAAAAAAAAAAAAAAAAAICAgk2NjarVFRU/09PT/9PT0//T09P/09PT/9PT0//T09P
-/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9OTk7/UVFR/zg4OLMDAwMLAAAAAAAAAAAAAAAAAAAA
-ACYmJnxTU1P/T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P
-/0xMTP9WVlb/X19f/1JSUv8oKCiGAAAAAAAAAAAAAAAADAwMK0pKSu5QUFD/T09P/09PT/9PT0//T09P
-/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//SkpK/29vb//Z2dn/7+/v/5KSkv9ISEjyDw8P
-MwAAAAAAAAAALS0tklNTU/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P
-/09PT/9KSkr/cHBw/+np6f///////////8fHx/9PT0//MDAwnAAAAAAGBgYVRUVF3lFRUf9OTk7/SkpK
-/0pKSv9OTk7/T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/0pKSv9wcHD/6enp////////////+/v7
-/4eHh/9NTU3/R0dH5QgICBoUFBRET09P/E5OTv9TU1P/lZWV/52dnf9TU1P/TU1N/09PT/9PT0//T09P
-/09PT/9PT0//SkpK/3BwcP/q6ur////////////8/Pz/lZWV/0xMTP9PT0//UFBQ/xgYGFAmJiZ8UlJS
-/0pKSv+cnJz///////////+3t7f/UFBQ/01NTf9PT0//T09P/09PT/9KSkr/cHBw/+rq6v//////////
-//z8/P+Wlpb/S0tL/05OTv9PT0//UlJS/y8vL5YwMDCbUlJS/0tLS/+xsbH/////////////////t7e3
-/1BQUP9NTU3/T09P/0pKSv9wcHD/6urq/////////////Pz8/5aWlv9LS0v/Tk5O/09PT/9PT0//T09P
-/0xMTPswMDCbUlJS/01NTf9ZWVn/ysrK/////////////////7u7u/9RUVH/R0dH/3BwcP/s7Oz/////
-///////8/Pz/k5OT/0tLS/9OTk7/T09P/09PT/9PT0//T09P/0xMTPsmJiZ8UlJS/09PT/9MTEz/WFhY
-/8rKyv////////////////+3t7f/dnZ2/+rq6v////////////z8/P+Tk5P/S0tL/05OTv9PT0//T09P
-/09PT/9PT0//UlJS/y8vL5YUFBRET09P/FBQUP9PT0//TExM/1hYWP/Lysr/////////////////+vr6
-/////////////Pz8/5OTk/9LS0v/Tk5O/09PT/9PT0//T09P/09PT/9PT0//UFBQ/xgYGFAGBgYVRUVF
-3lFRUf9PT0//T09P/0xMTP9YWFj/y8vK///////////////////////8/Pz/k5OT/0tLS/9OTk7/T09P
-/09PT/9PT0//T09P/09PT/9RUVH/R0dH5QgICBoAAAAALS0tklNTU/9PT0//T09P/09PT/9NTU3/WFhY
-/8vKyv////////////7+/v+RkZH/S0tL/05OTv9PT0//T09P/09PT/9PT0//T09P/09PT/9TU1P/MDAw
-nAAAAAAAAAAADAwMK0pKSu5QUFD/T09P/09PT/9PT0//TExM/1hYWP/FxcX/7Ozs/5CQkP9LS0v/Tk5O
-/09PT/9PT0//T09P/09PT/9PT0//T09P/1BQUP9MTEzyDw8PMwAAAAAAAAAAAAAAACYmJnxTU1P/T09P
-/09PT/9PT0//T09P/01NTf9SUlL/XV1d/0xMTP9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P
-/1NTU/8oKCiGAAAAAAAAAAAAAAAAAAAAAAICAgk2NjarVFRU/09PT/9PT0//T09P/09PT/9OTk7/TU1N
-/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//VFRU/zg4OLMDAwMLAAAAAAAAAAAAAAAAAAAA
-AAAAAAAEBAQQNjY2q1NTU/9QUFD/T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P
-/1BQUP9TU1P/ODg4sgYGBhQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgICCCcnJ31LS0vuU1NT
-/1FRUf9PT0//T09P/09PT/9PT0//T09P/09PT/9RUVH/U1NT/0xMTPEoKCiEAwMDCwAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANDQ0tLi4uk0ZGRt9QUFD/UlJS/1JSUv9SUlL/UlJS
-/1BQUP9HR0fgLy8vlw8PDzEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAcHBxcWFhZJKSkpgjExMZ0xMTGdKSkphRcXF0wICAgZAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8NCxQzMCw/YVxYdYaAeqCHgHuiZF1adzUyL0IPDg0WAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgHBspdW9t
+h7m1scjY1NPh4N3d5d/d2+Pd3dzi39/d5djV1OG6t7PLeXRwiyMhHi0AAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAABAMDB2BbV3PIw8HY4+Ph59/g4ODc3N3d29vb29vb29vb29vb29vb
+29zc3Nzf4ODg4uLh5srIxNpmYV55BgUECgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJCQcOh4J9
+m9/d3ejf39/f29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb297f39/h4N3pj4iE
+owwLCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAUEBAiGgH2b4+Ph6dzc3Nzb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vc3Nzc5OPi6I+IhaMHBgUKAAAAAAAAAAAAAAAAAAAA
+AF5aVnDf3t3o3Nzd3dvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb3Nzc3OLf3uhnYV16AAAAAAAAAAAAAAAAHhsZJ8fCvtfe39/f29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb297e39/NycXbJCEf
+LgAAAAAAAAAAcmxphOPj4efb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vi4uLme3ZyjgAAAAANDAkSt7Oux+Dh4OHb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vf3+DgvLi0zRAPDRcvLCk81tPR4Nzd3d3b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vc3N3d2dXT4jk0MkZcVlFv393c
+5dvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb4N/d5WljXn13cGyO39/f5Nvb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29va
+37CnntV3cGyO39/f5Nvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29va37CnntVcVlFv393c5dvb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb4N/d5WljXn0vLCk81tPR4Nzd3d3b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vc3N3d2dXT4jk2MUYNDAkSt7Ou
+x+Dh4OHb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vf3+DgvLi0zRAPDhcAAAAAcmxphOPj4efb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vi4uLme3Zy
+jgAAAAAAAAAAHhsZJ8fCvtfe39/f29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb297e39/MycXcJCEfLgAAAAAAAAAAAAAAAF5aVnDf3t3o3Nzd
+3dvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb3Nzc
+3OLf3uhnYV16AAAAAAAAAAAAAAAAAAAAAAUEBAiGgH2b4+Ph6dzc3Nzb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vc3Nzc5OPi6I+IhaMHBgUKAAAAAAAAAAAAAAAAAAAA
+AAAAAAAJCQgOh4J9m9/d3ejf39/f29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+297f39/h4N3pj4iEowwLCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAMDB2BbV3PIw8HY4+Ph
+59/g4ODc3N3d29vb29vb29vb29vb29vb29zc3Nzf4ODg4uLh5srIxNpmYV55BgUECgAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgHBspdW9th7m1scjY1NPh393d5d/f3+Tf39/k393d
+5djV1OG6t7PLeXNwiyMhHi0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAA8NCxQzMCw/YlxZdX13cpV+eHKWZF5adzUyL0IPDg0WAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABgAAAEBAAMAAAABABgAAAECAAMAAAAEAAAJtgEDAAMA
 AAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAESAAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMA
 AAABABgAAAEXAAQAAAABAAAJAAEcAAMAAAABAAEAAAFSAAMAAAABAAEAAAFTAAMAAAAEAAAJvodzAAcA
@@ -512,50 +512,50 @@ EvIS+hMHEwwTDhMQExUTHRMgEyUTLRMwE0ITRRNKAAAAAAAAAgEAAAAAAAAAQQAAAAAAAAAAAAAAAAAA
 E0w
 </mutableData>
         </image>
-        <image name="A4686F55-7B95-48A4-8590-0052A83E62D9" width="24" height="24">
+        <image name="E92EB74B-9217-46B9-9AC1-909020CAC00F" width="24" height="24">
             <mutableData key="keyedArchiveRepresentation">
 YnBsaXN0MDDUAQIDBAUGPT5YJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoK4HCBMU
 GR4fIyQrLjE3OlUkbnVsbNUJCgsMDQ4PEBESVk5TU2l6ZVYkY2xhc3NcTlNJbWFnZUZsYWdzVk5TUmVw
 c1dOU0NvbG9ygAKADRIgwAAAgAOAC1h7MjQsIDI0fdIVChYYWk5TLm9iamVjdHOhF4AEgArSFQoaHaIb
 HIAFgAaACRAA0iAKISJfEBROU1RJRkZSZXByZXNlbnRhdGlvboAHgAhPERGeTU0AKgAACQgAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8NCxQzMCw/YVxYdYaAeqCHgHuiZF1adzUyL0IPDg0WAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgHBspdW9t
-h7m1scjY1NPh4N3d5d/d2+Pd3dzi39/d5djV1OG6t7PLeXRwiyMhHi0AAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAABAMDB2BbV3PIw8HY4+Ph59/g4ODc3N3d29vb29vb29vb29vb29vb
-29zc3Nzf4ODg4uLh5srIxNpmYV55BgUECgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJCQcOh4J9
-m9/d3ejf39/f29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb297f39/h4N3pj4iE
-owwLCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAUEBAiGgH2b4+Ph6dzc3Nzb29vb29vb29vb29vb29vb29vb
-29vb29vb29vb29vb29vb29vb29vb29vb29vb29vc3Nzc5OPi6I+IhaMHBgUKAAAAAAAAAAAAAAAAAAAA
-AF5aVnDf3t3o3Nzd3dvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
-29vb29vb29vb3Nzc3OLf3uhnYV16AAAAAAAAAAAAAAAAHhsZJ8fCvtfe39/f29vb29vb29vb29vb29vb
-29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb297e39/NycXbJCEf
-LgAAAAAAAAAAcmxphOPj4efb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
-29vb29vb29vb29vb29vb29vb29vb29vb29vb29vi4uLme3ZyjgAAAAANDAkSt7Oux+Dh4OHb29vb29vb
-29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
-29vb29vf3+DgvLi0zRAPDRcvLCk81tPR4Nzd3d3b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
-29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vc3N3d2dXT4jk0MkZcVlFv393c
-5dvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
-29vb29vb29vb29vb29vb29vb29vb4N/d5WljXn13cGyO39/f5Nvb29vb29vb29vb29vb29vb29vb29vb
-29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29va
-37CnntV3cGyO39/f5Nvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
-29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29va37CnntVcVlFv393c5dvb29vb29vb29vb
-29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
-29vb29vb29vb4N/d5WljXn0vLCk81tPR4Nzd3d3b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
-29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vc3N3d2dXT4jk2MUYNDAkSt7Ou
-x+Dh4OHb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
-29vb29vb29vb29vb29vb29vf3+DgvLi0zRAPDhcAAAAAcmxphOPj4efb29vb29vb29vb29vb29vb29vb
-29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vi4uLme3Zy
-jgAAAAAAAAAAHhsZJ8fCvtfe39/f29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
-29vb29vb29vb29vb29vb29vb29vb29vb297e39/MycXcJCEfLgAAAAAAAAAAAAAAAF5aVnDf3t3o3Nzd
-3dvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb3Nzc
-3OLf3uhnYV16AAAAAAAAAAAAAAAAAAAAAAUEBAiGgH2b4+Ph6dzc3Nzb29vb29vb29vb29vb29vb29vb
-29vb29vb29vb29vb29vb29vb29vb29vb29vb29vc3Nzc5OPi6I+IhaMHBgUKAAAAAAAAAAAAAAAAAAAA
-AAAAAAAJCQgOh4J9m9/d3ejf39/f29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
-297f39/h4N3pj4iEowwLCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAMDB2BbV3PIw8HY4+Ph
-59/g4ODc3N3d29vb29vb29vb29vb29vb29zc3Nzf4ODg4uLh5srIxNpmYV55BgUECgAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgHBspdW9th7m1scjY1NPh393d5d/f3+Tf39/k393d
-5djV1OG6t7PLeXNwiyMhHi0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAA8NCxQzMCw/YlxZdX13cpV+eHKWZF5adzUyL0IPDg0WAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcHBxcVFRVIKSkpgkdHR+NISEjnKSkphRcXF0sICAgZAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANDQ0tLi4u
+k0ZGRt9QUFD/UlJS/1BQUP9QUFD/UlJS/1BQUP9HR0fgLy8vlw8PDzEAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAgICCCcnJ31LS0vuU1NT/1FRUf9PT0//T09P/09PT/9PT0//T09P
+/09PT/9RUVH/U1NT/0xMTPEoKCiEAwMDCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAQQNjY2
+q1NTU/9QUFD/T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/1BQUP9TU1P/ODg4
+sgYGBhQAAAAAAAAAAAAAAAAAAAAAAAAAAAICAgk2NjarVFRU/09PT/9PT0//T09P/09PT/9PT0//T09P
+/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9OTk7/UVFR/zg4OLMDAwMLAAAAAAAAAAAAAAAAAAAA
+ACYmJnxTU1P/T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P
+/0xMTP9WVlb/X19f/1JSUv8oKCiGAAAAAAAAAAAAAAAADAwMK0pKSu5QUFD/T09P/09PT/9PT0//T09P
+/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//SkpK/29vb//Z2dn/7+/v/5KSkv9ISEjyDw8P
+MwAAAAAAAAAALS0tklNTU/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P
+/09PT/9KSkr/cHBw/+np6f///////////8fHx/9PT0//MDAwnAAAAAAGBgYVRUVF3lFRUf9OTk7/SkpK
+/0pKSv9OTk7/T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/0pKSv9wcHD/6enp////////////+/v7
+/4eHh/9NTU3/R0dH5QgICBoUFBRET09P/E5OTv9TU1P/lZWV/52dnf9TU1P/TU1N/09PT/9PT0//T09P
+/09PT/9PT0//SkpK/3BwcP/q6ur////////////8/Pz/lZWV/0xMTP9PT0//UFBQ/xgYGFAmJiZ8UlJS
+/0pKSv+cnJz///////////+3t7f/UFBQ/01NTf9PT0//T09P/09PT/9KSkr/cHBw/+rq6v//////////
+//z8/P+Wlpb/S0tL/05OTv9PT0//UlJS/y8vL5YwMDCbUlJS/0tLS/+xsbH/////////////////t7e3
+/1BQUP9NTU3/T09P/0pKSv9wcHD/6urq/////////////Pz8/5aWlv9LS0v/Tk5O/09PT/9PT0//T09P
+/0xMTPswMDCbUlJS/01NTf9ZWVn/ysrK/////////////////7u7u/9RUVH/R0dH/3BwcP/s7Oz/////
+///////8/Pz/k5OT/0tLS/9OTk7/T09P/09PT/9PT0//T09P/0xMTPsmJiZ8UlJS/09PT/9MTEz/WFhY
+/8rKyv////////////////+3t7f/dnZ2/+rq6v////////////z8/P+Tk5P/S0tL/05OTv9PT0//T09P
+/09PT/9PT0//UlJS/y8vL5YUFBRET09P/FBQUP9PT0//TExM/1hYWP/Lysr/////////////////+vr6
+/////////////Pz8/5OTk/9LS0v/Tk5O/09PT/9PT0//T09P/09PT/9PT0//UFBQ/xgYGFAGBgYVRUVF
+3lFRUf9PT0//T09P/0xMTP9YWFj/y8vK///////////////////////8/Pz/k5OT/0tLS/9OTk7/T09P
+/09PT/9PT0//T09P/09PT/9RUVH/R0dH5QgICBoAAAAALS0tklNTU/9PT0//T09P/09PT/9NTU3/WFhY
+/8vKyv////////////7+/v+RkZH/S0tL/05OTv9PT0//T09P/09PT/9PT0//T09P/09PT/9TU1P/MDAw
+nAAAAAAAAAAADAwMK0pKSu5QUFD/T09P/09PT/9PT0//TExM/1hYWP/FxcX/7Ozs/5CQkP9LS0v/Tk5O
+/09PT/9PT0//T09P/09PT/9PT0//T09P/1BQUP9MTEzyDw8PMwAAAAAAAAAAAAAAACYmJnxTU1P/T09P
+/09PT/9PT0//T09P/01NTf9SUlL/XV1d/0xMTP9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P
+/1NTU/8oKCiGAAAAAAAAAAAAAAAAAAAAAAICAgk2NjarVFRU/09PT/9PT0//T09P/09PT/9OTk7/TU1N
+/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//VFRU/zg4OLMDAwMLAAAAAAAAAAAAAAAAAAAA
+AAAAAAAEBAQQNjY2q1NTU/9QUFD/T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P
+/1BQUP9TU1P/ODg4sgYGBhQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgICCCcnJ31LS0vuU1NT
+/1FRUf9PT0//T09P/09PT/9PT0//T09P/09PT/9RUVH/U1NT/0xMTPEoKCiEAwMDCwAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANDQ0tLi4uk0ZGRt9QUFD/UlJS/1JSUv9SUlL/UlJS
+/1BQUP9HR0fgLy8vlw8PDzEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAcHBxcWFhZJKSkpgjExMZ0xMTGdKSkphRcXF0wICAgZAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABgAAAEBAAMAAAABABgAAAECAAMAAAAEAAAJtgEDAAMA
 AAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAESAAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMA
 AAABABgAAAEXAAQAAAABAAAJAAEcAAMAAAABAAEAAAFSAAMAAAABAAEAAAFTAAMAAAAEAAAJvodzAAcA

RedAnt ERP Mobile/iSales-NPD/CUL.storyboard

@@ -106,10 +106,10 @@
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CategoryPriceCell" rowHeight="47" id="rnb-EK-8yY" customClass="CategoryPriceCell">
-                                        <rect key="frame" x="0.0" y="28" width="1000" height="47"/>
+                                        <rect key="frame" x="0.0" y="28" width="768" height="47"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rnb-EK-8yY" id="WGZ-Bw-E4C">
-                                            <frame key="frameInset" width="1000" height="46.5"/>
+                                            <frame key="frameInset" width="768" height="46.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Dinning" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3fh-vo-1qn">
@@ -146,13 +146,25 @@
                                     <outlet property="delegate" destination="oSP-hP-k8X" id="HLo-n3-dvs"/>
                                 </connections>
                             </tableView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pax-hz-53j">
+                                <string key="text">Example: If MSRP = $100 then Store price is set based on below formula
+MSRP X 30% ($100 x 30%) = $30
+MSRP X 130%($100x130%) = $130</string>
+                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstAttribute="trailing" secondItem="6fy-Su-eKE" secondAttribute="trailing" id="FhU-0p-lW1"/>
+                            <constraint firstAttribute="trailing" secondItem="pax-hz-53j" secondAttribute="trailing" constant="10" id="Q3Q-YF-TPs"/>
                             <constraint firstItem="oqY-Ei-LvT" firstAttribute="top" secondItem="6fy-Su-eKE" secondAttribute="bottom" constant="25" id="Vi5-69-OZK"/>
-                            <constraint firstItem="6fy-Su-eKE" firstAttribute="top" secondItem="ZSB-9h-J88" secondAttribute="top" id="hFe-0c-xUS"/>
+                            <constraint firstItem="6fy-Su-eKE" firstAttribute="top" secondItem="ZSB-9h-J88" secondAttribute="top" constant="100" id="hFe-0c-xUS"/>
                             <constraint firstItem="6fy-Su-eKE" firstAttribute="leading" secondItem="ZSB-9h-J88" secondAttribute="leading" id="m7X-JS-wag"/>
+                            <constraint firstItem="pax-hz-53j" firstAttribute="top" secondItem="cjA-Km-Rwg" secondAttribute="bottom" id="oXr-qU-1Qc"/>
+                            <constraint firstItem="6fy-Su-eKE" firstAttribute="top" secondItem="pax-hz-53j" secondAttribute="bottom" id="vgB-ha-zsu"/>
+                            <constraint firstItem="pax-hz-53j" firstAttribute="leading" secondItem="ZSB-9h-J88" secondAttribute="leading" constant="10" id="yg5-AA-ncd"/>
                         </constraints>
                     </view>
                     <connections>
@@ -161,7 +173,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="QjD-0M-bvN" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="173" y="-447"/>
+            <point key="canvasLocation" x="35" y="-451"/>
         </scene>
         <!--Set Price-->
         <scene sceneID="9Rz-bc-82n">

RedAnt ERP Mobile/iSales-NPD/Images.xcassets/converttopo.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "converttopo.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "converttopo@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "converttopo@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

RedAnt ERP Mobile/iSales-NPD/config.h

@@ -12,7 +12,7 @@
 
 #define test_server
 #define exception_switch 1
-#define notifyMe_switch 0
+#define notifyMe_switch 1
 
 //#define ab_lager @"Delivery price"
 #define flat_price @"MSRP"