server/AyaNova/DataList/WorkOrderDataList.cs

@@ -15,7 +15,10 @@ namespace AyaNova.DataList
             + "left join acustomer on (viewworkorder.customerid=acustomer.id) "
             + "left join aheadoffice on (acustomer.headofficeid=aheadoffice.id) "
             + "left join aproject on (viewworkorder.projectid=aproject.id) "
-            + "left join acontract on (viewworkorder.contractid=acontract.id)";
+            + "left join acontract on (viewworkorder.contractid=acontract.id)"
+            + "left join apm on (viewworkorder.frompmid=apm.id)"
+            + "left join aquote on (viewworkorder.fromquoteid=aquote.id)"
+            ;
             var RoleSet = BizRoles.GetRoleSet(DefaultListAType);
             AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change;
             DefaultColumns = new List<string>() { "WorkOrderSerialNumber", "Customer", "WorkOrderServiceDate", "WorkOrderCloseByDate", "WorkOrderStatus", "Project", "WorkOrderAge" };
@@ -53,6 +56,26 @@ namespace AyaNova.DataList
                 SqlValueColumnName = "aheadoffice.name"
             });
 
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                FieldKey = "WorkOrderFromPMID",
+                TKey = "WorkOrderFromPMID",
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                AType = (int)AyaType.PM,
+                SqlIdColumnName = "apm.id",
+                SqlValueColumnName = "apm.serial"
+            });
+
+             FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                FieldKey = "WorkOrderFromQuoteID",
+                TKey = "WorkOrderFromQuoteID",
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                AType = (int)AyaType.Quote,
+                SqlIdColumnName = "aquote.id",
+                SqlValueColumnName = "aquote.serial"
+            });
+
             FieldDefinitions.Add(new DataListFieldDefinition
             {
                 TKey = "WorkOrderStatus",