161121

update offline sales order progress
add receipt option for customer sales order.

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

@@ -202,11 +202,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501151926.7686"
+            timestampString = "501387771.170886"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1238"
-            endingLineNumber = "1238"
+            startingLineNumber = "1247"
+            endingLineNumber = "1247"
             landmarkName = "+offline_request_tearsheet:"
             landmarkType = "7">
          </BreakpointContent>
@@ -570,11 +570,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501151926.7686"
+            timestampString = "501387771.170886"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "11188"
-            endingLineNumber = "11188"
+            startingLineNumber = "11197"
+            endingLineNumber = "11197"
             landmarkName = "+offline_savePDF:direct:"
             landmarkType = "7">
          </BreakpointContent>
@@ -586,11 +586,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501151926.7686"
+            timestampString = "501387771.170886"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1249"
-            endingLineNumber = "1249"
+            startingLineNumber = "1258"
+            endingLineNumber = "1258"
             landmarkName = "+offline_request_tearsheet:"
             landmarkType = "7">
          </BreakpointContent>
@@ -634,11 +634,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501151926.7686"
+            timestampString = "501387771.170886"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "11153"
-            endingLineNumber = "11153"
+            startingLineNumber = "11162"
+            endingLineNumber = "11162"
             landmarkName = "+offline_savePDF:direct:"
             landmarkType = "7">
          </BreakpointContent>
@@ -650,11 +650,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501151926.7686"
+            timestampString = "501387771.170886"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "10980"
-            endingLineNumber = "10980"
+            startingLineNumber = "10989"
+            endingLineNumber = "10989"
             landmarkName = "+offline_portfolioList:"
             landmarkType = "7">
          </BreakpointContent>
@@ -666,11 +666,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501151926.7686"
+            timestampString = "501387771.170886"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "11084"
-            endingLineNumber = "11084"
+            startingLineNumber = "11093"
+            endingLineNumber = "11093"
             landmarkName = "+offline_savePDF:direct:"
             landmarkType = "7">
          </BreakpointContent>
@@ -682,11 +682,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501151926.7686"
+            timestampString = "501387771.170886"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "11124"
-            endingLineNumber = "11124"
+            startingLineNumber = "11133"
+            endingLineNumber = "11133"
             landmarkName = "+offline_savePDF:direct:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1114,11 +1114,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501151926.7686"
+            timestampString = "501387771.170886"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "11233"
-            endingLineNumber = "11233"
+            startingLineNumber = "11242"
+            endingLineNumber = "11242"
             landmarkName = "+offline_savePDF:direct:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1465,11 +1465,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501151926.7686"
+            timestampString = "501387771.170886"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2890"
-            endingLineNumber = "2890"
+            startingLineNumber = "2899"
+            endingLineNumber = "2899"
             landmarkName = "+offline_model:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1481,11 +1481,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501151926.7686"
+            timestampString = "501387771.170886"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4696"
-            endingLineNumber = "4696"
+            startingLineNumber = "4705"
+            endingLineNumber = "4705"
             landmarkName = "+model_selector:field:db:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1497,11 +1497,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501151926.7686"
+            timestampString = "501387771.170886"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4664"
-            endingLineNumber = "4664"
+            startingLineNumber = "4673"
+            endingLineNumber = "4673"
             landmarkName = "+model_property:field:db:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1641,11 +1641,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501151926.7686"
+            timestampString = "501387771.170886"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1234"
-            endingLineNumber = "1234"
+            startingLineNumber = "1243"
+            endingLineNumber = "1243"
             landmarkName = "+offline_request_tearsheet:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1689,11 +1689,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501151926.7686"
+            timestampString = "501387771.170886"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2398"
-            endingLineNumber = "2398"
+            startingLineNumber = "2407"
+            endingLineNumber = "2407"
             landmarkName = "+get_model_default_price:product_id:item_id:db:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1753,11 +1753,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501151926.7686"
+            timestampString = "501387771.170886"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1213"
-            endingLineNumber = "1213"
+            startingLineNumber = "1222"
+            endingLineNumber = "1222"
             landmarkName = "+offline_request_salesorder:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1769,11 +1769,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501151926.7686"
+            timestampString = "501387771.170886"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1200"
-            endingLineNumber = "1200"
+            startingLineNumber = "1209"
+            endingLineNumber = "1209"
             landmarkName = "+offline_request_salesorder:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1961,11 +1961,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501151926.7686"
+            timestampString = "501387771.170886"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "7994"
-            endingLineNumber = "7994"
+            startingLineNumber = "8003"
+            endingLineNumber = "8003"
             landmarkName = "+orderTotalPrice:db:close:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2057,11 +2057,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501151926.7686"
+            timestampString = "501386670.132634"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "689"
-            endingLineNumber = "689"
+            startingLineNumber = "695"
+            endingLineNumber = "695"
             landmarkName = "+prepare_salesorder_data:type:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2073,11 +2073,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501151926.7686"
+            timestampString = "501387771.170886"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1011"
-            endingLineNumber = "1011"
+            startingLineNumber = "1020"
+            endingLineNumber = "1020"
             landmarkName = "+prepare_salesorder_data:type:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2089,11 +2089,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501151926.7686"
+            timestampString = "501387771.170886"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1196"
-            endingLineNumber = "1196"
+            startingLineNumber = "1205"
+            endingLineNumber = "1205"
             landmarkName = "+prepare_salesorder_data:type:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2101,18 +2101,130 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/pdfCreator/TableDrawable.m"
-            timestampString = "501148713.861937"
+            timestampString = "501390136.699701"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "26"
-            endingLineNumber = "26"
+            startingLineNumber = "46"
+            endingLineNumber = "46"
             landmarkName = "-Query_Rect: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/TableDrawable.m"
+            timestampString = "501390136.699701"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "93"
+            endingLineNumber = "93"
+            landmarkName = "-Draw:dataSource:ParentRect:startX:startY:flipHeight:range:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/offline/OLDataProvider.m"
+            timestampString = "501387771.170886"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "708"
+            endingLineNumber = "708"
+            landmarkName = "+prepare_salesorder_data:type:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/offline/OLDataProvider.m"
+            timestampString = "501387771.170886"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "710"
+            endingLineNumber = "710"
+            landmarkName = "+prepare_salesorder_data:type:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/pdfCreator/ImageDrawable.m"
+            timestampString = "501389460.630954"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "39"
+            endingLineNumber = "39"
+            landmarkName = "-Draw: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/TableDrawable.m"
+            timestampString = "501390136.699701"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "91"
+            endingLineNumber = "91"
+            landmarkName = "-Draw: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 = "501389977.456149"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "77"
+            endingLineNumber = "77"
+            landmarkName = "-to_parent_rect:pos:offsetX:offsetY:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/pdfCreator/TableDrawable.m"
+            timestampString = "501390118.124557"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "16"
+            endingLineNumber = "16"
+            landmarkName = "-setDrawableTemplate:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.m

@@ -620,11 +620,16 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
                         Price=[NSString stringWithFormat:@"%.2f",[[[NSString alloc]initWithUTF8String:str_price] floatValue]];
                     }
                     float dunitprice=0;
+                    int item_count = sqlite3_column_int(statement_cart, 3);
+                    
+                    NSString* Amount=@"";
                     if(![Price isEqualToString:@"No Price."])
                     {
                         dunitprice=[Price floatValue];
                         dunitprice=dunitprice* (1-discount/100.0);
                         Price=[NSString stringWithFormat:@"%.2f",dunitprice];
+                        
+                        Amount=[NSString stringWithFormat:@"%.2f",dunitprice*item_count];
                     }
                     else
                     {
@@ -632,7 +637,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
                     }
                     
                     
-                    int item_count = sqlite3_column_int(statement_cart, 3);
+                    
                     
 //                    char *line_note = (char*)sqlite3_column_text(statement_cart, 4);
 //                    NSString *nsline_note=nil;
@@ -678,10 +683,11 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
 //                    itemjson[@"cart_item_id"]=[NSNumber numberWithInt:_id].stringValue;
 //                    itemjson[@"check"]=@"true";
 //                    itemjson[@"product_id"]=[NSNumber numberWithInt:product_id].stringValue;
-                    itemjson[@"count"]=[NSNumber numberWithInt:item_count];
+                    itemjson[@"count"]=[NSString stringWithFormat:@"%d",item_count];
                     itemjson[@"unit_price"]=Price;
+                    itemjson[@"amount"]=Amount;
 //                    itemjson[@"discount"]=[NSNumber numberWithInt:discount];
-                    itemjson[@"description"]=[NSString stringWithFormat:@"%@\n%@",nsname,nsdescription ];
+                    itemjson[@"description"]=[NSString stringWithFormat:@"%@",nsdescription ];
 //                    itemjson[@"stockUom"]=[NSNumber numberWithInt:stockUom];
 //                    itemjson[@"note"]=nsline_note;
                     
@@ -697,7 +703,10 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
                     for(int c=0;c<[combine[@"count"] intValue];c++)
                     {
                         NSMutableDictionary* combine_item=[combine[[NSString stringWithFormat:@"item_%d",c]] mutableCopy];
-                        combine_item[@"count"]=[NSNumber numberWithInt:[combine_item[@"modulus"] intValue]*item_count];
+                        combine_item[@"count"]=[NSString stringWithFormat:@"%d",[combine_item[@"modulus"] intValue]*item_count];
+                       // combine_item[@"count"]=[NSNumber numberWithInt:[combine_item[@"modulus"] intValue]*item_count];
+                        
+                        combine_item[@"amount"]=[NSString stringWithFormat:@"%.2f",[combine_item[@"modulus"] intValue]*item_count* [combine_item[@"unit_price"] floatValue]];
                         combine_item[@"ln#"]=[NSString stringWithFormat:@"%d.%d",count+1,c+2];
                         row1[[NSString stringWithFormat:@"item_%d", row1count] ]=combine_item;
                         row1count++;

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

@@ -381,7 +381,13 @@
         
     }];
     
-    UIAlertAction *alertthree = [UIAlertAction actionWithTitle:@"Without Thumbnails" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+        int status_code = [[self.content_data valueForKey:@"orderStatus"] intValue];
+    NSString* alertthreetitle=@"Without Thumbnails";
+        if(appDelegate.user_type==USER_ROLE_CUSTOMER&& status_code==1)
+        {
+            alertthreetitle=@"Receipt";
+        }
+    UIAlertAction *alertthree = [UIAlertAction actionWithTitle:alertthreetitle style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
         
         if(appDelegate.offline_mode)
         {
@@ -404,10 +410,23 @@
     
     
         UIAlertAction *alertCancel = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {}];
-    [alertControl addAction:actionOne];
     
-    [alertControl addAction:alertthree];
-    [alertControl addAction:alertCancel];
+    
+
+
+    if(appDelegate.user_type==USER_ROLE_CUSTOMER&& status_code==1)//[status isEqualToString:@"Saved Order"])
+    {
+        [alertControl addAction:alertthree];
+        [alertControl addAction:alertCancel];
+    }
+    else
+    {
+        [alertControl addAction:actionOne];
+        
+        [alertControl addAction:alertthree];
+        [alertControl addAction:alertCancel];
+    }
+
     
 
     

RedAnt ERP Mobile/common/pdfCreator/TableDrawable.m

@@ -10,7 +10,26 @@
 #import "GroupDrawable.h"
 
 @implementation TableDrawable
+-(void) setDrawableTemplate:(NSMutableDictionary *)drawableTemplate
+{
+    
+    [super setDrawableTemplate:drawableTemplate];
+    
+    
 
+    
+    
+    //    kCTTextAlignmentJustified CT_ENUM_AVAILABLE(10_8, 6_0) = 3,
+    //    kCTTextAlignmentNatural   CT_ENUM_AVAILABLE(10_8, 6_0) = 4,
+    
+    
+    //    _drawableTemplate = drawableTemplate;
+    //    self.margin_left=[self.drawableTemplate[@"margin_left"] doubleValue];
+    //    self.margin_right=[self.drawableTemplate[@"margin_right"] doubleValue];
+    //    self.margin_top=[self.drawableTemplate[@"margin_top"] doubleValue];
+    //    self.margin_bottom=[self.drawableTemplate[@"margin_bottom"] doubleValue];
+    //    self.rect = CGRectMake(0, 0, [self.drawableTemplate[@"width"] doubleValue], [self.drawableTemplate[@"height"] doubleValue]);
+}
 -(CGRect) Query_Rect:(CGContextRef) context dataSource:(NSMutableDictionary*)data ParentRect:(CGRect)p_rect startX:(double) x startY:(double) y flipHeight:(double)flip_height range:(NSRange)between_header_and_footer
 {
     NSMutableDictionary* table_data = data[self.drawableTemplate[@"data_source"]];
@@ -23,6 +42,7 @@
     
     CGRect pdfrect =  [self to_parent_rect:p_rect pos:self.rect offsetX:0 offsetY:0];
     CGRect parentrect =[self to_parent_rect:p_rect pos:self.rect offsetX:0 offsetY:0];
+    float dy=y;
     for(int i=0;i<count;i++)
     {
         NSMutableDictionary * rowjson =rows[ [NSString stringWithFormat:@"row_%d",i ] ];
@@ -30,7 +50,7 @@
         drawable_obj.delegate = self.delegate;
         NSMutableDictionary* rows_data = table_data[rowjson[@"data_source"]];
         int row_data_count=[rows_data[@"count"] intValue];
-        float dy=0;
+        
         for(int j=0;j<row_data_count;j++)
         {
             
@@ -70,6 +90,7 @@
     
     CGRect pdfrect =  [self to_parent_rect:p_rect pos:self.rect offsetX:0 offsetY:0];
     CGRect parentrect =[self to_parent_rect:p_rect pos:self.rect offsetX:0 offsetY:0];
+    float dy=y;
     for(int i=0;i<count;i++)
     {
         NSMutableDictionary * rowjson =rows[ [NSString stringWithFormat:@"row_%d",i ] ];
@@ -77,7 +98,7 @@
         drawable_obj.delegate = self.delegate;
         NSMutableDictionary* rows_data = table_data[rowjson[@"data_source"]];
         int row_data_count=[rows_data[@"count"] intValue];
-        float dy=0;
+        
         for(int j=0;j<row_data_count;j++)
         {
 

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 ab_lager @"Delivery price"
@@ -20,7 +20,7 @@
 #import "Singleton.h"
 
 
-#define PDF_DEBUG true
+#define PDF_DEBUG false
 
 //#define ENCRYPT_OFF
  

RedAnt ERP Mobile/iSales-NPD/so_thumb.json

@@ -14,7 +14,7 @@
                 "width": 572,
                 "height": 310,
                 "items": {
-                    "count": -26,
+                    "count": 26,
                     "item_0": {
                         "type": "img",
                         "hAlign": "Left",
@@ -494,7 +494,7 @@
                 "width": 572,
                 "height": 140,
                 "items": {
-                    "count": -8,
+                    "count": 8,
                     "item_0": {
                         "type": "text",
                         "source": "print_date",
@@ -664,8 +664,12 @@
                 "item_0": {
                     "type": "table",
                     "data_source": "table_model",
+                    "x": 0,
+                    "y": 5,
+                    "width": 572,
+                    "height": 321,
                     "rows": {
-                        "count": 1,
+                        "count": 2,
                         "row_0": {
                             "data_source": "row0",
                             "type": "group",
@@ -775,13 +779,13 @@
                             "x": 0,
                             "y": 0,
                             "width": 571,
-                            "height": 100,
+                            "height": 75,
                             "items": {
                                 "count": 7,
                                 "item_0": {
                                     "type": "text",
-                                    "text": "LN#",
-                                    "source_type": "const",
+                                    "source": "ln#",
+                                    "source_type": "data",
                                     "source_isexpression": false,
                                     "textAlignment": "CENTER",
                                     "size": "10",
@@ -789,38 +793,59 @@
                                     "x": 0,
                                     "y": 0,
                                     "width": 30,
-                                    "height": 21
+                                    "height": 75
                                 },
                                 "item_1": {
-                                    "type": "text",
-                                    "text": "MODEL",
-                                    "source_type": "const",
-                                    "source_isexpression": false,
-                                    "textAlignment": "CENTER",
-                                    "size": "10",
-                                    "vAlign": "Middle",
+                                    "type": "group",
                                     "x": 30,
                                     "y": 0,
                                     "width": 95,
-                                    "height": 21
+                                    "height": 75,
+                                    "items": {
+                                        "count": 2,
+                                        "item_0": {
+                                            "type": "img",
+                                            "source": "img_url",
+                                            "source_type": "data",
+                                            "hAlign": "Center",
+                                            "vAlign": "Middle",
+                                            "x": 2,
+                                            "y": 2,
+                                            "width": 45,
+                                            "height": 45
+                                        },
+                                        "item_1": {
+                                            "type": "text",
+                                            "source": "model",
+                                            "source_type": "data",
+                                            "source_isexpression": false,
+                                            "textAlignment": "CENTER",
+                                            "size": "10",
+                                            "vAlign": "Middle",
+                                            "x": 50,
+                                            "y": 0,
+                                            "width": 45,
+                                            "height": 75
+                                        }
+                                    }
                                 },
                                 "item_2": {
                                     "type": "text",
-                                    "text": "SKU#/DESCRIPTION",
-                                    "source_type": "const",
+                                    "source": "description",
+                                    "source_type": "data",
                                     "source_isexpression": false,
                                     "textAlignment": "CENTER",
-                                    "size": "10",
+                                    "size": "8",
                                     "vAlign": "Middle",
                                     "x": 125,
                                     "y": 0,
                                     "width": 188,
-                                    "height": 21
+                                    "height": 75
                                 },
                                 "item_3": {
                                     "type": "text",
-                                    "text": "QTY",
-                                    "source_type": "const",
+                                    "source": "count",
+                                    "source_type": "data",
                                     "source_isexpression": false,
                                     "textAlignment": "CENTER",
                                     "size": "10",
@@ -828,11 +853,11 @@
                                     "x": 313,
                                     "y": 0,
                                     "width": 36,
-                                    "height": 21
+                                    "height": 75
                                 },
                                 "item_4": {
                                     "type": "text",
-                                    "text": "CUST REF.",
+                                    "text": "",
                                     "source_type": "const",
                                     "source_isexpression": false,
                                     "textAlignment": "CENTER",
@@ -841,12 +866,12 @@
                                     "x": 349,
                                     "y": 0,
                                     "width": 65,
-                                    "height": 21
+                                    "height": 75
                                 },
                                 "item_5": {
                                     "type": "text",
-                                    "text": "UNIT PRICE",
-                                    "source_type": "const",
+                                    "source": "unit_price",
+                                    "source_type": "data",
                                     "source_isexpression": false,
                                     "textAlignment": "CENTER",
                                     "size": "10",
@@ -854,12 +879,12 @@
                                     "x": 414,
                                     "y": 0,
                                     "width": 89,
-                                    "height": 21
+                                    "height": 75
                                 },
                                 "item_6": {
                                     "type": "text",
-                                    "text": "AMOUNT",
-                                    "source_type": "const",
+                                    "source": "amount",
+                                    "source_type": "data",
                                     "source_isexpression": false,
                                     "textAlignment": "CENTER",
                                     "size": "10",
@@ -867,14 +892,10 @@
                                     "x": 503,
                                     "y": 0,
                                     "width": 68,
-                                    "height": 21
+                                    "height": 75
                                 }
                             }
-                        },
-                        "x": 0,
-                        "y": 0,
-                        "width": 572,
-                        "height": 84
+                        }
                     }
                 }
             }