From cd565942868828bc57842a21e656ccb05218d176 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 26 Jul 2021 18:53:21 +0000 Subject: [PATCH] --- .vscode/launch.json | 2 +- server/AyaNova/DataList/QuoteDataList.cs | 4 ++-- server/AyaNova/biz/FormFieldReference.cs | 2 +- server/AyaNova/resource/de.json | 1 + server/AyaNova/resource/es.json | 1 + server/AyaNova/resource/fr.json | 3 ++- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index b77f3b95..fcc80a75 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": "false", + "AYANOVA_SERVER_TEST_MODE": "true", "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/DataList/QuoteDataList.cs b/server/AyaNova/DataList/QuoteDataList.cs index 067c9d98..c53afa7b 100644 --- a/server/AyaNova/DataList/QuoteDataList.cs +++ b/server/AyaNova/DataList/QuoteDataList.cs @@ -55,8 +55,8 @@ namespace AyaNova.DataList FieldDefinitions.Add(new DataListFieldDefinition { - TKey = "QuoteStatus", - FieldKey = "QuoteStatus", + TKey = "QuoteQuoteStatusType", + FieldKey = "QuoteQuoteStatusType", UiFieldDataType = (int)UiFieldDataType.Text, AType = (int)AyaType.QuoteStatus, SqlIdColumnName = "aquote.laststatusid", diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs index 0b462368..d9100d67 100644 --- a/server/AyaNova/biz/FormFieldReference.cs +++ b/server/AyaNova/biz/FormFieldReference.cs @@ -1114,7 +1114,7 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "WorkOrderSummary", FieldKey = "WorkOrderSummary" }); - l.Add(new FormField { TKey = "QuoteStatus", FieldKey = "QuoteStatus" }); + l.Add(new FormField { TKey = "QuoteQuoteStatusType", FieldKey = "QuoteQuoteStatusType" }); l.Add(new FormField { TKey = "Address", FieldKey = "Address" }); //l.Add(new FormField { TKey = "WorkOrderCloseByDate", FieldKey = "WorkOrderCloseByDate" }); l.Add(new FormField { TKey = "Project", FieldKey = "Project" }); diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index 6da1512e..d9fbc586 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -2208,6 +2208,7 @@ "NextPMNumber": "Nächste vorbeugende Wartung", "WorkOrderErrorLocked": "Der Arbeitsauftrag ist derzeit gesperrt und kann nicht geändert werden", "WorkOrderSerialNumber": "Nummer", + "QuoteSerialNumber": "Nummer", "Sequence": "Reihenfolge", "SoftDelete": "Zum Löschen markieren", "SoftDeleteAll": "* alle * zum Löschen markieren", diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index b7d3f789..71ecb82a 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -2208,6 +2208,7 @@ "NextPMNumber": "Siguiente mantenimiento preventivo", "WorkOrderErrorLocked": "La orden de trabajo está actualmente configurada en un estado bloqueado y no se puede cambiar", "WorkOrderSerialNumber": "Número", + "QuoteSerialNumber": "Número", "Sequence": "Secuencia", "SoftDelete": "Marcar para borrar", "SoftDeleteAll": "Marcar * todo * para borrar", diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index 5f8e69db..a39f84bf 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -2207,7 +2207,8 @@ "NextWorkorderNumber": "Bon de travail suivant", "NextPMNumber": "Prochaine maintenance préventive", "WorkOrderErrorLocked": "Le bon de travail est actuellement défini sur un statut verrouillé et ne peut pas être modifié", - "WorkOrderSerialNumber": "Numéro", + "WorkOrderSerialNumber": "Numéro", + "QuoteSerialNumber": "Numéro", "Sequence": "Séquence", "SoftDelete": "Marquer pour suppression", "SoftDeleteAll": "Marquer * tout * pour suppression",