diff --git a/.vscode/launch.json b/.vscode/launch.json index 8fd97968..0e2049e9 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -53,7 +53,7 @@ "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", - "AYANOVA_SERVER_TEST_MODE": "true", + "AYANOVA_SERVER_TEST_MODE": "false", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\" diff --git a/server/AyaNova/biz/ContractBiz.cs b/server/AyaNova/biz/ContractBiz.cs index 38f5d61d..6f22e1d7 100644 --- a/server/AyaNova/biz/ContractBiz.cs +++ b/server/AyaNova/biz/ContractBiz.cs @@ -98,7 +98,14 @@ namespace AyaNova.Biz // internal async Task GetAsync(long id, bool logTheGetEvent = true) { - var ret = await ct.Contract.AsNoTracking().SingleOrDefaultAsync(m => m.Id == id); + var ret = await ct.Contract + .Include(z => z.ContractPartOverrideItems) + .Include(z => z.ContractServiceRateOverrideItems) + .Include(z => z.ContractTravelRateOverrideItems) + .Include(z => z.ServiceRateItems) + .Include(z => z.TravelRateItems) + .AsNoTracking() + .SingleOrDefaultAsync(m => m.Id == id); if (logTheGetEvent && ret != null) await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, BizType, AyaEvent.Retrieved), ct); return ret; diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index 50f8a8ae..7238ae28 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -197,6 +197,7 @@ "ContractDefaultAdjustments": "Standardpreisanpassungen", "ContractTaggedAdjustments": "Verschlagwortet mit Preisanpassungen", "ContractDefaultResponseTime": "Reaktionszeit", + "ContractAdjustment":"Preisanpassung", "ContractOverrideType": "Preisanpassungsart", "ContractOverrideTypePriceDiscount": "Preis minus Prozentsatz", "ContractOverrideTypeMarkup": "Kosten plus Prozentsatz", diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index 5e21c8ed..7fc4801a 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -197,6 +197,7 @@ "ContractDefaultAdjustments": "Default price adjustments", "ContractTaggedAdjustments": "Tagged price adjustments", "ContractDefaultResponseTime": "Response time", + "ContractAdjustment":"Adjustment", "ContractOverrideType": "Price adjustment type", "ContractOverrideTypePriceDiscount": "Price minus percentage", "ContractOverrideTypeMarkup": "Cost plus percentage", diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index af47d272..16e765fd 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -197,6 +197,7 @@ "ContractDefaultAdjustments": "Ajustes de precio predeterminados", "ContractTaggedAdjustments": "Ajustes de precio etiquetados", "ContractDefaultResponseTime": "Tiempo de respuesta", + "ContractAdjustment":"Ajuste de precio", "ContractOverrideType": "Tipo de ajuste de precio", "ContractOverrideTypePriceDiscount": "Precio menos porcentaje", "ContractOverrideTypeMarkup": "Costo más porcentaje", diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index 71ecae71..f9582a2e 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -197,6 +197,7 @@ "ContractDefaultAdjustments": "Ajustements de prix par défaut", "ContractTaggedAdjustments": "Ajustements de prix balisés", "ContractDefaultResponseTime": "Temps de réponse", + "ContractAdjustment":"Ajustement de prix", "ContractOverrideType": "Type d'ajustement de prix", "ContractOverrideTypePriceDiscount": "Prix moins pourcentage", "ContractOverrideTypeMarkup": "Coût plus pourcentage",