diff --git a/server/AyaNova/DataList/PartDataList.cs b/server/AyaNova/DataList/PartDataList.cs index e456c89d..ad8f8141 100644 --- a/server/AyaNova/DataList/PartDataList.cs +++ b/server/AyaNova/DataList/PartDataList.cs @@ -109,15 +109,7 @@ namespace AyaNova.DataList SqlValueColumnName = "apart.retail" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition - { - TKey = "PartTrackSerialNumber", - FieldKey = "PartTrackSerialNumber", - UiFieldDataType = (int)UiFieldDataType.Bool, - SqlValueColumnName = "apart.trackserialnumber" - }); - - + FieldDefinitions.Add(new AyaDataListFieldDefinition { FieldKey = "PartManufacturerID", diff --git a/server/AyaNova/biz/AyaFormFieldDefinitions.cs b/server/AyaNova/biz/AyaFormFieldDefinitions.cs index 54a7b102..981b60e3 100644 --- a/server/AyaNova/biz/AyaFormFieldDefinitions.cs +++ b/server/AyaNova/biz/AyaFormFieldDefinitions.cs @@ -466,7 +466,6 @@ namespace AyaNova.Biz l.Add(new AyaFormFieldDefinition { TKey = "PartPartNumber", FieldKey = "PartPartNumber", Hideable = false }); l.Add(new AyaFormFieldDefinition { TKey = "PartCost", FieldKey = "PartCost", Hideable = false }); l.Add(new AyaFormFieldDefinition { TKey = "PartRetail", FieldKey = "PartRetail", Hideable = false }); - l.Add(new AyaFormFieldDefinition { TKey = "PartTrackSerialNumber", FieldKey = "PartTrackSerialNumber", Hideable = false }); l.Add(new AyaFormFieldDefinition { TKey = "PartManufacturerID", FieldKey = "PartManufacturerID" }); l.Add(new AyaFormFieldDefinition { TKey = "PartManufacturerNumber", FieldKey = "PartManufacturerNumber" }); diff --git a/server/AyaNova/models/Part.cs b/server/AyaNova/models/Part.cs index bb07aefa..e815d8a0 100644 --- a/server/AyaNova/models/Part.cs +++ b/server/AyaNova/models/Part.cs @@ -37,15 +37,13 @@ namespace AyaNova.Models public decimal Retail { get; set; } public string UnitOfMeasure { get; set; } public string UPC { get; set; } - [Required] - public bool TrackSerialNumber { get; set; } + public Part() { Tags = new List(); Active = true; - TrackSerialNumber = false; Cost = 0m; Retail = 0m; } diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs index 06fe2ba8..93701ffb 100644 --- a/server/AyaNova/util/AySchema.cs +++ b/server/AyaNova/util/AySchema.cs @@ -22,7 +22,7 @@ namespace AyaNova.Util //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!! private const int DESIRED_SCHEMA_LEVEL = 15; - internal const long EXPECTED_COLUMN_COUNT = 667; + internal const long EXPECTED_COLUMN_COUNT = 666; internal const long EXPECTED_INDEX_COUNT = 115; //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!! @@ -662,7 +662,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE"); "notes text, wiki text, customfields text, tags varchar(255) ARRAY, " + "partnumber text not null unique, manufacturerid bigint REFERENCES avendor, manufacturernumber text, " + "wholesalerid bigint REFERENCES avendor, wholesalernumber text, alternativewholesalerid bigint REFERENCES avendor, alternativewholesalernumber text, " + - "cost decimal(19,4) not null, retail decimal(19,4) not null, unitofmeasure text, upc text, trackserialnumber bool not null " + + "cost decimal(19,4) not null, retail decimal(19,4) not null, unitofmeasure text, upc text " + " )"); //PARTASSEMBLY diff --git a/server/AyaNova/util/Seeder.cs b/server/AyaNova/util/Seeder.cs index dcb8b5ac..9ed1f068 100644 --- a/server/AyaNova/util/Seeder.cs +++ b/server/AyaNova/util/Seeder.cs @@ -1522,7 +1522,7 @@ namespace AyaNova.Util o.Retail = o.Cost * 1.2m; o.UnitOfMeasure = "each"; - o.TrackSerialNumber = false; + //This seems wrong to do in a loop but is 4 times faster this way ?!? using (AyContext ct = ServiceProviderProvider.DBContext)