161129

finish offline sales order without thumbs
change offline sales order to offline quote

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

@@ -667,7 +667,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
     
     datasource[@"row0"]=row0;
     NSString* print_status=@"";
-    NSString* order_type=@"Sales Order";
+    NSString* order_type=@"Offline Quote";
    if (sqlite3_prepare_v2(db, [sql UTF8String], -1, &statement, nil) == SQLITE_OK)
     {
         
@@ -682,7 +682,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             {
                 switch (erpOrderStatus) {
                     case 10:
-                        order_type=@"Quoted Order";
+//                        order_type=@"Quoted Order";
                         print_status=@"Quote";
                         break;
                     case 11:

RedAnt ERP Mobile/iSales-NPD/so.json

@@ -539,9 +539,9 @@
                                                0
                                                ],
                                 "vAlign": "Middle",
-                                "x": 150,
+                                "x": 149,
                                 "y": 0,
-                                "width": 67,
+                                "width": 68,
                                 "height": 21
                             },
                             "item_5": {
@@ -558,9 +558,9 @@
                                                ],
                                 "textAlignment": "CENTER",
                                 "vAlign": "Middle",
-                                "x": 150,
+                                "x": 149,
                                 "y": 21,
-                                "width": 67,
+                                "width": 68,
                                 "height": 20
                             },
                             "item_6": {
@@ -809,7 +809,7 @@
                                 "height": 120,
                                 "draw_bound": true,
                                 "line_width": [
-                                               0,
+                                               1,
                                                0,
                                                0,
                                                1
@@ -845,7 +845,7 @@
                                                 "source_type": "data",
                                                 "textAlignment": "RIGHT",
                                                 "vAlign": "Middle",
-                                                "margin_left": 2,
+                                                "margin_right": 2,
                                                 "size": "10",
                                                 "bold": false,
                                                 "x": 120,
@@ -884,10 +884,17 @@
                             },
                             "item_3": {
                                 "type": "group",
-                                "x": 3,
-                                "y": 1,
-                                "width": 386,
-                                "height": 77
+                                "x": 0,
+                                "y": 0,
+                                "width": 391,
+                                "height": 77,
+                                "draw_bound": true,
+                                "line_width": [
+                                               1,
+                                               0,
+                                               0,
+                                               0
+                                               ],
                             },
                             "item_4": {
                                 "type": "text",
@@ -931,11 +938,11 @@
                     "line_width": [
                                    1,
                                    1,
-                                   1,
+                                   0,
                                    1
                                    ],
                     "rows": {
-                        "count": 1,
+                        "count": 2,
                         "header": {
                             "data_source": "row0",
                             "type": "group",
@@ -984,7 +991,7 @@
                                     "vAlign": "Middle",
                                     "x": 30,
                                     "y": 0,
-                                    "width": 122,
+                                    "width": 70,
                                     "height": 21
                                 },
                                 "item_2": {
@@ -1003,9 +1010,9 @@
                                     "textAlignment": "CENTER",
                                     "size": "10",
                                     "vAlign": "Middle",
-                                    "x": 152,
+                                    "x": 100,
                                     "y": 0,
-                                    "width": 135,
+                                    "width": 187,
                                     "height": 21
                                 },
                                 "item_3": {
@@ -1101,7 +1108,7 @@
                             "x": 0,
                             "y": 0,
                             "width": 571,
-                            "height": 69,
+                            "height": 21,
                             "items": {
                                 "count": 7,
                                 "item_0": {
@@ -1124,14 +1131,18 @@
                                     "x": 0,
                                     "y": 0,
                                     "width": 30,
-                                    "height": 69
+                                    "height": 21
                                 },
                                 "item_1": {
-                                    "type": "group",
-                                    "x": 30,
-                                    "y": 0,
-                                    "width": 122,
-                                    "height": 69,
+                                    "type": "text",
+                                    "source": "model",
+                                    "source_type": "data",
+                                    "source_isexpression": false,
+                                    "textAlignment": "left",
+                                    "size": "9",
+                                    "margin_left":2,
+                                    "margin_top":2,
+                                    "vAlign": "top",
                                     "draw_bound": true,
                                     "line_width": [
                                                    0,
@@ -1139,33 +1150,10 @@
                                                    0,
                                                    0
                                                    ],
-                                    "items": {
-                                        "count": 2,
-                                        "item_0": {
-                                            "type": "img",
-                                            "source": "img_url",
-                                            "source_type": "data",
-                                            "hAlign": "Center",
-                                            "vAlign": "Middle",
-                                            "x": 5,
-                                            "y": 5,
-                                            "width": 45,
-                                            "height": 45
-                                        },
-                                        "item_1": {
-                                            "type": "text",
-                                            "source": "model",
-                                            "source_type": "data",
-                                            "source_isexpression": false,
-                                            "textAlignment": "left",
-                                            "size": "10",
-                                            "vAlign": "top",
-                                            "x": 60,
-                                            "y": 10,
-                                            "width": 62,
-                                            "height": 50
-                                        }
-                                    }
+                                    "x": 30,
+                                    "y": 0,
+                                    "width": 70,
+                                    "height": 21
                                 },
                                 "item_2": {
                                     "type": "text",
@@ -1184,10 +1172,10 @@
                                     "textAlignment": "left",
                                     "size": "8",
                                     "vAlign": "top",
-                                    "x": 152,
+                                    "x": 100,
                                     "y": 0,
-                                    "width": 135,
-                                    "height": 69
+                                    "width": 187,
+                                    "height": 21
                                 },
                                 "item_3": {
                                     "type": "text",
@@ -1209,7 +1197,7 @@
                                     "x": 287,
                                     "y": 0,
                                     "width": 40,
-                                    "height": 69
+                                    "height": 21
                                 },
                                 "item_4": {
                                     "type": "text",
@@ -1231,7 +1219,7 @@
                                     "x": 327,
                                     "y": 0,
                                     "width": 84,
-                                    "height": 69
+                                    "height": 21
                                 },
                                 "item_5": {
                                     "type": "text",
@@ -1253,7 +1241,7 @@
                                     "x": 411,
                                     "y": 0,
                                     "width": 80,
-                                    "height": 69
+                                    "height": 21
                                 },
                                 "item_6": {
                                     "type": "text",
@@ -1275,6 +1263,49 @@
                                     "x": 491,
                                     "y": 0,
                                     "width": 80,
+                                    "height": 21
+                                }
+                            }
+                        },
+                        "row_1": {
+                            "data_source": "row2",
+                            "repeat": "horizontal",
+                            "type": "group",
+                            "separator":{
+                                "type": "line",
+                                "x0": 0,
+                                "y0": 0,
+                                "x1": 571,
+                                "y1": 0,
+                                "line_width": 1
+                            },
+                            "x": 0,
+                            "y": 0,
+                            "width": 571,
+                            "height": 69,
+                            "draw_bound": true,
+                            "line_width": [
+                                           0,
+                                           1,
+                                           0,
+                                           1
+                                           ],
+                            "items": {
+                                "count": 1,
+                                "item_0": {
+                                    "type": "text",
+                                    "source": "g_notes",
+                                    "source_type": "data",
+                                    "margin_left":2,
+                                    "margin_top":2,
+                                    "source_isexpression": false,
+                                    
+                                    "textAlignment": "left",
+                                    "size": "10",
+                                    "vAlign": "top",
+                                    "x": 0,
+                                    "y": 0,
+                                    "width": 571,
                                     "height": 69
                                 }
                             }

RedAnt ERP Mobile/iSales-NPD/so_thumb.json

@@ -539,9 +539,9 @@
                                                0
                                                ],
                                 "vAlign": "Middle",
-                                "x": 150,
+                                "x": 149,
                                 "y": 0,
-                                "width": 67,
+                                "width": 68,
                                 "height": 21
                             },
                             "item_5": {
@@ -558,9 +558,9 @@
                                                ],
                                 "textAlignment": "CENTER",
                                 "vAlign": "Middle",
-                                "x": 150,
+                                "x": 149,
                                 "y": 21,
-                                "width": 67,
+                                "width": 68,
                                 "height": 20
                             },
                             "item_6": {
@@ -845,7 +845,7 @@
                                                 "source_type": "data",
                                                 "textAlignment": "RIGHT",
                                                 "vAlign": "Middle",
-                                                "margin_left": 2,
+                                                "margin_right": 2,
                                                 "size": "10",
                                                 "bold": false,
                                                 "x": 120,