161121

TEST VERSION 1.6.161121

RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2201,11 +2201,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/pdfCreator/PDFDrawable.m"
-            timestampString = "501389977.456149"
+            timestampString = "501404802.105593"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "77"
-            endingLineNumber = "77"
+            startingLineNumber = "80"
+            endingLineNumber = "80"
             landmarkName = "-to_parent_rect:pos:offsetX:offsetY:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2242,5 +2242,37 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/pdfCreator/PDFDrawable.m"
+            timestampString = "501404891.608329"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "45"
+            endingLineNumber = "45"
+            landmarkName = "-DrawBound:dataSource:ParentRect:startX:startY:flipHeight:range:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/pdfCreator/PDFDrawable.m"
+            timestampString = "501404975.694309"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "40"
+            endingLineNumber = "40"
+            landmarkName = "-DrawBound:dataSource:ParentRect:startX:startY:flipHeight:range:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Expressions.xcexplist

@@ -3,10 +3,10 @@
    version = "1.0">
    <ContextStates>
       <ContextState
-         contextName = "-[NSData(LowLevelCommonCryptor) dataEncryptedUsingAlgorithm:key:initializationVector:options:error:]:NSData+CommonCrypto.m">
+         contextName = "+[RAUtils arr2string:separator:trim:]:RAUtils.m">
       </ContextState>
       <ContextState
-         contextName = "-[AppDelegate connectionDidFinishLoading:]:AppDelegate.m">
+         contextName = "-[TableDrawable Draw:dataSource:ParentRect:startX:startY:flipHeight:range:]:TableDrawable.m">
       </ContextState>
       <ContextState
          contextName = "-[NSData(LowLevelCommonCryptor) _runCryptor:result:]:NSData+CommonCrypto.m">
@@ -17,21 +17,35 @@
          </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "+[RAUtils arr2string:separator:trim:]:RAUtils.m">
+         contextName = "-[NSData(LowLevelCommonCryptor) dataEncryptedUsingAlgorithm:key:initializationVector:options:error:]:NSData+CommonCrypto.m">
       </ContextState>
       <ContextState
-         contextName = "-[FunctionTestViewController printInteractionController:choosePaper:]:FunctionTestViewController.m">
+         contextName = "__30-[DetailHeaderCell addtocart:]_block_invoke_3:DetailHeaderCell.m">
          <PersistentStrings>
             <PersistentString
-               value = "paper.paperSize">
+               value = "self.cqty">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "__30-[DetailHeaderCell addtocart:]_block_invoke_3:DetailHeaderCell.m">
+         contextName = "-[PDFDrawable to_parent_rect:pos:offsetX:offsetY:]:PDFDrawable.m">
+      </ContextState>
+      <ContextState
+         contextName = "-[PDFDrawable DrawBound:dataSource:ParentRect:startX:startY:flipHeight:range:]:PDFDrawable.m">
          <PersistentStrings>
             <PersistentString
-               value = "self.cqty">
+               value = "self.drawableTemplate[@&quot;draw_bound&quot;]">
+            </PersistentString>
+         </PersistentStrings>
+      </ContextState>
+      <ContextState
+         contextName = "-[AppDelegate connectionDidFinishLoading:]:AppDelegate.m">
+      </ContextState>
+      <ContextState
+         contextName = "-[FunctionTestViewController printInteractionController:choosePaper:]:FunctionTestViewController.m">
+         <PersistentStrings>
+            <PersistentString
+               value = "paper.paperSize">
             </PersistentString>
          </PersistentStrings>
       </ContextState>

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

@@ -870,15 +870,17 @@
                     self.btnCopy.enabled = false;
                 else
                     self.btnCopy.enabled = true;
+                
+                AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
                 int model_count =[[self.content_data valueForKey:@"model_count"] intValue];
-                if(model_count>0)
+                if(model_count>0&& ! appDelegate.offline_mode)
                     self.btnPDF.enabled =true;
                 //            [self.btnPDF setImage:[[UIImage imageNamed:@"download"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]];
                 
                 NSString* status = [self.content_data valueForKey:@"order_status"];
                 int status_code = [[self.content_data valueForKey:@"orderStatus"] intValue];
                 NSString* lock_user = [self.content_data valueForKey:@"opened_customer"];
-                AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+
                 bool offline_edit =[[self.content_data valueForKey:@"offline_edit"] boolValue];
                 if(status_code==1)//[status isEqualToString:@"Saved Order"])
                 {

RedAnt ERP Mobile/common/pdfCreator/PDFDrawable.m

@@ -40,35 +40,38 @@
     if(!PDF_DEBUG&&![self.drawableTemplate[@"draw_bound"] boolValue] )
     return;
     
+    
+    NSArray* arr_linewidth=self.drawableTemplate[@"line_width"];
     CGRect rect = [self rect];//[self to_pdf_rect:p_rect pos:self.rect contextHeight:flip_height];
 
-    NSMutableDictionary* tline4= [LineDrawable createlineTemplate:0.05 from:CGPointMake(rect.origin.x, rect.origin.y+rect.size.height) to:CGPointMake(rect.origin.x, rect.origin.y)];
-    LineDrawable* line4=nil;
-    line4= [[LineDrawable alloc] init:tline4];
-    [line4 Draw:context dataSource:data ParentRect:p_rect startX:x startY:y flipHeight:flip_height range:between_header_and_footer];
-    
-    
-    NSMutableDictionary* tline3= [LineDrawable createlineTemplate:0.05 from:CGPointMake(rect.origin.x+rect.size.width, rect.origin.y+rect.size.height) to:CGPointMake(rect.origin.x, rect.origin.y+rect.size.height)];
-    LineDrawable* line3=nil;
-    line3= [[LineDrawable alloc] init:tline3];
-    [line3 Draw:context dataSource:data ParentRect:p_rect startX:x startY:y flipHeight:flip_height range:between_header_and_footer];
+
     
+
     
     
-    NSMutableDictionary* tline2= [LineDrawable createlineTemplate:0.05 from:CGPointMake(rect.origin.x+rect.size.width, rect.origin.y) to:CGPointMake(rect.origin.x+rect.size.width, rect.origin.y+rect.size.height)];
-    LineDrawable* line2=nil;
-    line2= [[LineDrawable alloc] init:tline2];
-    [line2 Draw:context dataSource:data ParentRect:p_rect startX:x startY:y flipHeight:flip_height range:between_header_and_footer];
+    if(arr_linewidth.count<4)
+        arr_linewidth = [NSArray arrayWithObjects:@(0.05),@(0.05),@(0.05),@(0.05), nil];
     
-    NSMutableDictionary* tline1= [LineDrawable createlineTemplate:0.05 from:CGPointMake(rect.origin.x, rect.origin.y) to:CGPointMake(rect.origin.x+rect.size.width, rect.origin.y)];
+    NSMutableDictionary* tline1= [LineDrawable createlineTemplate:[arr_linewidth[0] floatValue] from:CGPointMake(rect.origin.x, rect.origin.y) to:CGPointMake(rect.origin.x+rect.size.width, rect.origin.y)];
         LineDrawable* line1=nil;
     line1= [[LineDrawable alloc] init:tline1];
     [line1 Draw:context dataSource:data ParentRect:p_rect startX:x startY:y flipHeight:flip_height range:between_header_and_footer];
     
+    NSMutableDictionary* tline2= [LineDrawable createlineTemplate:[arr_linewidth[1] floatValue] from:CGPointMake(rect.origin.x+rect.size.width, rect.origin.y) to:CGPointMake(rect.origin.x+rect.size.width, rect.origin.y+rect.size.height)];
+    LineDrawable* line2=nil;
+    line2= [[LineDrawable alloc] init:tline2];
+    [line2 Draw:context dataSource:data ParentRect:p_rect startX:x startY:y flipHeight:flip_height range:between_header_and_footer];
     
+    NSMutableDictionary* tline3= [LineDrawable createlineTemplate:[arr_linewidth[2] floatValue] from:CGPointMake(rect.origin.x+rect.size.width, rect.origin.y+rect.size.height) to:CGPointMake(rect.origin.x, rect.origin.y+rect.size.height)];
+    LineDrawable* line3=nil;
+    line3= [[LineDrawable alloc] init:tline3];
+    [line3 Draw:context dataSource:data ParentRect:p_rect startX:x startY:y flipHeight:flip_height range:between_header_and_footer];
     
+    NSMutableDictionary* tline4= [LineDrawable createlineTemplate:[arr_linewidth[3] floatValue] from:CGPointMake(rect.origin.x, rect.origin.y+rect.size.height) to:CGPointMake(rect.origin.x, rect.origin.y)];
+    LineDrawable* line4=nil;
+    line4= [[LineDrawable alloc] init:tline4];
+    [line4 Draw:context dataSource:data ParentRect:p_rect startX:x startY:y flipHeight:flip_height range:between_header_and_footer];
     
-
 }
 
 

RedAnt ERP Mobile/iSales-NPD/iSales-NPD-Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>161108</string>
+	<string>161121</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

RedAnt ERP Mobile/iSales-NPD/so_thumb.json

@@ -56,6 +56,8 @@
                         "text": "SO No.",
                         "source_type": "const",
                         "textAlignment": "Center",
+                        "draw_bound":true,
+                        "line_width":[1,1,0,0],
                         "vAlign": "Middle",
                         "size": "10",
                         "bold": true,
@@ -67,6 +69,8 @@
                     "item_4": {
                         "type": "text",
                         "text": "DATE",
+                        "draw_bound":true,
+                        "line_width":[1,1,0,1],
                         "source_type": "const",
                         "textAlignment": "Center",
                         "vAlign": "Middle",
@@ -121,6 +125,8 @@
                         "text": "VENDOR No.",
                         "source_type": "const",
                         "textAlignment": "Center",
+                        "draw_bound":true,
+                        "line_width":[1,1,0,0],
                         "vAlign": "Middle",
                         "size": "10",
                         "bold": true,
@@ -135,6 +141,8 @@
                         "source_type": "data",
                         "textAlignment": "Center",
                         "vAlign": "Middle",
+                        "draw_bound":true,
+                        "line_width":[1,1,1,0],
                         "size": "10",
                         "bold": true,
                         "x": 373,
@@ -147,6 +155,8 @@
                         "source": "date",
                         "source_type": "data",
                         "textAlignment": "Center",
+                        "draw_bound":true,
+                        "line_width":[1,1,1,1],
                         "vAlign": "Middle",
                         "size": "10",
                         "bold": true,
@@ -248,9 +258,11 @@
                     },
                     "item_18": {
                         "type": "text",
-                        "source": "ship_to",
-                        "source_type": "data",
+                        "text": "SHIP TO",
+                        "source_type": "const",
                         "textAlignment": "left",
+                        "draw_bound":true,
+                        "line_width":[1,1,0,1],
                         "vAlign": "Middle",
                         "size": "10",
                         "bold": true,
@@ -264,6 +276,8 @@
                         "source": "vender_no",
                         "source_type": "data",
                         "textAlignment": "left",
+                        "draw_bound":true,
+                        "line_width":[1,1,1,0],
                         "vAlign": "Middle",
                         "size": "10",
                         "bold": true,
@@ -274,9 +288,11 @@
                     },
                     "item_20": {
                         "type": "text",
-                        "source": "bill_to",
-                        "source_type": "data",
+                        "text": "BILL TO",
+                        "source_type": "const",
                         "textAlignment": "left",
+                        "draw_bound":true,
+                        "line_width":[1,1,0,1],
                         "vAlign": "Middle",
                         "size": "10",
                         "bold": true,
@@ -290,6 +306,8 @@
                         "source": "bill_to_name",
                         "source_type": "data",
                         "textAlignment": "left",
+                        "draw_bound":true,
+                        "line_width":[1,1,0,1],
                         "vAlign": "Middle",
                         "size": "10",
                         "bold": true,
@@ -303,6 +321,8 @@
                         "source": "ship_to_name",
                         "source_type": "data",
                         "textAlignment": "left",
+                        "draw_bound":true,
+                        "line_width":[1,1,0,0],
                         "vAlign": "Middle",
                         "size": "10",
                         "bold": true,
@@ -317,6 +337,8 @@
                         "source_type": "data",
                         "textAlignment": "left",
                         "vAlign": "Middle",
+                        "draw_bound":true,
+                        "line_width":[0,1,1,1],
                         "size": "10",
                         "bold": true,
                         "x": 0,
@@ -329,6 +351,8 @@
                         "source": "ship_to_ext",
                         "source_type": "data",
                         "textAlignment": "left",
+                        "draw_bound":true,
+                        "line_width":[0,1,1,0],
                         "vAlign": "Middle",
                         "size": "10",
                         "bold": true,
@@ -350,6 +374,8 @@
                                 "text": "CARRIER",
                                 "source_type": "const",
                                 "textAlignment": "CENTER",
+                                "draw_bound":true,
+                                "line_width":[1,1,1,0],
                                 "vAlign": "Middle",
                                 "x": 352,
                                 "y": 0,
@@ -360,7 +386,9 @@
                                 "type": "text",
                                 "source": "carrier",
                                 "source_type": "data",
-                                "source_isexpression": true,
+                                "draw_bound":true,
+                                "line_width":[0,1,1,0],
+                                "source_isexpression": false,
                                 "textAlignment": "Right",
                                 "vAlign": "Middle",
                                 "x": 352,
@@ -373,6 +401,8 @@
                                 "text": "PO No.",
                                 "source_type": "const",
                                 "textAlignment": "CENTER",
+                                "draw_bound":true,
+                                "line_width":[1,1,1,1],
                                 "vAlign": "Middle",
                                 "x": 0,
                                 "y": 0,
@@ -383,7 +413,9 @@
                                 "type": "text",
                                 "source": "po_no",
                                 "source_type": "data",
-                                "source_isexpression": true,
+                                "draw_bound":true,
+                                "line_width":[0,1,1,1],
+                                "source_isexpression": false,
                                 "textAlignment": "Right",
                                 "vAlign": "Middle",
                                 "x": 0,
@@ -396,6 +428,8 @@
                                 "text": "TERMS",
                                 "source_type": "const",
                                 "textAlignment": "CENTER",
+                                "draw_bound":true,
+                                "line_width":[1,1,1,0],
                                 "vAlign": "Middle",
                                 "x": 91,
                                 "y": 0,
@@ -406,7 +440,9 @@
                                 "type": "text",
                                 "source": "terms",
                                 "source_type": "data",
-                                "source_isexpression": true,
+                                "source_isexpression": false,
+                                "draw_bound":true,
+                                "line_width":[0,1,1,0],
                                 "textAlignment": "Right",
                                 "vAlign": "Middle",
                                 "x": 91,
@@ -419,6 +455,8 @@
                                 "text": "REP",
                                 "source_type": "const",
                                 "textAlignment": "CENTER",
+                                "draw_bound":true,
+                                "line_width":[1,1,1,0],
                                 "vAlign": "Middle",
                                 "x": 164,
                                 "y": 0,
@@ -429,7 +467,9 @@
                                 "type": "text",
                                 "source": "rep",
                                 "source_type": "data",
-                                "source_isexpression": true,
+                                "draw_bound":true,
+                                "line_width":[0,1,1,0],
+                                "source_isexpression": false,
                                 "textAlignment": "Right",
                                 "vAlign": "Middle",
                                 "x": 164,
@@ -441,6 +481,8 @@
                                 "type": "text",
                                 "text": "EST. SCHEDULE",
                                 "source_type": "const",
+                                "draw_bound":true,
+                                "line_width":[1,1,1,0],
                                 "textAlignment": "CENTER",
                                 "vAlign": "Middle",
                                 "x": 224,
@@ -452,7 +494,9 @@
                                 "type": "text",
                                 "source": "e_schdule",
                                 "source_type": "data",
-                                "source_isexpression": true,
+                                "draw_bound":true,
+                                "line_width":[0,1,1,0],
+                                "source_isexpression": false,
                                 "textAlignment": "Right",
                                 "vAlign": "Middle",
                                 "x": 224,
@@ -463,6 +507,8 @@
                             "item_10": {
                                 "type": "text",
                                 "text": "FOB",
+                                "draw_bound":true,
+                                "line_width":[1,1,1,0],
                                 "source_type": "const",
                                 "textAlignment": "CENTER",
                                 "vAlign": "Middle",
@@ -475,7 +521,9 @@
                                 "type": "text",
                                 "source": "e_schdule",
                                 "source_type": "data",
-                                "source_isexpression": true,
+                                "draw_bound":true,
+                                "line_width":[0,1,1,0],
+                                "source_isexpression": false,
                                 "textAlignment": "Right",
                                 "vAlign": "Middle",
                                 "x": 472,
@@ -685,6 +733,8 @@
                                     "source_type": "const",
                                     "source_isexpression": false,
                                     "textAlignment": "CENTER",
+                                    "draw_bound":true,
+                                    "line_width":[1,1,1,1],
                                     "size": "10",
                                     "vAlign": "Middle",
                                     "x": 0,
@@ -697,6 +747,8 @@
                                     "text": "MODEL",
                                     "source_type": "const",
                                     "source_isexpression": false,
+                                    "draw_bound":true,
+                                    "line_width":[1,1,1,0],
                                     "textAlignment": "CENTER",
                                     "size": "10",
                                     "vAlign": "Middle",
@@ -710,6 +762,8 @@
                                     "text": "SKU#/DESCRIPTION",
                                     "source_type": "const",
                                     "source_isexpression": false,
+                                    "draw_bound":true,
+                                    "line_width":[1,1,1,0],
                                     "textAlignment": "CENTER",
                                     "size": "10",
                                     "vAlign": "Middle",
@@ -723,6 +777,8 @@
                                     "text": "QTY",
                                     "source_type": "const",
                                     "source_isexpression": false,
+                                    "draw_bound":true,
+                                    "line_width":[1,1,1,0],
                                     "textAlignment": "CENTER",
                                     "size": "10",
                                     "vAlign": "Middle",
@@ -736,6 +792,8 @@
                                     "text": "CUST REF.",
                                     "source_type": "const",
                                     "source_isexpression": false,
+                                    "draw_bound":true,
+                                    "line_width":[1,1,1,0],
                                     "textAlignment": "CENTER",
                                     "size": "10",
                                     "vAlign": "Middle",
@@ -749,6 +807,8 @@
                                     "text": "UNIT PRICE",
                                     "source_type": "const",
                                     "source_isexpression": false,
+                                    "draw_bound":true,
+                                    "line_width":[1,1,1,0],
                                     "textAlignment": "CENTER",
                                     "size": "10",
                                     "vAlign": "Middle",
@@ -762,6 +822,8 @@
                                     "text": "AMOUNT",
                                     "source_type": "const",
                                     "source_isexpression": false,
+                                    "draw_bound":true,
+                                    "line_width":[1,1,1,0],
                                     "textAlignment": "CENTER",
                                     "size": "10",
                                     "vAlign": "Middle",
@@ -787,6 +849,8 @@
                                     "source": "ln#",
                                     "source_type": "data",
                                     "source_isexpression": false,
+                                    "draw_bound":true,
+                                    "line_width":[0,1,0,1],
                                     "textAlignment": "CENTER",
                                     "size": "10",
                                     "vAlign": "Middle",
@@ -801,6 +865,8 @@
                                     "y": 0,
                                     "width": 95,
                                     "height": 75,
+                                    "draw_bound":true,
+                                    "line_width":[0,1,0,0],
                                     "items": {
                                         "count": 2,
                                         "item_0": {
@@ -834,6 +900,8 @@
                                     "source": "description",
                                     "source_type": "data",
                                     "source_isexpression": false,
+                                    "draw_bound":true,
+                                    "line_width":[0,1,0,0],
                                     "textAlignment": "CENTER",
                                     "size": "8",
                                     "vAlign": "Middle",
@@ -846,6 +914,8 @@
                                     "type": "text",
                                     "source": "count",
                                     "source_type": "data",
+                                    "draw_bound":true,
+                                    "line_width":[0,1,0,0],
                                     "source_isexpression": false,
                                     "textAlignment": "CENTER",
                                     "size": "10",
@@ -859,6 +929,8 @@
                                     "type": "text",
                                     "text": "",
                                     "source_type": "const",
+                                    "draw_bound":true,
+                                    "line_width":[0,1,0,0],
                                     "source_isexpression": false,
                                     "textAlignment": "CENTER",
                                     "size": "10",
@@ -872,6 +944,8 @@
                                     "type": "text",
                                     "source": "unit_price",
                                     "source_type": "data",
+                                    "draw_bound":true,
+                                    "line_width":[0,1,0,0],
                                     "source_isexpression": false,
                                     "textAlignment": "CENTER",
                                     "size": "10",
@@ -885,6 +959,8 @@
                                     "type": "text",
                                     "source": "amount",
                                     "source_type": "data",
+                                    "draw_bound":true,
+                                    "line_width":[0,1,0,0],
                                     "source_isexpression": false,
                                     "textAlignment": "CENTER",
                                     "size": "10",