Selaa lähdekoodia

修改Purchase Order -> Purchase Order to NPD。
修改Customer登陆时取消设置锁。

Pen Li 9 vuotta sitten
vanhempi
commit
5ef44c56af

BIN
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/UserInterfaceState.xcuserstate


+ 2 - 2
RedAnt ERP Mobile/common/Functions/order/OrderListViewController.m

@@ -1916,7 +1916,7 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
         // 结束选择时恢复
         if ([Singleton sharedInstance].customer_can_see_sales_Order && ![Singleton sharedInstance].global_lock) { // 有查看Sales order 权限,并且app没有锁
             if (self.orderTypeSegmentControl.numberOfSegments == 1) {
-                [self.orderTypeSegmentControl insertSegmentWithTitle:@"Purchase Order" atIndex:1 animated:YES];
+                [self.orderTypeSegmentControl insertSegmentWithTitle:@"Purchase Order to NPD" atIndex:1 animated:YES];
             }
         }
         
@@ -2088,7 +2088,7 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
     } else { // 解锁
         if ([Singleton sharedInstance].customer_can_see_sales_Order) { // 有查看Sales order 权限
             if (self.orderTypeSegmentControl.numberOfSegments == 1 && !self.table_order.isEditing) {
-                [self.orderTypeSegmentControl insertSegmentWithTitle:@"Purchase Order" atIndex:1 animated:YES];
+                [self.orderTypeSegmentControl insertSegmentWithTitle:@"Purchase Order to NPD" atIndex:1 animated:YES];
             }
         }
         

+ 1 - 1
RedAnt ERP Mobile/common/Singleton.m

@@ -35,7 +35,7 @@
 }
 
 - (void)resetGlobalLock {
-    _global_lock = YES;
+    _global_lock = NO;
 }
 
 - (void)handleLogin:(NSNotification *)notification {

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 134 - 131
RedAnt ERP Mobile/iSales-NPD/Base.lproj/Main.storyboard


+ 1 - 1
RedAnt ERP Mobile/iSales-NPD/config.h

@@ -10,7 +10,7 @@
 #define RedAnt_ERP_Mobile_config_h
 #define BUILD_NPD
 
-//#define test_server
+#define test_server
 #define exception_switch 1
 #define notifyMe_switch 0
 

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä