This commit is contained in:
@@ -117,6 +117,9 @@ namespace AyaNova.Api.Controllers
|
|||||||
DefaultTaxPartSaleId = AyaNova.Util.ServerGlobalBizSettings.TaxPartSaleId,
|
DefaultTaxPartSaleId = AyaNova.Util.ServerGlobalBizSettings.TaxPartSaleId,
|
||||||
DefaultTaxPartPurchaseId = AyaNova.Util.ServerGlobalBizSettings.TaxPartPurchaseId,
|
DefaultTaxPartPurchaseId = AyaNova.Util.ServerGlobalBizSettings.TaxPartPurchaseId,
|
||||||
DefaultTaxRateSaleId = AyaNova.Util.ServerGlobalBizSettings.TaxRateSaleId,
|
DefaultTaxRateSaleId = AyaNova.Util.ServerGlobalBizSettings.TaxRateSaleId,
|
||||||
|
WorkOrderTravelDefaultMinutes = AyaNova.Util.ServerGlobalBizSettings.WorkOrderTravelDefaultMinutes,
|
||||||
|
WorkLaborScheduleDefaultMinutes = AyaNova.Util.ServerGlobalBizSettings.WorkLaborScheduleDefaultMinutes,
|
||||||
|
|
||||||
//used to drive UI in case of unlicensed or attention required
|
//used to drive UI in case of unlicensed or attention required
|
||||||
LicenseStatus = AyaNova.Core.License.ActiveKey.Status,
|
LicenseStatus = AyaNova.Core.License.ActiveKey.Status,
|
||||||
MaintenanceExpired = AyaNova.Core.License.ActiveKey.MaintenanceExpired,
|
MaintenanceExpired = AyaNova.Core.License.ActiveKey.MaintenanceExpired,
|
||||||
|
|||||||
@@ -29,6 +29,13 @@ namespace AyaNova.Models
|
|||||||
public long? TaxPartSaleId { get; set; }
|
public long? TaxPartSaleId { get; set; }
|
||||||
public long? TaxRateSaleId { get; set; }
|
public long? TaxRateSaleId { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
//DEFAULT WO MINUTES
|
||||||
|
[Required]
|
||||||
|
public int WorkLaborScheduleDefaultMinutes {get;set;}
|
||||||
|
[Required]
|
||||||
|
public int WorkOrderTravelDefaultMinutes {get;set;}
|
||||||
|
|
||||||
[Required]
|
[Required]
|
||||||
public TimeSpan WorkOrderCompleteByAge { get; set; } = TimeSpan.Zero;//was workorderclosebyage
|
public TimeSpan WorkOrderCompleteByAge { get; set; } = TimeSpan.Zero;//was workorderclosebyage
|
||||||
|
|
||||||
|
|||||||
@@ -253,7 +253,9 @@ namespace AyaNova.Util
|
|||||||
await ExecQueryAsync("CREATE TABLE aglobalbizsettings (id INTEGER NOT NULL PRIMARY KEY, "
|
await ExecQueryAsync("CREATE TABLE aglobalbizsettings (id INTEGER NOT NULL PRIMARY KEY, "
|
||||||
+ "searchcasesensitiveonly BOOL DEFAULT FALSE, "
|
+ "searchcasesensitiveonly BOOL DEFAULT FALSE, "
|
||||||
+ "useinventory BOOL DEFAULT TRUE, "
|
+ "useinventory BOOL DEFAULT TRUE, "
|
||||||
+ "workordercompletebyage INTERVAL NOT NULL DEFAULT '00:00:00'"
|
+ "workordercompletebyage INTERVAL NOT NULL DEFAULT '00:00:00', "
|
||||||
|
+ "workordertraveldefaultminutes INTEGER NOT NULL DEFAULT 0, "
|
||||||
|
+ "worklaborscheduledefaultminutes INTEGER NOT NULL DEFAULT 0 "
|
||||||
+ ")");
|
+ ")");
|
||||||
|
|
||||||
//create global ops BACKUP settings table
|
//create global ops BACKUP settings table
|
||||||
@@ -512,7 +514,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
|
|||||||
|
|
||||||
//Global tax code defaults
|
//Global tax code defaults
|
||||||
await ExecQueryAsync("ALTER TABLE aglobalbizsettings ADD column taxpartpurchaseid BIGINT REFERENCES ataxcode, "
|
await ExecQueryAsync("ALTER TABLE aglobalbizsettings ADD column taxpartpurchaseid BIGINT REFERENCES ataxcode, "
|
||||||
+"ADD column taxpartsaleid BIGINT REFERENCES ataxcode, ADD column taxratesaleid BIGINT REFERENCES ataxcode");
|
+ "ADD column taxpartsaleid BIGINT REFERENCES ataxcode, ADD column taxratesaleid BIGINT REFERENCES ataxcode");
|
||||||
|
|
||||||
//MEMO
|
//MEMO
|
||||||
await ExecQueryAsync("CREATE TABLE amemo (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, name TEXT NOT NULL, "
|
await ExecQueryAsync("CREATE TABLE amemo (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, name TEXT NOT NULL, "
|
||||||
|
|||||||
@@ -20,7 +20,8 @@ namespace AyaNova.Util
|
|||||||
internal static long? TaxPartSaleId { get; set; }
|
internal static long? TaxPartSaleId { get; set; }
|
||||||
internal static long? TaxRateSaleId { get; set; }
|
internal static long? TaxRateSaleId { get; set; }
|
||||||
internal static TimeSpan WorkOrderCompleteByAge { get; set; }
|
internal static TimeSpan WorkOrderCompleteByAge { get; set; }
|
||||||
|
internal static int WorkLaborScheduleDefaultMinutes { get; set; }
|
||||||
|
internal static int WorkOrderTravelDefaultMinutes { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Populate and / or create the settings
|
/// Populate and / or create the settings
|
||||||
@@ -46,7 +47,10 @@ namespace AyaNova.Util
|
|||||||
TaxPartPurchaseId = global.TaxPartPurchaseId;
|
TaxPartPurchaseId = global.TaxPartPurchaseId;
|
||||||
TaxPartSaleId = global.TaxPartSaleId;
|
TaxPartSaleId = global.TaxPartSaleId;
|
||||||
TaxRateSaleId = global.TaxRateSaleId;
|
TaxRateSaleId = global.TaxRateSaleId;
|
||||||
WorkOrderCompleteByAge=global.WorkOrderCompleteByAge;
|
WorkOrderCompleteByAge = global.WorkOrderCompleteByAge;
|
||||||
|
WorkLaborScheduleDefaultMinutes = global.WorkLaborScheduleDefaultMinutes;
|
||||||
|
WorkOrderTravelDefaultMinutes = global.WorkOrderTravelDefaultMinutes;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user