161123

UPDATE OFFLINE SALES ORDER PROGRESS

FIX:
CANCEL ORDER CAUSED CART VIEW CONFUSION

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 = "501387771.170886"
+            timestampString = "501574474.713331"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1247"
-            endingLineNumber = "1247"
+            startingLineNumber = "1359"
+            endingLineNumber = "1359"
             landmarkName = "+offline_request_tearsheet:"
             landmarkType = "7">
          </BreakpointContent>
@@ -426,11 +426,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/pdfCreator/TextDrawable.m"
-            timestampString = "499318958.71537"
+            timestampString = "501495820.471804"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "297"
-            endingLineNumber = "297"
+            startingLineNumber = "298"
+            endingLineNumber = "298"
             landmarkName = "-Draw:dataSource:ParentRect:startX:startY:flipHeight:range:"
             landmarkType = "7">
          </BreakpointContent>
@@ -506,11 +506,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/pdfCreator/TextDrawable.m"
-            timestampString = "499318958.71537"
+            timestampString = "501495820.471804"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "279"
-            endingLineNumber = "279"
+            startingLineNumber = "280"
+            endingLineNumber = "280"
             landmarkName = "-Draw:dataSource:ParentRect:startX:startY:flipHeight:range:"
             landmarkType = "7">
          </BreakpointContent>
@@ -570,11 +570,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501387771.170886"
+            timestampString = "501574474.713331"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "11197"
-            endingLineNumber = "11197"
+            startingLineNumber = "11309"
+            endingLineNumber = "11309"
             landmarkName = "+offline_savePDF:direct:"
             landmarkType = "7">
          </BreakpointContent>
@@ -586,11 +586,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501387771.170886"
+            timestampString = "501574474.713331"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1258"
-            endingLineNumber = "1258"
+            startingLineNumber = "1370"
+            endingLineNumber = "1370"
             landmarkName = "+offline_request_tearsheet:"
             landmarkType = "7">
          </BreakpointContent>
@@ -634,11 +634,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501387771.170886"
+            timestampString = "501574474.713331"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "11162"
-            endingLineNumber = "11162"
+            startingLineNumber = "11274"
+            endingLineNumber = "11274"
             landmarkName = "+offline_savePDF:direct:"
             landmarkType = "7">
          </BreakpointContent>
@@ -650,11 +650,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501387771.170886"
+            timestampString = "501574474.713331"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "10989"
-            endingLineNumber = "10989"
+            startingLineNumber = "11101"
+            endingLineNumber = "11101"
             landmarkName = "+offline_portfolioList:"
             landmarkType = "7">
          </BreakpointContent>
@@ -666,11 +666,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501387771.170886"
+            timestampString = "501574474.713331"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "11093"
-            endingLineNumber = "11093"
+            startingLineNumber = "11205"
+            endingLineNumber = "11205"
             landmarkName = "+offline_savePDF:direct:"
             landmarkType = "7">
          </BreakpointContent>
@@ -682,11 +682,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501387771.170886"
+            timestampString = "501574474.713331"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "11133"
-            endingLineNumber = "11133"
+            startingLineNumber = "11245"
+            endingLineNumber = "11245"
             landmarkName = "+offline_savePDF:direct:"
             landmarkType = "7">
          </BreakpointContent>
@@ -746,11 +746,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/pdfCreator/TextDrawable.m"
-            timestampString = "499332278.377343"
+            timestampString = "501495820.471804"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "413"
-            endingLineNumber = "413"
+            startingLineNumber = "414"
+            endingLineNumber = "414"
             landmarkName = "-Draw:dataSource:ParentRect:startX:startY:flipHeight:range:"
             landmarkType = "7">
          </BreakpointContent>
@@ -762,11 +762,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/RAUtils.m"
-            timestampString = "500538091.95793"
+            timestampString = "501566042.874515"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "294"
-            endingLineNumber = "294"
+            startingLineNumber = "299"
+            endingLineNumber = "299"
             landmarkName = "+rectVAlign:rect:vAlign:"
             landmarkType = "7">
          </BreakpointContent>
@@ -778,11 +778,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/pdfCreator/TextDrawable.m"
-            timestampString = "499332814.823349"
+            timestampString = "501495820.471804"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "401"
-            endingLineNumber = "401"
+            startingLineNumber = "402"
+            endingLineNumber = "402"
             landmarkName = "-Draw:dataSource:ParentRect:startX:startY:flipHeight:range:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1018,11 +1018,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/RAUtils.m"
-            timestampString = "500538091.95793"
+            timestampString = "501566042.874515"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "267"
-            endingLineNumber = "267"
+            startingLineNumber = "272"
+            endingLineNumber = "272"
             landmarkName = "+get_config_path"
             landmarkType = "7">
          </BreakpointContent>
@@ -1114,11 +1114,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501387771.170886"
+            timestampString = "501574474.713331"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "11242"
-            endingLineNumber = "11242"
+            startingLineNumber = "11354"
+            endingLineNumber = "11354"
             landmarkName = "+offline_savePDF:direct:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1311,7 +1311,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "47"
             endingLineNumber = "47"
-            landmarkName = "-logout"
+            landmarkName = "-mergeList"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -1465,11 +1465,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501387771.170886"
+            timestampString = "501574474.713331"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2899"
-            endingLineNumber = "2899"
+            startingLineNumber = "3011"
+            endingLineNumber = "3011"
             landmarkName = "+offline_model:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1481,11 +1481,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501387771.170886"
+            timestampString = "501574474.713331"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4705"
-            endingLineNumber = "4705"
+            startingLineNumber = "4817"
+            endingLineNumber = "4817"
             landmarkName = "+model_selector:field:db:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1497,11 +1497,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501387771.170886"
+            timestampString = "501574474.713331"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4673"
-            endingLineNumber = "4673"
+            startingLineNumber = "4785"
+            endingLineNumber = "4785"
             landmarkName = "+model_property:field:db:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1641,11 +1641,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501387771.170886"
+            timestampString = "501574474.713331"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1243"
-            endingLineNumber = "1243"
+            startingLineNumber = "1355"
+            endingLineNumber = "1355"
             landmarkName = "+offline_request_tearsheet:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1689,11 +1689,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501387771.170886"
+            timestampString = "501574474.713331"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2407"
-            endingLineNumber = "2407"
+            startingLineNumber = "2519"
+            endingLineNumber = "2519"
             landmarkName = "+get_model_default_price:product_id:item_id:db:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1721,11 +1721,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/RAUtils.m"
-            timestampString = "500526291.362168"
+            timestampString = "501566042.874515"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "231"
-            endingLineNumber = "231"
+            startingLineNumber = "236"
+            endingLineNumber = "236"
             landmarkName = "+generateBarCode:width:height:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1753,11 +1753,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501387771.170886"
+            timestampString = "501574474.713331"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1222"
-            endingLineNumber = "1222"
+            startingLineNumber = "1334"
+            endingLineNumber = "1334"
             landmarkName = "+offline_request_salesorder:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1769,11 +1769,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501387771.170886"
+            timestampString = "501574474.713331"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1209"
-            endingLineNumber = "1209"
+            startingLineNumber = "1321"
+            endingLineNumber = "1321"
             landmarkName = "+offline_request_salesorder:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1913,11 +1913,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/RAUtils.m"
-            timestampString = "500538091.95793"
+            timestampString = "501566042.874515"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "236"
-            endingLineNumber = "236"
+            startingLineNumber = "241"
+            endingLineNumber = "241"
             landmarkName = "+generateBarCode:width:height:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1961,11 +1961,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501387771.170886"
+            timestampString = "501574474.713331"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "8003"
-            endingLineNumber = "8003"
+            startingLineNumber = "8115"
+            endingLineNumber = "8115"
             landmarkName = "+orderTotalPrice:db:close:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1993,11 +1993,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501151926.7686"
+            timestampString = "501574474.713331"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "592"
-            endingLineNumber = "592"
+            startingLineNumber = "704"
+            endingLineNumber = "704"
             landmarkName = "+prepare_salesorder_data:type:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2009,11 +2009,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501151926.7686"
+            timestampString = "501574474.713331"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "577"
-            endingLineNumber = "577"
+            startingLineNumber = "689"
+            endingLineNumber = "689"
             landmarkName = "+prepare_salesorder_data:type:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2025,11 +2025,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501151926.7686"
+            timestampString = "501574474.713331"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "559"
-            endingLineNumber = "559"
+            startingLineNumber = "541"
+            endingLineNumber = "541"
             landmarkName = "+prepare_salesorder_data:type:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2041,11 +2041,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501151926.7686"
+            timestampString = "501574474.713331"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "599"
-            endingLineNumber = "599"
+            startingLineNumber = "711"
+            endingLineNumber = "711"
             landmarkName = "+prepare_salesorder_data:type:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2057,11 +2057,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501386670.132634"
+            timestampString = "501574474.713331"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "695"
-            endingLineNumber = "695"
+            startingLineNumber = "807"
+            endingLineNumber = "807"
             landmarkName = "+prepare_salesorder_data:type:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2073,11 +2073,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501387771.170886"
+            timestampString = "501574474.713331"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1020"
-            endingLineNumber = "1020"
+            startingLineNumber = "1132"
+            endingLineNumber = "1132"
             landmarkName = "+prepare_salesorder_data:type:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2089,11 +2089,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501387771.170886"
+            timestampString = "501574474.713331"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1205"
-            endingLineNumber = "1205"
+            startingLineNumber = "1317"
+            endingLineNumber = "1317"
             landmarkName = "+prepare_salesorder_data:type:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2121,11 +2121,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/pdfCreator/TableDrawable.m"
-            timestampString = "501390136.699701"
+            timestampString = "501490462.388698"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "93"
-            endingLineNumber = "93"
+            startingLineNumber = "141"
+            endingLineNumber = "141"
             landmarkName = "-Draw:dataSource:ParentRect:startX:startY:flipHeight:range:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2137,11 +2137,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501387771.170886"
+            timestampString = "501574474.713331"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "708"
-            endingLineNumber = "708"
+            startingLineNumber = "820"
+            endingLineNumber = "820"
             landmarkName = "+prepare_salesorder_data:type:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2153,11 +2153,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "501387771.170886"
+            timestampString = "501574474.713331"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "710"
-            endingLineNumber = "710"
+            startingLineNumber = "822"
+            endingLineNumber = "822"
             landmarkName = "+prepare_salesorder_data:type:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2185,11 +2185,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/pdfCreator/TableDrawable.m"
-            timestampString = "501390136.699701"
+            timestampString = "501490462.388698"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "91"
-            endingLineNumber = "91"
+            startingLineNumber = "140"
+            endingLineNumber = "140"
             landmarkName = "-Draw:dataSource:ParentRect:startX:startY:flipHeight:range:"
             landmarkType = "7">
          </BreakpointContent>
@@ -2210,22 +2210,6 @@
             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>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -2274,5 +2258,117 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/pdfCreator/TableDrawable.m"
+            timestampString = "501492197.66783"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "161"
+            endingLineNumber = "161"
+            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 = "501492371.226504"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "167"
+            endingLineNumber = "167"
+            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 = "501492371.226504"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "196"
+            endingLineNumber = "196"
+            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 = "501492371.226504"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "238"
+            endingLineNumber = "238"
+            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 = "501491323.412171"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "153"
+            endingLineNumber = "153"
+            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 = "501574474.713331"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "619"
+            endingLineNumber = "619"
+            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 = "501564491.801461"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "50"
+            endingLineNumber = "50"
+            landmarkName = "-Draw: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

@@ -38,6 +38,14 @@
             </PersistentString>
          </PersistentStrings>
       </ContextState>
+      <ContextState
+         contextName = "-[ImageDrawable Draw:dataSource:ParentRect:startX:startY:flipHeight:range:]:ImageDrawable.m">
+         <PersistentStrings>
+            <PersistentString
+               value = "self.drawableTemplate[@&quot;source&quot;]">
+            </PersistentString>
+         </PersistentStrings>
+      </ContextState>
       <ContextState
          contextName = "-[AppDelegate connectionDidFinishLoading:]:AppDelegate.m">
       </ContextState>

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

@@ -873,7 +873,7 @@
                 
                 AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
                 int model_count =[[self.content_data valueForKey:@"model_count"] intValue];
-                if(model_count>0&& ! appDelegate.offline_mode)
+                if(model_count>0/*&& ! appDelegate.offline_mode*/)
                     self.btnPDF.enabled =true;
                 //            [self.btnPDF setImage:[[UIImage imageNamed:@"download"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]];
                 

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

@@ -1202,7 +1202,7 @@
                             if([appDelegate.order_code isEqualToString: [self.content_data[indexPath.row] valueForKey:@"order_code"]])
                             {
                                 appDelegate.order_code= nil;
-                                appDelegate.user_type = 0;
+                                //appDelegate.user_type = 0;
                                 appDelegate.customerInfo = nil;
                                 appDelegate.contact_id = nil;
                                 appDelegate.order_customer_id = nil;

RedAnt ERP Mobile/common/RAUtils.m

@@ -211,6 +211,11 @@
     {
         rect=CGRectMake(parent.origin.x, rect.origin.y, rect.size.width, rect.size.height);
     }
+    else
+        if([hAlign.lowercaseString isEqualToString:@"right"])
+        {
+            rect=CGRectMake(parent.origin.x+parent.size.width-rect.size.width, rect.origin.y, rect.size.width, rect.size.height);
+        }
     if([vAlign.lowercaseString isEqualToString:@"middle"])
     {
         rect=CGRectMake(rect.origin.x, centerpoint.y-rect.size.height/2, rect.size.width, rect.size.height);

RedAnt ERP Mobile/common/pdfCreator/PDFPage.m

@@ -38,7 +38,7 @@
     self.footer=self.pageTemplate[@"footer"];
     
     
-    self.drawable_rect = CGRectMake(self.rect.origin.x+self.margin_left, self.rect.origin.y+self.margin_top, self.rect.size.width-self.margin_right, self.rect.size.height-self.margin_bottom);
+    self.drawable_rect = CGRectMake(self.rect.origin.x+self.margin_left, self.rect.origin.y+self.margin_top, self.rect.size.width-(self.margin_right+self.margin_left), self.rect.size.height-(self.margin_bottom+self.margin_top));
     
     self.pos_x = _margin_left;
     self.pos_y = _margin_top;
@@ -143,8 +143,8 @@
     // while (true)
     {
         // page 去除页眉，页脚后的区域
-        NSRange range = NSMakeRange(self.drawable_rect.origin.y+pageHeader.rect.size.height, self.drawable_rect.origin.y+self.drawable_rect.size.height-pageFooter.rect.size.height);
-        
+        NSRange range = NSMakeRange(self.drawable_rect.origin.y+pageHeader.rect.size.height, self.drawable_rect.origin.y+self.drawable_rect.size.height-pageFooter.rect.size.height-pageHeader.rect.size.height);
+//        NSRange range = NSMakeRange(self.drawable_rect.origin.y+pageHeader.rect.size.height, self.drawable_rect.size.height-pageFooter.rect.size.height+self.drawable_rect.size.height);
         CGRect rect = self.rect;
         
         CGContextBeginPage(context, &rect);

RedAnt ERP Mobile/common/pdfCreator/TableDrawable.m

@@ -75,11 +75,60 @@
     
     return parentrect;
 }
-
+-(float) DrawHeader:(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 dy:(double) dy
+{
+    // draw table header
+    
+    NSMutableDictionary* table_data = data[self.drawableTemplate[@"data_source"]];
+    
+    NSMutableDictionary* rows = self.drawableTemplate[@"rows"];
+ //   int count = [rows[@"count"] intValue];
+    
+    //    CGRect pdfrect = /*CGRectMake(self.rect.origin.x+self.margin_left+p_rect.origin.x, self.rect.origin.y+self.margin_top+p_rect.origin.y, self.rect.size.width-self.margin_right, self.rect.size.height-self.margin_bottom);//*/[self to_pdf_rect:p_rect pos:self.rect offsetX:0 offsetY:0];
+    
+    
+    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];
+    NSMutableDictionary * headerjson =rows[@"header"];
+    PDFDrawable* header_drawable_obj= [[GroupDrawable alloc] init:headerjson];
+    header_drawable_obj.delegate = self.delegate;
+    NSMutableDictionary* header_data = table_data[headerjson[@"data_source"]];
+    //    int row_data_count=[header_data[@"count"] intValue];
+    NSMutableDictionary * row_data =header_data[ [NSString stringWithFormat:@"item_%d",0 ] ];
+    CGRect row_rect= [header_drawable_obj Query_Rect:context dataSource:row_data ParentRect:(CGRect)pdfrect startX:0 startY:dy flipHeight:flip_height range:between_header_and_footer];
+    if(row_rect.size.width>parentrect.size.width||row_rect.size.height>parentrect.size.height)
+    {
+        // cell 比 table 还要大，模板有错，直接返回。
+        return 0;
+    }
+    
+    if(dy+row_rect.size.height> between_header_and_footer.location+between_header_and_footer.length )
+    {
+        //越界，新起一页
+        if (self.delegate && [self.delegate respondsToSelector:@selector(outofPage:)]) {
+            [self.delegate outofPage:context];
+            dy=y;
+            //  dx=0;
+        }
+    }
+    
+    [header_drawable_obj Draw:context dataSource:row_data ParentRect:(CGRect)pdfrect startX:0 startY:dy flipHeight:flip_height range:between_header_and_footer];
+    //            if([direction isEqualToString:@"H"])
+    //            {
+    //                dx+=row_rect.size.width;
+    //                if(dx+row_rect.size.width>parentrect.size.width)
+    {
+        //                    dx=0;
+        dy+=row_rect.size.height;
+    }
+    return dy;
+}
 -(CGRect) Draw:(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
 {
     
     
+    bool header_repeat = [self.drawableTemplate[@"header_repeat"] boolValue];
+    bool drawheader = true;
     NSMutableDictionary* table_data = data[self.drawableTemplate[@"data_source"]];
 
     NSMutableDictionary* rows = self.drawableTemplate[@"rows"];
@@ -91,7 +140,15 @@
     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;
+    
+
+    
+                    dy= [self DrawHeader:context dataSource:data ParentRect:p_rect startX:x startY:y flipHeight:flip_height range:between_header_and_footer dy:dy];
+    //            }
+    
+//    int i=0;
     for(int i=0;i<count;i++)
+    
     {
         NSMutableDictionary * rowjson =rows[ [NSString stringWithFormat:@"row_%d",i ] ];
         PDFDrawable* drawable_obj= [[GroupDrawable alloc] init:rowjson];
@@ -99,13 +156,23 @@
         NSMutableDictionary* rows_data = table_data[rowjson[@"data_source"]];
         int row_data_count=[rows_data[@"count"] intValue];
         
-        for(int j=0;j<row_data_count;j++)
+        int j=0;
+        while(true)
+//        for(int j=0;j<row_data_count;j++)
         {
-
-            
             
+            if(i!=count-1&& j==row_data_count)
+                break;
+
+            if(drawheader)
+            {
+
+                drawheader = false;
+            }
+          
             NSMutableDictionary * row_data =rows_data[ [NSString stringWithFormat:@"item_%d",j ] ];
             CGRect row_rect= [drawable_obj Query_Rect:context dataSource:row_data ParentRect:(CGRect)pdfrect startX:0 startY:dy flipHeight:flip_height range:between_header_and_footer];
+     /*   
             if(dy+row_rect.size.height> between_header_and_footer.location+between_header_and_footer.length)
             {
                 //越界，新起一页
@@ -117,10 +184,58 @@
              [drawable_obj Draw:context dataSource:row_data ParentRect:(CGRect)pdfrect startX:0 startY:dy flipHeight:flip_height range:between_header_and_footer];
             dy+=row_rect.size.height;
 //            pos = CGPointMake(0, rowpos.y+pos.y);
+           
+           */
+            
+            if(row_rect.size.width>parentrect.size.width||row_rect.size.height>parentrect.size.height)
+            {
+                // cell 比 table 还要大，模板有错，直接返回。
+                return parentrect;
+            }
+
+                if(dy+row_rect.size.height> between_header_and_footer.location+between_header_and_footer.length )
+                {
+                    if(j<row_data_count)
+                    {
+                        //越界，新起一页
+                        if (self.delegate && [self.delegate respondsToSelector:@selector(outofPage:)]) {
+                            [self.delegate outofPage:context];
+                            dy=y;
+                            if(header_repeat)
+                            {
+                                dy= [self DrawHeader:context dataSource:data ParentRect:p_rect startX:x startY:y flipHeight:flip_height range:between_header_and_footer dy:dy];
+                                
+                                //                            drawheader=true;
+                            }
+                            //  dx=0;
+                        }
+                    }
+                    else
+                    {
+                        break;
+                    //    goto finish_draw;
+                    }
+                    
+
+                }
+            
+            [drawable_obj Draw:context dataSource:row_data ParentRect:(CGRect)pdfrect startX:0 startY:dy flipHeight:flip_height range:between_header_and_footer];
+//            if([direction isEqualToString:@"H"])
+//            {
+//                dx+=row_rect.size.width;
+//                if(dx+row_rect.size.width>parentrect.size.width)
+                {
+//                    dx=0;
+                    dy+=row_rect.size.height;
+                }
+                
+//            }
+j++;
         }
         
     }
-    
+//finish_draw:
+    [self DrawBound:context dataSource:data ParentRect:p_rect startX:x startY:y flipHeight:flip_height range:between_header_and_footer];
     return parentrect;
     //return CGPointMake(parentrect.origin.x+parentrect.size.width, parentrect.origin.y+parentrect.size.height);
     //    if (self.delegate && [self.delegate respondsToSelector:@selector(outofPage:)]) {

RedAnt ERP Mobile/common/pdfCreator/TextDrawable.m

@@ -231,6 +231,7 @@
     if([source isEqualToString:@"const"])
     {
         self.text=self.drawableTemplate[@"text"];
+      //  self.text=[self.text stringByReplacingOccurrencesOfString:@"\r\n" withString:@"<br>"];
         
     }
     else if([source isEqualToString:@"data"])

RedAnt ERP Mobile/iSales-NPD/AppDelegate.m

@@ -1052,7 +1052,7 @@ void UncaughtExceptionHandler(NSException *exception) {
     self.user = nil;
     self.password=nil;
     self.user_icon=nil;
-    self.user_type = 0;
+    self.user_type = USER_ROLE_UNKNOWN;
     self.bLogin = false;
     self.contact_id=nil;
     self.customerInfo = nil;

RedAnt ERP Mobile/iSales-NPD/config.h

@@ -20,7 +20,7 @@
 #import "Singleton.h"
 
 
-#define PDF_DEBUG false
+#define PDF_DEBUG true
 
 //#define ENCRYPT_OFF
  

RedAnt ERP Mobile/iSales-NPD/so_thumb.json

@@ -14,7 +14,20 @@
                 "width": 572,
                 "height": 310,
                 "items": {
-                    "count": 26,
+                    "count": 27,
+                    "item_26": {
+                        "type": "text",
+                        "source": "warehouse_name",
+                        "source_type": "data",
+                        "textAlignment": "Left",
+                        "vAlign": "Middle",
+                        "size": "10",
+                        "bold": false,
+                        "x": 355,
+                        "y": 134,
+                        "width": 137,
+                        "height": 15
+                    },
                     "item_0": {
                         "type": "img",
                         "hAlign": "Left",
@@ -169,23 +182,23 @@
                         "type": "text",
                         "source": "shipfrom_addr",
                         "source_type": "data",
-                        "textAlignment": "Center",
+                        "textAlignment": "left",
                         "vAlign": "Middle",
                         "size": "10",
-                        "bold": true,
+                        "bold": false,
                         "x": 0,
                         "y": 72,
                         "width": 250,
-                        "height": 22
+                        "height": 25
                     },
                     "item_12": {
                         "type": "text",
                         "source": "shipfrom_phone",
                         "source_type": "data",
-                        "textAlignment": "Center",
+                        "textAlignment": "left",
                         "vAlign": "Middle",
                         "size": "10",
-                        "bold": true,
+                        "bold": false,
                         "x": 22,
                         "y": 97,
                         "width": 104,
@@ -195,10 +208,10 @@
                         "type": "text",
                         "source": "shipfrom_fax",
                         "source_type": "data",
-                        "textAlignment": "Center",
+                        "textAlignment": "left",
                         "vAlign": "Middle",
                         "size": "10",
-                        "bold": true,
+                        "bold": false,
                         "x": 150,
                         "y": 97,
                         "width": 100,
@@ -208,10 +221,10 @@
                         "type": "text",
                         "source": "shipfrom_email",
                         "source_type": "data",
-                        "textAlignment": "Center",
+                        "textAlignment": "left",
                         "vAlign": "Middle",
                         "size": "10",
-                        "bold": true,
+                        "bold": false,
                         "x": 22,
                         "y": 117,
                         "width": 228,
@@ -246,6 +259,7 @@
                     "item_17": {
                         "type": "text",
                         "text": "Location:",
+                        "margin_left": 2,
                         "source_type": "const",
                         "textAlignment": "left",
                         "vAlign": "Middle",
@@ -261,6 +275,7 @@
                         "text": "SHIP TO",
                         "source_type": "const",
                         "textAlignment": "left",
+                        "margin_left": 4,
                         "draw_bound":true,
                         "line_width":[1,1,0,1],
                         "vAlign": "Middle",
@@ -273,9 +288,9 @@
                     },
                     "item_19": {
                         "type": "text",
-                        "source": "vender_no",
+                        "source": "vendor_no",
                         "source_type": "data",
-                        "textAlignment": "left",
+                        "textAlignment": "center",
                         "draw_bound":true,
                         "line_width":[1,1,1,0],
                         "vAlign": "Middle",
@@ -291,6 +306,7 @@
                         "text": "BILL TO",
                         "source_type": "const",
                         "textAlignment": "left",
+                        "margin_left": 4,
                         "draw_bound":true,
                         "line_width":[1,1,0,1],
                         "vAlign": "Middle",
@@ -306,11 +322,12 @@
                         "source": "bill_to_name",
                         "source_type": "data",
                         "textAlignment": "left",
+                        "margin_left": 4,
                         "draw_bound":true,
                         "line_width":[1,1,0,1],
                         "vAlign": "Middle",
                         "size": "10",
-                        "bold": true,
+                        "bold": false,
                         "x": 0,
                         "y": 172,
                         "width": 275,
@@ -321,11 +338,12 @@
                         "source": "ship_to_name",
                         "source_type": "data",
                         "textAlignment": "left",
+                        "margin_left": 4,
                         "draw_bound":true,
                         "line_width":[1,1,0,0],
                         "vAlign": "Middle",
                         "size": "10",
-                        "bold": true,
+                        "bold": false,
                         "x": 275,
                         "y": 172,
                         "width": 296,
@@ -336,11 +354,12 @@
                         "source": "bill_to_ext",
                         "source_type": "data",
                         "textAlignment": "left",
-                        "vAlign": "Middle",
+                        "margin_left": 4,
+                        "vAlign": "top",
                         "draw_bound":true,
                         "line_width":[0,1,1,1],
                         "size": "10",
-                        "bold": true,
+                        "bold": false,
                         "x": 0,
                         "y": 192,
                         "width": 275,
@@ -351,11 +370,12 @@
                         "source": "ship_to_ext",
                         "source_type": "data",
                         "textAlignment": "left",
+                        "margin_left": 4,
                         "draw_bound":true,
                         "line_width":[0,1,1,0],
-                        "vAlign": "Middle",
+                        "vAlign": "top",
                         "size": "10",
-                        "bold": true,
+                        "bold": false,
                         "x": 275,
                         "y": 192,
                         "width": 296,
@@ -389,7 +409,7 @@
                                 "draw_bound":true,
                                 "line_width":[0,1,1,0],
                                 "source_isexpression": false,
-                                "textAlignment": "Right",
+                                "textAlignment": "center",
                                 "vAlign": "Middle",
                                 "x": 352,
                                 "y": 21,
@@ -416,7 +436,7 @@
                                 "draw_bound":true,
                                 "line_width":[0,1,1,1],
                                 "source_isexpression": false,
-                                "textAlignment": "Right",
+                                "textAlignment": "center",
                                 "vAlign": "Middle",
                                 "x": 0,
                                 "y": 21,
@@ -443,7 +463,7 @@
                                 "source_isexpression": false,
                                 "draw_bound":true,
                                 "line_width":[0,1,1,0],
-                                "textAlignment": "Right",
+                                "textAlignment": "CENTER",
                                 "vAlign": "Middle",
                                 "x": 91,
                                 "y": 21,
@@ -470,7 +490,7 @@
                                 "draw_bound":true,
                                 "line_width":[0,1,1,0],
                                 "source_isexpression": false,
-                                "textAlignment": "Right",
+                                "textAlignment": "CENTER",
                                 "vAlign": "Middle",
                                 "x": 164,
                                 "y": 21,
@@ -497,7 +517,7 @@
                                 "draw_bound":true,
                                 "line_width":[0,1,1,0],
                                 "source_isexpression": false,
-                                "textAlignment": "Right",
+                                "textAlignment": "CENTER",
                                 "vAlign": "Middle",
                                 "x": 224,
                                 "y": 21,
@@ -506,10 +526,10 @@
                             },
                             "item_10": {
                                 "type": "text",
-                                "text": "FOB",
+                                "text": "sales_terms",
                                 "draw_bound":true,
                                 "line_width":[1,1,1,0],
-                                "source_type": "const",
+                                "source_type": "data",
                                 "textAlignment": "CENTER",
                                 "vAlign": "Middle",
                                 "x": 472,
@@ -519,12 +539,12 @@
                             },
                             "item_11": {
                                 "type": "text",
-                                "source": "e_schdule",
+                                "source": "port_destination",
                                 "source_type": "data",
                                 "draw_bound":true,
                                 "line_width":[0,1,1,0],
                                 "source_isexpression": false,
-                                "textAlignment": "Right",
+                                "textAlignment": "CENTER",
                                 "vAlign": "Middle",
                                 "x": 472,
                                 "y": 21,
@@ -670,10 +690,10 @@
                             },
                             "item_2": {
                                 "type": "img",
-                                "hAlign": "Left",
+                                "hAlign": "center",
                                 "vAlign": "Middle",
                                 "source": "customer_sign",
-                                "source_type": "const",
+                                "source_type": "data",
                                 "x": 249,
                                 "y": 81,
                                 "width": 110,
@@ -714,11 +734,14 @@
                     "data_source": "table_model",
                     "x": 0,
                     "y": 5,
-                    "width": 572,
-                    "height": 321,
+                    "width": 571,
+                    "height": 297,
+                    "header_repeat":true,
+                    "draw_bound":true,
+                    "line_width":[1,1,1,1],
                     "rows": {
-                        "count": 2,
-                        "row_0": {
+                        "count": 1,
+                        "header": {
                             "data_source": "row0",
                             "type": "group",
                             "x": 0,
@@ -834,14 +857,14 @@
                                 }
                             }
                         },
-                        "row_1": {
+                        "row_0": {
                             "data_source": "row1",
                             "repeat": "horizontal",
                             "type": "group",
                             "x": 0,
                             "y": 0,
                             "width": 571,
-                            "height": 75,
+                            "height": 69,
                             "items": {
                                 "count": 7,
                                 "item_0": {
@@ -857,14 +880,14 @@
                                     "x": 0,
                                     "y": 0,
                                     "width": 30,
-                                    "height": 75
+                                    "height": 69
                                 },
                                 "item_1": {
                                     "type": "group",
                                     "x": 30,
                                     "y": 0,
                                     "width": 95,
-                                    "height": 75,
+                                    "height": 69,
                                     "draw_bound":true,
                                     "line_width":[0,1,0,0],
                                     "items": {
@@ -891,7 +914,7 @@
                                             "x": 50,
                                             "y": 0,
                                             "width": 45,
-                                            "height": 75
+                                            "height": 69
                                         }
                                     }
                                 },
@@ -908,7 +931,7 @@
                                     "x": 125,
                                     "y": 0,
                                     "width": 188,
-                                    "height": 75
+                                    "height": 69
                                 },
                                 "item_3": {
                                     "type": "text",
@@ -923,7 +946,7 @@
                                     "x": 313,
                                     "y": 0,
                                     "width": 36,
-                                    "height": 75
+                                    "height": 69
                                 },
                                 "item_4": {
                                     "type": "text",
@@ -938,7 +961,7 @@
                                     "x": 349,
                                     "y": 0,
                                     "width": 65,
-                                    "height": 75
+                                    "height": 69
                                 },
                                 "item_5": {
                                     "type": "text",
@@ -953,7 +976,7 @@
                                     "x": 414,
                                     "y": 0,
                                     "width": 89,
-                                    "height": 75
+                                    "height": 69
                                 },
                                 "item_6": {
                                     "type": "text",
@@ -968,7 +991,7 @@
                                     "x": 503,
                                     "y": 0,
                                     "width": 68,
-                                    "height": 75
+                                    "height": 69
                                 }
                             }
                         }