server/AyaNova/DataList/UnitDataList.cs

@@ -12,7 +12,9 @@ namespace AyaNova.DataList
                       + "left join aunit as aparentunit on (amainunit.parentunitid=aparentunit.id) "
                       + "left join aunitmodel on (amainunit.unitmodelid=aunitmodel.id) "
                       + "left join avendor on (amainunit.purchasedfromvendorid=avendor.id) "
-                      + "left join aunit as areplacedbyunit on (amainunit.replacedbyunitid=areplacedbyunit.id) ";
+                      + "left join aunit as areplacedbyunit on (amainunit.replacedbyunitid=areplacedbyunit.id) "
+                      + "left join acontract on (amainunit.contractid=acontract.id)";
+
             var RoleSet = BizRoles.GetRoleSet(DefaultListObjectType);
             AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change;
             DefaultColumns = new List<string>() { "UnitSerial", "UnitModel", "Customer", "Active" };
@@ -176,6 +178,24 @@ namespace AyaNova.DataList
                 SqlValueColumnName = "amainunit.warrantyterms"
             });
 
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "Contract",
+                FieldKey = "unitcontract",
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                AyaObjectType = (int)AyaType.Contract,
+                SqlIdColumnName = "acontract.id",
+                SqlValueColumnName = "acontract.name"
+            });
+
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "ContractExpires",
+                FieldKey = "unitcontractexpires",
+                UiFieldDataType = (int)UiFieldDataType.DateTime,
+                SqlValueColumnName = "amainunit.contractexpires"
+            });
+
             FieldDefinitions.Add(new DataListFieldDefinition
             {
                 TKey = "UsesBanking",

server/AyaNova/biz/ContractBiz.cs

@@ -346,10 +346,11 @@ namespace AyaNova.Biz
 
 
             //VALIDATE CONTRACT RATE / PART ITEMS
-            if (proposedObj.ServiceRateItems.Count ==0)
+            if (proposedObj.ServiceRateItems.Count == 0)
             {
-                if(proposedObj.ContractServiceRatesOnly){
-                     AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, $"ContractRatesOnly");
+                if (proposedObj.ContractServiceRatesOnly)
+                {
+                    AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, $"ContractRatesOnly");
                 }
             }
             else

server/AyaNova/biz/FormFieldReference.cs

@@ -261,6 +261,7 @@ namespace AyaNova.Biz
                     l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" });
                     l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" });
                     l.Add(new FormField { TKey = "Attachments", FieldKey = "Attachments" });
+                    l.Add(new FormField { TKey = "AlertNotes", FieldKey = "AlertNotes" });
 
                     l.Add(new FormField { TKey = "ContractCustom1", FieldKey = "ContractCustom1", IsCustomField = true });
                     l.Add(new FormField { TKey = "ContractCustom2", FieldKey = "ContractCustom2", IsCustomField = true });