server/AyaNova/DataList/QuoteItemDataList.cs

@@ -16,7 +16,7 @@ namespace AyaNova.DataList
             + "left join aproject on (aquote.projectid = aproject.id) "
             + "left join auser on (aquote.preparedbyid = auser.id) "
             + "left join acontract on (aquote.contractid = acontract.id)"
-            + "left join aquoteitem on viewworkorder.id=aquoteitem.workorderid "
+            + "left join aquoteitem on aquote.id=aquoteitem.quoteid "
             + "left join aworkorderitemstatus on (aquoteitem.workorderitemstatusid = aworkorderitemstatus.id) "
             + "left join aworkorderitempriority on (aquoteitem.workorderitempriorityid = aworkorderitempriority.id) "
             ;
@@ -32,7 +32,7 @@ namespace AyaNova.DataList
                 "Customer", 
                 "QuoteQuoteRequestDate" 
                 };
-            DefaultSortBy = new Dictionary<string, string>() { { "QuoteSerialNumber", "-" }, { "QuoteItemSequence", "+" } };
+            DefaultSortBy = new Dictionary<string, string>() { { "QuoteSerialNumber", "-" }, { "WorkOrderItemSequence", "+" } };
             FieldDefinitions = new List<DataListFieldDefinition>();
 
 
@@ -53,7 +53,7 @@ namespace AyaNova.DataList
             {
                 TKey = "WorkOrderItemSummary",
                 FieldKey = "WorkOrderItemSummary",
-                AType = (int)AyaType.WorkOrderItem,
+                AType = (int)AyaType.QuoteItem,
                 UiFieldDataType = (int)UiFieldDataType.Text,
                 SqlIdColumnName = "aquoteitem.id",
                 SqlValueColumnName = "aquoteitem.notes",
@@ -64,7 +64,7 @@ namespace AyaNova.DataList
             {
                 TKey = "Sequence",
                 FieldKey = "WorkOrderItemSequence",
-                AType = (int)AyaType.WorkOrderItem,
+                AType = (int)AyaType.QuoteItem,
                 UiFieldDataType = (int)UiFieldDataType.Integer,
                 SqlIdColumnName = "aquoteitem.id",
                 SqlValueColumnName = "aquoteitem.sequence"