فهرست منبع

161116
update offline sales order progress

Ray Zhang 9 سال پیش
والد
کامیت
da18c15f9f

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


+ 294 - 102
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -42,11 +42,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/RAUtils.m"
-            timestampString = "499313996.998615"
+            timestampString = "500526291.362168"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "204"
-            endingLineNumber = "204"
+            startingLineNumber = "205"
+            endingLineNumber = "205"
             landmarkName = "+rectAlign:rect:hAlign:vAlign:"
             landmarkType = "7">
          </BreakpointContent>
@@ -58,7 +58,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499833928.148544"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "142"
@@ -74,7 +74,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499568343.756337"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "124"
@@ -90,7 +90,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500261616.712663"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "448"
@@ -106,7 +106,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500261616.712663"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "161"
@@ -154,7 +154,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500261616.712663"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "447"
@@ -186,7 +186,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500261616.712663"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "461"
@@ -202,11 +202,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500455350.392929"
+            timestampString = "500891123.395079"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1046"
-            endingLineNumber = "1046"
+            startingLineNumber = "1079"
+            endingLineNumber = "1079"
             landmarkName = "+offline_request_tearsheet:"
             landmarkType = "7">
          </BreakpointContent>
@@ -218,7 +218,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499833928.148544"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "140"
@@ -314,7 +314,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499568343.756337"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "120"
@@ -330,7 +330,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500261616.712663"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "194"
@@ -346,7 +346,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500261616.712663"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "152"
@@ -362,7 +362,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500261616.712663"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "174"
@@ -378,7 +378,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500261616.712663"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "347"
@@ -394,7 +394,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500261616.712663"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "350"
@@ -570,11 +570,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500455350.392929"
+            timestampString = "500891123.395079"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "10996"
-            endingLineNumber = "10996"
+            startingLineNumber = "11029"
+            endingLineNumber = "11029"
             landmarkName = "+offline_savePDF:direct:"
             landmarkType = "7">
          </BreakpointContent>
@@ -586,11 +586,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500455350.392929"
+            timestampString = "500891123.395079"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1057"
-            endingLineNumber = "1057"
+            startingLineNumber = "1090"
+            endingLineNumber = "1090"
             landmarkName = "+offline_request_tearsheet:"
             landmarkType = "7">
          </BreakpointContent>
@@ -634,11 +634,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500455350.392929"
+            timestampString = "500891123.395079"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "10961"
-            endingLineNumber = "10961"
+            startingLineNumber = "10994"
+            endingLineNumber = "10994"
             landmarkName = "+offline_savePDF:direct:"
             landmarkType = "7">
          </BreakpointContent>
@@ -650,11 +650,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500455350.392929"
+            timestampString = "500891123.395079"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "10788"
-            endingLineNumber = "10788"
+            startingLineNumber = "10821"
+            endingLineNumber = "10821"
             landmarkName = "+offline_portfolioList:"
             landmarkType = "7">
          </BreakpointContent>
@@ -666,11 +666,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500455350.392929"
+            timestampString = "500891123.395079"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "10892"
-            endingLineNumber = "10892"
+            startingLineNumber = "10925"
+            endingLineNumber = "10925"
             landmarkName = "+offline_savePDF:direct:"
             landmarkType = "7">
          </BreakpointContent>
@@ -682,11 +682,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500455350.392929"
+            timestampString = "500891123.395079"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "10932"
-            endingLineNumber = "10932"
+            startingLineNumber = "10965"
+            endingLineNumber = "10965"
             landmarkName = "+offline_savePDF:direct:"
             landmarkType = "7">
          </BreakpointContent>
@@ -762,11 +762,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/RAUtils.m"
-            timestampString = "500449739.081135"
+            timestampString = "500538091.95793"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "291"
-            endingLineNumber = "291"
+            startingLineNumber = "294"
+            endingLineNumber = "294"
             landmarkName = "+rectVAlign:rect:vAlign:"
             landmarkType = "7">
          </BreakpointContent>
@@ -794,7 +794,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500261616.712663"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "196"
@@ -810,7 +810,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500261616.712663"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "197"
@@ -826,7 +826,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500261616.712663"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "198"
@@ -842,7 +842,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500261616.712663"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "396"
@@ -858,7 +858,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499568616.350837"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "32"
@@ -890,7 +890,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500261616.712663"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "463"
@@ -938,7 +938,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499833928.148544"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "134"
@@ -954,7 +954,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500261616.712663"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "169"
@@ -970,7 +970,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500261616.712663"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "400"
@@ -986,7 +986,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500261616.712663"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "224"
@@ -1002,11 +1002,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "iSales-NPD/AppDelegate.m"
-            timestampString = "500449739.081135"
+            timestampString = "500525966.695715"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1769"
-            endingLineNumber = "1769"
+            startingLineNumber = "1771"
+            endingLineNumber = "1771"
             landmarkName = "-download_offline:checkdiskspace:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1018,11 +1018,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/RAUtils.m"
-            timestampString = "500449739.081135"
+            timestampString = "500538091.95793"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "264"
-            endingLineNumber = "264"
+            startingLineNumber = "267"
+            endingLineNumber = "267"
             landmarkName = "+get_config_path"
             landmarkType = "7">
          </BreakpointContent>
@@ -1034,11 +1034,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "iSales-NPD/AppDelegate.m"
-            timestampString = "500449739.081135"
+            timestampString = "500525966.695715"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1285"
-            endingLineNumber = "1285"
+            startingLineNumber = "1287"
+            endingLineNumber = "1287"
             landmarkName = "-upload_offline:useInternalAddress:orderid:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1050,7 +1050,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500261616.712663"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "349"
@@ -1114,11 +1114,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500455350.392929"
+            timestampString = "500891123.395079"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "11041"
-            endingLineNumber = "11041"
+            startingLineNumber = "11074"
+            endingLineNumber = "11074"
             landmarkName = "+offline_pdfList:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1417,7 +1417,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500261616.712663"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "323"
@@ -1433,7 +1433,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500261616.712663"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "233"
@@ -1449,7 +1449,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500261616.712663"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "190"
@@ -1465,11 +1465,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500455350.392929"
+            timestampString = "500891123.395079"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2698"
-            endingLineNumber = "2698"
+            startingLineNumber = "2731"
+            endingLineNumber = "2731"
             landmarkName = "+offline_model:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1481,11 +1481,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500455350.392929"
+            timestampString = "500891123.395079"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4504"
-            endingLineNumber = "4504"
+            startingLineNumber = "4537"
+            endingLineNumber = "4537"
             landmarkName = "+model_selector:field:db:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1497,11 +1497,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500455350.392929"
+            timestampString = "500891123.395079"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4472"
-            endingLineNumber = "4472"
+            startingLineNumber = "4505"
+            endingLineNumber = "4505"
             landmarkName = "+model_property:field:db:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1545,11 +1545,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "iSales-NPD/AppDelegate.m"
-            timestampString = "500449739.081135"
+            timestampString = "500525966.695715"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2219"
-            endingLineNumber = "2219"
+            startingLineNumber = "2221"
+            endingLineNumber = "2221"
             landmarkName = "-connectionDidFinishLoading:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1561,7 +1561,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500261561.711533"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "156"
@@ -1609,7 +1609,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500261568.119734"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "150"
@@ -1625,7 +1625,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500266762.237908"
+            timestampString = "500541714.703908"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "132"
@@ -1641,11 +1641,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500455350.392929"
+            timestampString = "500891123.395079"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1042"
-            endingLineNumber = "1042"
+            startingLineNumber = "1075"
+            endingLineNumber = "1075"
             landmarkName = "+offline_request_tearsheet:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1689,11 +1689,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500455350.392929"
+            timestampString = "500891123.395079"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2206"
-            endingLineNumber = "2206"
+            startingLineNumber = "2239"
+            endingLineNumber = "2239"
             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 = "500449739.081135"
+            timestampString = "500526291.362168"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "230"
-            endingLineNumber = "230"
+            startingLineNumber = "231"
+            endingLineNumber = "231"
             landmarkName = "+generateBarCode:width:height:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1737,11 +1737,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "iSales-NPD/AppDelegate.m"
-            timestampString = "500449739.081135"
+            timestampString = "500525966.695715"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "776"
-            endingLineNumber = "776"
+            startingLineNumber = "778"
+            endingLineNumber = "778"
             landmarkName = "-application:didFinishLaunchingWithOptions:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1749,15 +1749,15 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500455350.392929"
+            timestampString = "500891123.395079"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1021"
-            endingLineNumber = "1021"
+            startingLineNumber = "1054"
+            endingLineNumber = "1054"
             landmarkName = "+offline_request_salesorder:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1765,15 +1765,15 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "500455079.755214"
+            timestampString = "500891123.395079"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1008"
-            endingLineNumber = "1008"
+            startingLineNumber = "1041"
+            endingLineNumber = "1041"
             landmarkName = "+offline_request_salesorder:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1781,7 +1781,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/order/OrderDetailViewController.m"
@@ -1794,5 +1794,197 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/pdfCreator/pdfCreator.m"
+            timestampString = "500526031.463496"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "111"
+            endingLineNumber = "111"
+            landmarkName = "+CreatePdf:dataSource:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/pdfCreator/PDFPage.m"
+            timestampString = "500526101.504254"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "129"
+            endingLineNumber = "129"
+            landmarkName = "-Draw:dataSource:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/pdfCreator/PDFPage.m"
+            timestampString = "500526120.280562"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "153"
+            endingLineNumber = "153"
+            landmarkName = "-Draw:dataSource:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/pdfCreator/TextDrawable.m"
+            timestampString = "500526200.345586"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "228"
+            endingLineNumber = "228"
+            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/RAUtils.m"
+            timestampString = "500526291.362168"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "187"
+            endingLineNumber = "187"
+            landmarkName = "+expression_varable:regex:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/offline/OLDataProvider.m"
+            timestampString = "500891123.395079"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "526"
+            endingLineNumber = "526"
+            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 = "500782318.524252"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "519"
+            endingLineNumber = "519"
+            landmarkName = "+prepare_salesorder_data:type:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/RAUtils.m"
+            timestampString = "500538091.95793"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "236"
+            endingLineNumber = "236"
+            landmarkName = "+generateBarCode:width:height:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/pdfCreator/GroupDrawable.m"
+            timestampString = "500540887.987937"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "33"
+            endingLineNumber = "33"
+            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 = "500541764.336183"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "472"
+            endingLineNumber = "472"
+            landmarkName = "+get_pdftemplate:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/offline/OLDataProvider.m"
+            timestampString = "500891123.395079"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "7835"
+            endingLineNumber = "7835"
+            landmarkName = "+offline_orderlist:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/offline/OLDataProvider.m"
+            timestampString = "500780128.642729"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "500"
+            endingLineNumber = "500"
+            landmarkName = "+prepare_salesorder_data:type:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 32 - 8
RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.m


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

@@ -360,7 +360,7 @@
         if(appDelegate.offline_mode)
         {
             NSMutableDictionary* params = [@{
-                                            @"type" : @"1",
+                                            @"thumb" : @"1",
                                             @"order_code" : self.order_code,
                                             } mutableCopy];
             [OLDataProvider  offline_request_salesorder:params];
@@ -386,7 +386,7 @@
         if(appDelegate.offline_mode)
         {
             NSMutableDictionary* params = [@{
-                                             @"type" : @"0",
+                                             @"thumb" : @"0",
                                              @"order_code" : self.order_code,
                                              } mutableCopy];
             [OLDataProvider  offline_request_salesorder:params];

+ 5 - 2
RedAnt ERP Mobile/common/RAUtils.m

@@ -180,7 +180,8 @@
 +(NSArray*) expression_varable:(NSString*)content regex:(NSString*) pattern
 {
     
-    
+    if(content==nil)
+        return nil;
 
     
     NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:pattern options:nil error:nil];
@@ -233,8 +234,10 @@
     CGFloat scaleX = width / barcodeImage.extent.size.width; // extent 返回图片的frame
     CGFloat scaleY = height / barcodeImage.extent.size.height;
     CIImage *transformedImage = [barcodeImage imageByApplyingTransform:CGAffineTransformScale(CGAffineTransformIdentity, scaleX, scaleY)];
+    CIContext *context = [CIContext contextWithOptions:nil];
+    CGImageRef cgImage = [context createCGImage:transformedImage fromRect:[transformedImage extent]];
     
-    return [UIImage imageWithCIImage:transformedImage];
+    return [UIImage imageWithCGImage:cgImage];
     
 }
 

+ 4 - 4
RedAnt ERP Mobile/iSales-NPD.xcodeproj/project.pbxproj

@@ -33,7 +33,7 @@
 		42E58C021D7E735A0092810A /* UIColor+JK_HEX.m in Sources */ = {isa = PBXBuildFile; fileRef = 42E58C011D7E735A0092810A /* UIColor+JK_HEX.m */; };
 		42F637521DB2178E00605C4B /* JKMessageBoxController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42F637511DB2178E00605C4B /* JKMessageBoxController.m */; };
 		710274251CC606C4009FD219 /* UserListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 710274241CC606C4009FD219 /* UserListViewController.m */; };
-		71073AE61DD41DD8001BC653 /* so.json in Resources */ = {isa = PBXBuildFile; fileRef = 71073AE51DD41DD8001BC653 /* so.json */; };
+		71073AE61DD41DD8001BC653 /* so_thumb.json in Resources */ = {isa = PBXBuildFile; fileRef = 71073AE51DD41DD8001BC653 /* so_thumb.json */; };
 		7111E5721C76C557004763B3 /* customer_info_template_edit.json in Resources */ = {isa = PBXBuildFile; fileRef = 7111E5711C76C557004763B3 /* customer_info_template_edit.json */; };
 		71131F921CA1372300DBF6E2 /* SimplifiedBuyingProgramViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71131F911CA1372300DBF6E2 /* SimplifiedBuyingProgramViewController.m */; };
 		712AFED71DBA050200254965 /* BasicDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AFEC61DBA050200254965 /* BasicDrawable.m */; };
@@ -281,7 +281,7 @@
 		6C826876B24EFB83AC94A464 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
 		710274231CC606C4009FD219 /* UserListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UserListViewController.h; path = common/Functions/sidemenu/UserListViewController.h; sourceTree = SOURCE_ROOT; };
 		710274241CC606C4009FD219 /* UserListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UserListViewController.m; path = common/Functions/sidemenu/UserListViewController.m; sourceTree = SOURCE_ROOT; };
-		71073AE51DD41DD8001BC653 /* so.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = so.json; sourceTree = "<group>"; };
+		71073AE51DD41DD8001BC653 /* so_thumb.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = so_thumb.json; sourceTree = "<group>"; };
 		7111E5711C76C557004763B3 /* customer_info_template_edit.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = customer_info_template_edit.json; path = common/Functions/contact/customer_info_template_edit.json; sourceTree = SOURCE_ROOT; };
 		71131F901CA1372300DBF6E2 /* SimplifiedBuyingProgramViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SimplifiedBuyingProgramViewController.h; path = common/Functions/sidemenu/SimplifiedBuyingProgramViewController.h; sourceTree = SOURCE_ROOT; };
 		71131F911CA1372300DBF6E2 /* SimplifiedBuyingProgramViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SimplifiedBuyingProgramViewController.m; path = common/Functions/sidemenu/SimplifiedBuyingProgramViewController.m; sourceTree = SOURCE_ROOT; };
@@ -910,7 +910,7 @@
 			isa = PBXGroup;
 			children = (
 				712AFEE61DBDB48000254965 /* portfolio_3x2.json */,
-				71073AE51DD41DD8001BC653 /* so.json */,
+				71073AE51DD41DD8001BC653 /* so_thumb.json */,
 				71D5016B1DC32C3300971FBB /* portfolio_2x3.json */,
 			);
 			name = template;
@@ -1526,7 +1526,7 @@
 				42C9FB151D5B28FA001DCA8B /* contactAdvanceSearch.json in Resources */,
 				7161FEB51D61B24900157EE1 /* creditcardpayment.html in Resources */,
 				71777FC61C8AC97300DA2511 /* debug_category_filter.json in Resources */,
-				71073AE61DD41DD8001BC653 /* so.json in Resources */,
+				71073AE61DD41DD8001BC653 /* so_thumb.json in Resources */,
 				712AFEE71DBDB48000254965 /* portfolio_3x2.json in Resources */,
 				71E5A0101DC99370005BF655 /* config.plist in Resources */,
 				71DF74951C57614C00F2789C /* PhotoBorder.png in Resources */,

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

@@ -17,7 +17,7 @@
 #define flat_price @"Unified selling price"
 #define given_price @"Calculated price"
 
-#define PDF_DEBUG false
+#define PDF_DEBUG true
 
 //#define ENCRYPT_OFF
  

+ 21 - 0
RedAnt ERP Mobile/iSales-NPD/pdfcreator.xcassets/salesorder_logo.imageset/Contents.json

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

BIN
RedAnt ERP Mobile/iSales-NPD/pdfcreator.xcassets/salesorder_logo.imageset/npd(1).png


+ 661 - 0
RedAnt ERP Mobile/iSales-NPD/so_thumb.json

@@ -0,0 +1,661 @@
+{
+    "paper": {
+        "width": 612,
+        "height": 792
+    },
+    "pages": {
+        "count": 1,
+        "page_0": {
+            "name": "content page",
+            "header": {
+                "type": "group",
+                "x": 0,
+                "y": 0,
+                "width": 572,
+                "height": 310,
+                "items": {
+                    "count": 26,
+                    "item_0": {
+                        "type": "img",
+                        "hAlign": "Left",
+                        "vAlign": "Middle",
+                        "source": "salesorder_logo",
+                        "source_type": "const",
+                        "x": 0,
+                        "y": 0,
+                        "width": 175,
+                        "height": 52
+                    },
+                    "item_1": {
+                        "type": "img",
+                        "source": "img_barcode",
+                        "source_type": "data",
+                        "source_path_type": "local",
+                        "hAlign": "Center",
+                        "vAlign": "Middle",
+                        "x": 331,
+                        "y": 5,
+                        "width": 240,
+                        "height": 22
+                    },
+                    "item_2": {
+                        "type": "text",
+                        "source": "order_type",
+                        "source_type": "data",
+                        "textAlignment": "Left",
+                        "vAlign": "Middle",
+                        "size": "24",
+                        "bold": true,
+                        "x": 290,
+                        "y": 42,
+                        "width": 282,
+                        "height": 42
+                    },
+                    "item_3": {
+                        "type": "text",
+                        "text": "SO No.",
+                        "source_type": "const",
+                        "textAlignment": "Center",
+                        "vAlign": "Middle",
+                        "size": "10",
+                        "bold": true,
+                        "x": 373,
+                        "y": 84,
+                        "width": 99,
+                        "height": 20
+                    },
+                    "item_4": {
+                        "type": "text",
+                        "text": "DATE",
+                        "source_type": "const",
+                        "textAlignment": "Center",
+                        "vAlign": "Middle",
+                        "size": "10",
+                        "bold": true,
+                        "x": 291,
+                        "y": 84,
+                        "width": 82,
+                        "height": 20
+                    },
+                    "item_5": {
+                        "type": "text",
+                        "text": "T:",
+                        "source_type": "const",
+                        "textAlignment": "Left",
+                        "vAlign": "Middle",
+                        "size": "10",
+                        "bold": true,
+                        "x": 0,
+                        "y": 97,
+                        "width": 22,
+                        "height": 20
+                    },
+                    "item_6": {
+                        "type": "text",
+                        "text": "F:",
+                        "source_type": "const",
+                        "textAlignment": "Left",
+                        "vAlign": "Middle",
+                        "size": "10",
+                        "bold": true,
+                        "x": 126,
+                        "y": 97,
+                        "width": 24,
+                        "height": 20
+                    },
+                    "item_7": {
+                        "type": "text",
+                        "text": "E:",
+                        "source_type": "const",
+                        "textAlignment": "Left",
+                        "vAlign": "Middle",
+                        "size": "10",
+                        "bold": true,
+                        "x": 0,
+                        "y": 117,
+                        "width": 22,
+                        "height": 20
+                    },
+                    "item_8": {
+                        "type": "text",
+                        "text": "VENDOR No.",
+                        "source_type": "const",
+                        "textAlignment": "Center",
+                        "vAlign": "Middle",
+                        "size": "10",
+                        "bold": true,
+                        "x": 472,
+                        "y": 84,
+                        "width": 99,
+                        "height": 20
+                    },
+                    "item_9": {
+                        "type": "text",
+                        "source": "so_id",
+                        "source_type": "data",
+                        "textAlignment": "Center",
+                        "vAlign": "Middle",
+                        "size": "10",
+                        "bold": true,
+                        "x": 373,
+                        "y": 104,
+                        "width": 99,
+                        "height": 28
+                    },
+                    "item_10": {
+                        "type": "text",
+                        "source": "date",
+                        "source_type": "data",
+                        "textAlignment": "Center",
+                        "vAlign": "Middle",
+                        "size": "10",
+                        "bold": true,
+                        "x": 291,
+                        "y": 104,
+                        "width": 82,
+                        "height": 28
+                    },
+                    "item_11": {
+                        "type": "text",
+                        "source": "shipfrom_addr",
+                        "source_type": "data",
+                        "textAlignment": "Center",
+                        "vAlign": "Middle",
+                        "size": "10",
+                        "bold": true,
+                        "x": 0,
+                        "y": 72,
+                        "width": 250,
+                        "height": 22
+                    },
+                    "item_12": {
+                        "type": "text",
+                        "source": "shipfrom_phone",
+                        "source_type": "data",
+                        "textAlignment": "Center",
+                        "vAlign": "Middle",
+                        "size": "10",
+                        "bold": true,
+                        "x": 22,
+                        "y": 97,
+                        "width": 104,
+                        "height": 20
+                    },
+                    "item_13": {
+                        "type": "text",
+                        "source": "shipfrom_fax",
+                        "source_type": "data",
+                        "textAlignment": "Center",
+                        "vAlign": "Middle",
+                        "size": "10",
+                        "bold": true,
+                        "x": 150,
+                        "y": 97,
+                        "width": 100,
+                        "height": 20
+                    },
+                    "item_14": {
+                        "type": "text",
+                        "source": "shipfrom_email",
+                        "source_type": "data",
+                        "textAlignment": "Center",
+                        "vAlign": "Middle",
+                        "size": "10",
+                        "bold": true,
+                        "x": 22,
+                        "y": 117,
+                        "width": 228,
+                        "height": 20
+                    },
+                    "item_15": {
+                        "type": "text",
+                        "source": "company",
+                        "source_type": "data",
+                        "textAlignment": "left",
+                        "vAlign": "Middle",
+                        "size": "12",
+                        "bold": true,
+                        "x": 0,
+                        "y": 52,
+                        "width": 250,
+                        "height": 20
+                    },
+                    "item_16": {
+                        "type": "text",
+                        "source": "so_id",
+                        "source_type": "data",
+                        "textAlignment": "center",
+                        "vAlign": "Middle",
+                        "size": "10",
+                        "bold": true,
+                        "x": 331,
+                        "y": 27,
+                        "width": 214,
+                        "height": 15
+                    },
+                    "item_17": {
+                        "type": "text",
+                        "text": "Location:",
+                        "source_type": "const",
+                        "textAlignment": "left",
+                        "vAlign": "Middle",
+                        "size": "10",
+                        "bold": true,
+                        "x": 290,
+                        "y": 134,
+                        "width": 64,
+                        "height": 15
+                    },
+                    "item_18": {
+                        "type": "text",
+                        "source": "ship_to",
+                        "source_type": "data",
+                        "textAlignment": "left",
+                        "vAlign": "Middle",
+                        "size": "10",
+                        "bold": true,
+                        "x": 275,
+                        "y": 152,
+                        "width": 296,
+                        "height": 20
+                    },
+                    "item_19": {
+                        "type": "text",
+                        "source": "vender_no",
+                        "source_type": "data",
+                        "textAlignment": "left",
+                        "vAlign": "Middle",
+                        "size": "10",
+                        "bold": true,
+                        "x": 472,
+                        "y": 104,
+                        "width": 99,
+                        "height": 28
+                    },
+                    "item_20": {
+                        "type": "text",
+                        "source": "warehose_name",
+                        "source_type": "data",
+                        "textAlignment": "left",
+                        "vAlign": "Middle",
+                        "size": "10",
+                        "bold": true,
+                        "x": 355,
+                        "y": 134,
+                        "width": 137,
+                        "height": 15
+                    },
+                    "item_20": {
+                        "type": "text",
+                        "source": "bill_to",
+                        "source_type": "data",
+                        "textAlignment": "left",
+                        "vAlign": "Middle",
+                        "size": "10",
+                        "bold": true,
+                        "x": 0,
+                        "y": 152,
+                        "width": 275,
+                        "height": 20
+                    },
+                    "item_21": {
+                        "type": "text",
+                        "source": "bill_to_name",
+                        "source_type": "data",
+                        "textAlignment": "left",
+                        "vAlign": "Middle",
+                        "size": "10",
+                        "bold": true,
+                        "x": 0,
+                        "y": 172,
+                        "width": 275,
+                        "height": 20
+                    },
+                    "item_22": {
+                        "type": "text",
+                        "source": "ship_to_name",
+                        "source_type": "data",
+                        "textAlignment": "left",
+                        "vAlign": "Middle",
+                        "size": "10",
+                        "bold": true,
+                        "x": 275,
+                        "y": 172,
+                        "width": 296,
+                        "height": 20
+                    },
+                    "item_23": {
+                        "type": "text",
+                        "source": "bill_to_ext",
+                        "source_type": "data",
+                        "textAlignment": "left",
+                        "vAlign": "Middle",
+                        "size": "10",
+                        "bold": true,
+                        "x": 0,
+                        "y": 192,
+                        "width": 275,
+                        "height": 70
+                    },
+                    "item_24": {
+                        "type": "text",
+                        "source": "ship_to_ext",
+                        "source_type": "data",
+                        "textAlignment": "left",
+                        "vAlign": "Middle",
+                        "size": "10",
+                        "bold": true,
+                        "x": 275,
+                        "y": 192,
+                        "width": 296,
+                        "height": 70
+                    },
+                    "item_25":{
+                        "type": "group",
+                        "x": 0,
+                        "y": 270,
+                        "width": 572,
+                        "height": 42,
+                        "items": {
+                            "count": 12,
+                            "item_0": {
+                                "type": "text",
+                                "text": "CARRIER",
+                                "source_type": "const",
+                                "textAlignment": "CENTER",
+                                "vAlign": "Middle",
+                                "x": 352,
+                                "y": 0,
+                                "width": 120,
+                                "height": 21
+                            },
+                            "item_1": {
+                                "type": "text",
+                                "source": "carrier",
+                                "source_type": "data",
+                                "source_isexpression": true,
+                                "textAlignment": "Right",
+                                "vAlign": "Middle",
+                                "x": 352,
+                                "y": 21,
+                                "width": 120,
+                                "height": 20
+                            },
+                            "item_2": {
+                                "type": "text",
+                                "text": "PO No.",
+                                "source_type": "const",
+                                "textAlignment": "CENTER",
+                                "vAlign": "Middle",
+                                "x": 0,
+                                "y": 0,
+                                "width": 91,
+                                "height": 21
+                            },
+                            "item_3": {
+                                "type": "text",
+                                "source": "po_no",
+                                "source_type": "data",
+                                "source_isexpression": true,
+                                "textAlignment": "Right",
+                                "vAlign": "Middle",
+                                "x": 0,
+                                "y": 21,
+                                "width": 91,
+                                "height": 20
+                            },
+                            "item_4": {
+                                "type": "text",
+                                "text": "TERMS",
+                                "source_type": "const",
+                                "textAlignment": "CENTER",
+                                "vAlign": "Middle",
+                                "x": 91,
+                                "y": 0,
+                                "width": 73,
+                                "height": 21
+                            },
+                            "item_5": {
+                                "type": "text",
+                                "source": "terms",
+                                "source_type": "data",
+                                "source_isexpression": true,
+                                "textAlignment": "Right",
+                                "vAlign": "Middle",
+                                "x": 91,
+                                "y": 21,
+                                "width": 73,
+                                "height": 20
+                            },
+                            "item_6": {
+                                "type": "text",
+                                "text": "REP",
+                                "source_type": "const",
+                                "textAlignment": "CENTER",
+                                "vAlign": "Middle",
+                                "x": 164,
+                                "y": 0,
+                                "width": 60,
+                                "height": 21
+                            },
+                            "item_7": {
+                                "type": "text",
+                                "source": "rep",
+                                "source_type": "data",
+                                "source_isexpression": true,
+                                "textAlignment": "Right",
+                                "vAlign": "Middle",
+                                "x": 164,
+                                "y": 21,
+                                "width": 60,
+                                "height": 20
+                            },
+                            "item_8": {
+                                "type": "text",
+                                "text": "EST. SCHEDULE",
+                                "source_type": "const",
+                                "textAlignment": "CENTER",
+                                "vAlign": "Middle",
+                                "x": 224,
+                                "y": 0,
+                                "width": 128,
+                                "height": 21
+                            },
+                            "item_9": {
+                                "type": "text",
+                                "source": "e_schdule",
+                                "source_type": "data",
+                                "source_isexpression": true,
+                                "textAlignment": "Right",
+                                "vAlign": "Middle",
+                                "x": 224,
+                                "y": 21,
+                                "width": 128,
+                                "height": 20
+                            },
+                            "item_10": {
+                                "type": "text",
+                                "text": "FOB",
+                                "source_type": "const",
+                                "textAlignment": "CENTER",
+                                "vAlign": "Middle",
+                                "x": 472,
+                                "y": 0,
+                                "width": 100,
+                                "height": 21
+                            },
+                            "item_11": {
+                                "type": "text",
+                                "source": "e_schdule",
+                                "source_type": "data",
+                                "source_isexpression": true,
+                                "textAlignment": "Right",
+                                "vAlign": "Middle",
+                                "x": 472,
+                                "y": 21,
+                                "width": 100,
+                                "height": 20
+                            }
+                        }
+                    }
+                }
+            },
+            "footer": {
+                "type": "group",
+                "x": 0,
+                "y": 612,
+                "width": 572,
+                "height": 140,
+                "items": {
+                    "count": 3,
+                    "item_0": {
+                        "type": "text",
+                        "source": "print_date",
+                        "source_type": "data",
+                        "textAlignment": "Left",
+                        "vAlign": "Middle",
+                        "size":9,
+                        "x": 237,
+                        "y": 119,
+                        "width": 109,
+                        "height": 20
+                    },
+                    "item_1": {
+                        "type": "text",
+                        "text": "Printed Date:",
+                        "source_type": "const",
+                        "source_isexpression": true,
+                        "textAlignment": "Right",
+                        "vAlign": "Middle",
+                        "size":9,
+                        "x": 165,
+                        "y": 119,
+                        "width": 70,
+                        "height": 20
+                    },
+                    "item_2": {
+                        "type": "text",
+                        "source": "PAGE_INDEX",
+                        "source_type": "data",
+                        "source_isexpression":true,
+                        "textAlignment": "Right",
+                        "vAlign": "Middle",
+                        "size":9,
+                        "x": 490,
+                        "y": 119,
+                        "width": 56,
+                        "height": 20
+                    }
+                }
+            },
+            "margin_left": 20,
+            "margin_right": 20,
+            "margin_top": 20,
+            "margin_bottom": 20,
+            "contents": {
+                "count": 0,
+                "item_0": {
+                    "type": "grid",
+                    "data_source": "grid0",
+                    "cell": {
+                        "direction": "H",
+                        "duplicate": 0,
+                        "data_source": "cell0",
+                        "type": "group",
+                        "x": 0,
+                        "y": 0,
+                        "width": 286,
+                        "height": 231,
+                        "items": {
+                            "count": 7,
+                            "item_1": {
+                                "type": "img",
+                                "source": "img_qr",
+                                "source_type": "data",
+                                "source_path_type": "local",
+                                "hAlign": "Center",
+                                "vAlign": "Middle",
+                                "x": 20,
+                                "y": 20,
+                                "width": 51,
+                                "height": 51
+                            },
+                            "item_0": {
+                                "type": "img",
+                                "source": "img",
+                                "source_type": "data",
+                                "hAlign": "Center",
+                                "vAlign": "Middle",
+                                "x": 101,
+                                "y": 0,
+                                "width": 93,
+                                "height": 101
+                            },
+                            "item_2": {
+                                "type": "text",
+                                "source": "special_price",
+                                "source_type": "data",
+                                "size": "10",
+                                "bold": true,
+                                "color": "0xff0000",
+                                "x": 195,
+                                "y": 87,
+                                "width": 90,
+                                "height": 20
+                            },
+                            "item_3": {
+                                "type": "text",
+                                "source": "name",
+                                "source_type": "data",
+                                "size": "12",
+                                "bold": true,
+                                "x": 4,
+                                "y": 103,
+                                "width": 188,
+                                "height": 23
+                            },
+                            "item_4": {
+                                "type": "text",
+                                "source": "description",
+                                "source_type": "data",
+                                "size": "9",
+                                "bold": true,
+                                "x": 4,
+                                "y": 126,
+                                "width": 282,
+                                "height": 31
+                            },
+                            "item_5": {
+                                "type": "text",
+                                "source": "price",
+                                "source_type": "data",
+                                "size": "10",
+                                "bold": true,
+                                "x": 195,
+                                "y": 106,
+                                "width": 90,
+                                "height": 20
+                            },
+                            "item_6": {
+                                "type": "text",
+                                "source": "detail",
+                                "source_type": "data",
+                                "ishtml": true,
+                                "size": "8",
+                                "bold": false,
+                                "x": 4,
+                                "y": 157,
+                                "width": 282,
+                                "height": 72
+                            }
+                        }
+                    },
+                    "x": 0,
+                    "y": 0,
+                    "width": 752,
+                    "height": 491
+                }
+            }
+        }
+    }
+}

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است