server/AyaNova/DataList/ServiceRateDataList.cs

@@ -56,8 +56,8 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new AyaDataListFieldDefinition
             {
-                TKey = "Notes",
+                TKey = "ServiceRateNotes",
-                FieldKey = "Notes",
+                FieldKey = "ServiceRateNotes",
                 UiFieldDataType = (int)UiFieldDataType.Text,
                 SqlValueColumnName = "aservicerate.notes"
             });

server/AyaNova/DataList/TravelRateDataList.cs

@@ -56,8 +56,8 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new AyaDataListFieldDefinition
             {
-                TKey = "Notes",
+                TKey = "TravelRateNotes",
-                FieldKey = "Notes",
+                FieldKey = "TravelRateNotes",
                 UiFieldDataType = (int)UiFieldDataType.Text,
                 SqlValueColumnName = "atravelrate.notes"
             });

server/AyaNova/biz/AyaFormFieldDefinitions.cs

@@ -542,7 +542,7 @@ namespace AyaNova.Biz
 
                     List<AyaFormFieldDefinition> l = new List<AyaFormFieldDefinition>();
                     l.Add(new AyaFormFieldDefinition { TKey = "Name", FieldKey = "Name", Hideable = false });
-                    l.Add(new AyaFormFieldDefinition { TKey = "Notes", FieldKey = "Notes" });
+                    l.Add(new AyaFormFieldDefinition { TKey = "ServiceRateNotes", FieldKey = "ServiceRateNotes" });
                     l.Add(new AyaFormFieldDefinition { TKey = "Active", FieldKey = "Active", Hideable = false });
                     l.Add(new AyaFormFieldDefinition { TKey = "Tags", FieldKey = "Tags" });
                     l.Add(new AyaFormFieldDefinition { TKey = "Wiki", FieldKey = "Wiki" });
@@ -579,7 +579,7 @@ namespace AyaNova.Biz
 
                     List<AyaFormFieldDefinition> l = new List<AyaFormFieldDefinition>();
                     l.Add(new AyaFormFieldDefinition { TKey = "Name", FieldKey = "Name", Hideable = false });
-                    l.Add(new AyaFormFieldDefinition { TKey = "Notes", FieldKey = "Notes" });
+                    l.Add(new AyaFormFieldDefinition { TKey = "TravelRateNotes", FieldKey = "TravelRateNotes" });
                     l.Add(new AyaFormFieldDefinition { TKey = "Active", FieldKey = "Active", Hideable = false });
                     l.Add(new AyaFormFieldDefinition { TKey = "Tags", FieldKey = "Tags" });
                     l.Add(new AyaFormFieldDefinition { TKey = "Wiki", FieldKey = "Wiki" });

server/AyaNova/resource/de.json

@@ -1764,7 +1764,7 @@
   "PMItem": "PMItem",
   "PMItemList": "PMItems",
   "PMItemName": "Name",
-  "PMItemNotes": "Notes",
+  "PMItemNotes": "Notizen",
   "PMItemCustom1": "Angepasstes Feld 1",
   "PMItemCustom2": "Angepasstes Feld 2",
   "PMItemCustom3": "Angepasstes Feld 3",
@@ -1784,7 +1784,7 @@
   "PMTemplateItem": "PMTemplateItem",
   "PMTemplateItemList": "PMTemplateItems",
   "PMTemplateItemName": "Name",
-  "PMTemplateItemNotes": "Notes",
+  "PMTemplateItemNotes": "Notizen",
   "PMTemplateItemCustom1": "Angepasstes Feld 1",
   "PMTemplateItemCustom2": "Angepasstes Feld 2",
   "PMTemplateItemCustom3": "Angepasstes Feld 3",
@@ -1804,7 +1804,7 @@
   "QuoteItem": "QuoteItem",
   "QuoteItemList": "QuoteItems",
   "QuoteItemName": "Name",
-  "QuoteItemNotes": "Notes",
+  "QuoteItemNotes": "Notizen",
   "QuoteItemCustom1": "Angepasstes Feld 1",
   "QuoteItemCustom2": "Angepasstes Feld 2",
   "QuoteItemCustom3": "Angepasstes Feld 3",
@@ -1824,7 +1824,7 @@
   "QuoteTemplateItem": "QuoteTemplateItem",
   "QuoteTemplateItemList": "QuoteTemplateItems",
   "QuoteTemplateItemName": "Name",
-  "QuoteTemplateItemNotes": "Notes",
+  "QuoteTemplateItemNotes": "Notizen",
   "QuoteTemplateItemCustom1": "Angepasstes Feld 1",
   "QuoteTemplateItemCustom2": "Angepasstes Feld 2",
   "QuoteTemplateItemCustom3": "Angepasstes Feld 3",
@@ -1844,7 +1844,7 @@
   "WorkOrderTemplateItem": "WorkOrderTemplateItem",
   "WorkOrderTemplateItemList": "WorkOrderTemplateItems",
   "WorkOrderTemplateItemName": "Name",
-  "WorkOrderTemplateItemNotes": "Notes",
+  "WorkOrderTemplateItemNotes": "Notizen",
   "WorkOrderTemplateItemCustom1": "Angepasstes Feld 1",
   "WorkOrderTemplateItemCustom2": "Angepasstes Feld 2",
   "WorkOrderTemplateItemCustom3": "Angepasstes Feld 3",
@@ -2030,6 +2030,8 @@
   "TravelRate": "Reiserate",
   "ServiceRateList": "Serviceraten",
   "TravelRateList": "Reiseratenliste",
+  "ServiceRateNotes": "Notizen",
+  "TravelRateNotes": "Notizen",
   "ServiceRateCustom1": "Angepasstes Feld 1",
   "ServiceRateCustom2": "Angepasstes Feld 2",
   "ServiceRateCustom3": "Angepasstes Feld 3",

server/AyaNova/resource/en.json

@@ -2030,6 +2030,8 @@
   "TravelRate": "Travel rate",
   "ServiceRateList": "Service rates",
   "TravelRateList": "Travel rates",
+  "ServiceRateNotes": "Notes",
+  "TravelRateNotes": "Notes",
   "ServiceRateCustom1": "Custom1",
   "ServiceRateCustom2": "Custom2",
   "ServiceRateCustom3": "Custom3",

server/AyaNova/resource/es.json

@@ -1764,7 +1764,7 @@
   "PMItem": "PMItem",
   "PMItemList": "PMItems",
   "PMItemName": "Name",
-  "PMItemNotes": "Notes",
+  "PMItemNotes": "Notas",
   "PMItemCustom1": "Campo personalizado 1",
   "PMItemCustom2": "Campo personalizado 2",
   "PMItemCustom3": "Campo personalizado 3",
@@ -1784,7 +1784,7 @@
   "PMTemplateItem": "PMTemplateItem",
   "PMTemplateItemList": "PMTemplateItems",
   "PMTemplateItemName": "Name",
-  "PMTemplateItemNotes": "Notes",
+  "PMTemplateItemNotes": "Notas",
   "PMTemplateItemCustom1": "Campo personalizado 1",
   "PMTemplateItemCustom2": "Campo personalizado 2",
   "PMTemplateItemCustom3": "Campo personalizado 3",
@@ -1804,7 +1804,7 @@
   "QuoteItem": "QuoteItem",
   "QuoteItemList": "QuoteItems",
   "QuoteItemName": "Name",
-  "QuoteItemNotes": "Notes",
+  "QuoteItemNotes": "Notas",
   "QuoteItemCustom1": "Campo personalizado 1",
   "QuoteItemCustom2": "Campo personalizado 2",
   "QuoteItemCustom3": "Campo personalizado 3",
@@ -1824,7 +1824,7 @@
   "QuoteTemplateItem": "QuoteTemplateItem",
   "QuoteTemplateItemList": "QuoteTemplateItems",
   "QuoteTemplateItemName": "Name",
-  "QuoteTemplateItemNotes": "Notes",
+  "QuoteTemplateItemNotes": "Notas",
   "QuoteTemplateItemCustom1": "Campo personalizado 1",
   "QuoteTemplateItemCustom2": "Campo personalizado 2",
   "QuoteTemplateItemCustom3": "Campo personalizado 3",
@@ -1844,7 +1844,7 @@
   "WorkOrderTemplateItem": "WorkOrderTemplateItem",
   "WorkOrderTemplateItemList": "WorkOrderTemplateItems",
   "WorkOrderTemplateItemName": "Name",
-  "WorkOrderTemplateItemNotes": "Notes",
+  "WorkOrderTemplateItemNotes": "Notas",
   "WorkOrderTemplateItemCustom1": "Campo personalizado 1",
   "WorkOrderTemplateItemCustom2": "Campo personalizado 2",
   "WorkOrderTemplateItemCustom3": "Campo personalizado 3",
@@ -2030,6 +2030,8 @@
   "TravelRate": "Tasa de viaje",
   "ServiceRateList": "Tasas laborales",
   "TravelRateList": "Tarifas de viaje",
+  "ServiceRateNotes": "Notas",
+  "TravelRateNotes": "Notas",
   "ServiceRateCustom1": "Campo personalizado 1",
   "ServiceRateCustom2": "Campo personalizado 2",
   "ServiceRateCustom3": "Campo personalizado 3",

server/AyaNova/resource/fr.json

@@ -73,7 +73,7 @@
   "CustomerNoteTypeId": "Type de note client",
   "CustomerNoteList": "Notes de client",
   "CustomerNoteNoteDate": "Date de note",
-  "CustomerNoteNotes": "Notes",
+  "CustomerNoteNotes": "Remarques",
   "CustomerNoteTypeList": "Types de note client",
   "CustomerNoteTypeName": "Nom de type de note de client",
   "CustomerRequestItemId": "Élément de demande de service client",
@@ -175,7 +175,7 @@
   "ContractDiscountParts": "Remise appliquée à toutes les pièces",
   "ContractList": "Contrats",
   "ContractName": "Nom de contrat",
-  "ContractNotes": "Notes",
+  "ContractNotes": "Remarques",
   "ContractRateList": "Tarifs de contrat",
   "ContractRatesRateID": "Tarifs",
   "CoordinateTypesDecimalDegrees": "Degrés décimaux (DDD,ddd°)",
@@ -331,7 +331,7 @@
   "HeadOfficeEmail": "Email",
   "HeadOfficeList": "Sièges sociaux",
   "HeadOfficeName": "Nom de siège social",
-  "HeadOfficeNotes": "Notes",
+  "HeadOfficeNotes": "Remarques",
   "HeadOfficePhone1": "Business",
   "HeadOfficePhone2": "Fax",
   "HeadOfficePhone3": "Home",
@@ -359,7 +359,7 @@
   "LoanUnitCustom16": "Champ personnalisé 16",
   "LoanUnitList": "Éléments de prêt",
   "LoanUnitName": "Nom",
-  "LoanUnitNotes": "Notes",
+  "LoanUnitNotes": "Remarques",
   "LoanUnitRateDay": "Day rate",
   "LoanUnitRateHalfDay": "Half day rate",
   "LoanUnitRateHour": "Hour rate",
@@ -569,7 +569,7 @@
   "PartManufacturerID": "Fabricant",
   "PartManufacturerNumber": "Numéro de fabricant",
   "PartName": "Nom de pièce",
-  "PartNotes": "Notes",
+  "PartNotes": "Remarques",
   "PartPartNumber": "Numéro de pièce",
   "PartRetail": "Détail",
   "PartTrackSerialNumber": "Numéro de série de suivi",
@@ -642,7 +642,7 @@
   "ProjectDateStarted": "Date de début",
   "ProjectList": "Projets",
   "ProjectName": "Nom de projet",
-  "ProjectNotes": "Notes",
+  "ProjectNotes": "Remarques",
   "ProjectProjectOverseerID": "Responsable de projet",
   "PurchaseOrderActualReceiveDate": "Date prévue",
   "PurchaseOrderCustom1": "Champ personnalisé 1",
@@ -664,7 +664,7 @@
   "PurchaseOrderDropShipToCustomerID": "Livraison directe au client",
   "PurchaseOrderLocked": "Le bon de commande est bloqué en raison de son état",
   "PurchaseOrderExpectedReceiveDate": "Réception prévue",
-  "PurchaseOrderNotes": "Notes",
+  "PurchaseOrderNotes": "Remarques",
   "PurchaseOrderOrderedDate": "Date de commande",
   "PurchaseOrderPONumber": "Numéro de bon de commande",
   "PurchaseOrderStatusClosedFullReceived": "Fermé - totalement réceptionné",
@@ -809,7 +809,7 @@
   "ReminderFollowUp": "Follow up",
   "ReminderList": "Rappels",
   "ReminderName": "Nom",
-  "ReminderNotes": "Notes",
+  "ReminderNotes": "Remarques",
   "ReminderRecurrence": "Répétition",
   "ReminderSourceType": "Pour",
   "ReminderSourceID": "Source",
@@ -876,7 +876,7 @@
   "TaxCodeDefault": "Erreur : impossible de supprimer ou de désactiver ce code de taxe s'il correspond à un réglage par défaut dans les Réglages généraux",
   "TaxCodeList": "Codes de taxe",
   "TaxCodeName": "Nom de code de taxe",
-  "TaxCodeNotes": "Notes",
+  "TaxCodeNotes": "Remarques",
   "TaxCodeTaxA": "Taxe “A”",
   "TaxCodeTaxAExempt": "Exemption de taxe “A”",
   "TaxCodeTaxAValue": "Valeur taxe A",
@@ -1139,7 +1139,7 @@
   "UnitLifeSpan": "Durée de vie",
   "UnitList": "Unités client",
   "UnitMetered": "Unité mesurée",
-  "UnitNotes": "Notes",
+  "UnitNotes": "Remarques",
   "UnitOverrideLength": "Ignorer la durée",
   "UnitOverrideLifeTime": "Ignorer la garantie à vie",
   "UnitOverrideWarranty": "Ignorer la garantie",
@@ -1188,7 +1188,7 @@
   "UnitModelList": "Modèles d'unité",
   "UnitModelModelNumber": "Numéro de modèle",
   "UnitModelName": "Nom de modèle d'unité",
-  "UnitModelNotes": "Notes",
+  "UnitModelNotes": "Remarques",
   "UnitModelUPC": "CUP",
   "UnitModelVendorID": "Unit model vendor",
   "UnitModelWarrantyLength": "Durée de garantie",
@@ -1241,7 +1241,7 @@
   "UserMemberOfGroup": "Groupe de sécurité",
   "UserMustBeActive": "This user must be active as it has open schedule items",
   "UserMustBeScheduleable": "This user must be a Scheduleable User type to preserve data history",
-  "UserNotes": "Notes",
+  "UserNotes": "Remarques",
   "UserPageAddress": "Adresse messageur",
   "UserPageMaxText": "Texte max. messageur",
   "UserPassword": "Mot de passe",
@@ -1295,7 +1295,7 @@
   "VendorEmail": "Email",
   "VendorList": "Fournisseurs",
   "VendorName": "Nom de fournisseur",
-  "VendorNotes": "Notes",
+  "VendorNotes": "Remarques",
   "VendorPhone1": "Business",
   "VendorPhone2": "Fax",
   "VendorPhone3": "Home",
@@ -1411,7 +1411,7 @@
   "WorkOrderItemLoanTaxBExempt": "Exemption de taxe B",
   "WorkOrderItemLoanTaxOnTax": "Taxe sur taxe",
   "WorkOrderItemLoanTaxRateSale": "Taxe",
-  "WorkOrderItemLoanNotes": "Notes",
+  "WorkOrderItemLoanNotes": "Remarques",
   "WorkOrderItemLoanOutDate": "Prêté",
   "WorkOrderItemLoanQuantity": "Rate quantity",
   "WorkOrderItemLoanRate": "Rate",
@@ -1440,7 +1440,7 @@
   "WorkOrderItemOutsideServiceDateSent": "Date d'envoi",
   "WorkOrderItemOutsideServiceEventUnitBackFromService": "Service extérieur d'élément de bon de travail - unité récupérée",
   "WorkOrderItemOutsideServiceEventUnitNotBackFromServiceByETA": "Service extérieur d'élément de bon de travail - unité en retard",
-  "WorkOrderItemOutsideServiceNotes": "Notes",
+  "WorkOrderItemOutsideServiceNotes": "Remarques",
   "WorkOrderItemOutsideServiceReceivedBack": "Récupéré",
   "WorkOrderItemOutsideServiceRepairCost": "Coût de réparation",
   "WorkOrderItemOutsideServiceRepairPrice": "Prix de réparation",
@@ -1496,7 +1496,7 @@
   "WorkOrderItemTravelDistance": "Distance",
   "WorkOrderItemTravelList": "Éléments de déplacement",
   "WorkOrderItemTravelNoChargeQuantity": "Quantité non facturée",
-  "WorkOrderItemTravelNotes": "Notes",
+  "WorkOrderItemTravelNotes": "Remarques",
   "WorkOrderItemTravelServiceRateID": "Tarif de déplacement",
   "WorkOrderItemTravelTaxCodeID": "Code de taxe",
   "WorkOrderItemTravelTaxRateSaleID": "Taxe sur les ventes",
@@ -1579,7 +1579,7 @@
   "WidgetCount": "Nombre",
   "WidgetStartDate": "Date de début",
   "WidgetEndDate": "Date de fin",
-  "WidgetNotes": "Notes",
+  "WidgetNotes": "Remarques",
   "WidgetCustom1": "Champ personnalisé 1",
   "WidgetCustom2": "Champ personnalisé 2",
   "WidgetCustom3": "Champ personnalisé 3",
@@ -1675,7 +1675,7 @@
   "ReviewList": "Liste d'évaluation",
   "ReviewOverDue": "Overdue",
   "ReviewName": "Nom",
-  "ReviewNotes": "Notes",
+  "ReviewNotes": "Remarques",
   "ReviewDueDate": "Date d'échéance",
   "ReviewCompletedDate": "Date de fin",
   "ReviewCompletionNotes": "Notes d'achèvement",
@@ -1755,7 +1755,7 @@
   "InsertImage": "Insérer une image",
   "ImageUrl": "URL d'image",
   "ImageDescription": "Description de l'image",
-  "AttachmentNotes": "Notes",
+  "AttachmentNotes": "Remarques",
   "AttachmentExists": "Le fichier existe",
   "AttachmentFileName": "Nom du fichier",
   "AttachFile": "Joindre fichier",
@@ -1764,7 +1764,7 @@
   "PMItem": "PMItem",
   "PMItemList": "PMItems",
   "PMItemName": "Name",
-  "PMItemNotes": "Notes",
+  "PMItemNotes": "Remarques",
   "PMItemCustom1": "Champ personnalisé 1",
   "PMItemCustom2": "Champ personnalisé 2",
   "PMItemCustom3": "Champ personnalisé 3",
@@ -1784,7 +1784,7 @@
   "PMTemplateItem": "PMTemplateItem",
   "PMTemplateItemList": "PMTemplateItems",
   "PMTemplateItemName": "Name",
-  "PMTemplateItemNotes": "Notes",
+  "PMTemplateItemNotes": "Remarques",
   "PMTemplateItemCustom1": "Champ personnalisé 1",
   "PMTemplateItemCustom2": "Champ personnalisé 2",
   "PMTemplateItemCustom3": "Champ personnalisé 3",
@@ -1804,7 +1804,7 @@
   "QuoteItem": "QuoteItem",
   "QuoteItemList": "QuoteItems",
   "QuoteItemName": "Name",
-  "QuoteItemNotes": "Notes",
+  "QuoteItemNotes": "Remarques",
   "QuoteItemCustom1": "Champ personnalisé 1",
   "QuoteItemCustom2": "Champ personnalisé 2",
   "QuoteItemCustom3": "Champ personnalisé 3",
@@ -1824,7 +1824,7 @@
   "QuoteTemplateItem": "QuoteTemplateItem",
   "QuoteTemplateItemList": "QuoteTemplateItems",
   "QuoteTemplateItemName": "Name",
-  "QuoteTemplateItemNotes": "Notes",
+  "QuoteTemplateItemNotes": "Remarques",
   "QuoteTemplateItemCustom1": "Champ personnalisé 1",
   "QuoteTemplateItemCustom2": "Champ personnalisé 2",
   "QuoteTemplateItemCustom3": "Champ personnalisé 3",
@@ -1844,7 +1844,7 @@
   "WorkOrderTemplateItem": "WorkOrderTemplateItem",
   "WorkOrderTemplateItemList": "WorkOrderTemplateItems",
   "WorkOrderTemplateItemName": "Name",
-  "WorkOrderTemplateItemNotes": "Notes",
+  "WorkOrderTemplateItemNotes": "Remarques",
   "WorkOrderTemplateItemCustom1": "Champ personnalisé 1",
   "WorkOrderTemplateItemCustom2": "Champ personnalisé 2",
   "WorkOrderTemplateItemCustom3": "Champ personnalisé 3",
@@ -2030,6 +2030,8 @@
   "TravelRate": "Tarif voyage",
   "ServiceRateList": "Tarifs de service",
   "TravelRateList": "Tarifs de voyage",
+  "ServiceRateNotes": "Remarques",
+  "TravelRateNotes": "Remarques",
   "ServiceRateCustom1": "Champ personnalisé 1",
   "ServiceRateCustom2": "Champ personnalisé 2",
   "ServiceRateCustom3": "Champ personnalisé 3",

server/AyaNova/util/Seeder.cs

@@ -240,7 +240,7 @@ namespace AyaNova.Util
 
                             //RATES
                             await SeedServiceRateAsync(log, 5);
-                            await SeedTravelRateAsync(log, 2);
+                            await SeedTravelRateAsync(log, 3);
 
 
                             //PERF
@@ -309,7 +309,7 @@ namespace AyaNova.Util
 
                             //RATES
                             await SeedServiceRateAsync(log, 10);
-                            await SeedTravelRateAsync(log, 4);
+                            await SeedTravelRateAsync(log, 5);
 
                             //PERF
                             watch.Stop();
@@ -1157,7 +1157,7 @@ namespace AyaNova.Util
         //
         public async Task SeedServiceRateAsync(ILogger log, int count)
         {
-
+           
             for (int x = 0; x < count; x++)
             {
                 ServiceRate o = new ServiceRate();
@@ -1173,7 +1173,7 @@ namespace AyaNova.Util
 
                 o.Cost = Fake.Random.Decimal(0.25m, 50);
                 o.Charge = o.Cost * 1.55m;
-
+                o.Unit = "hour";
 
 
                 //This seems wrong to do in a loop but is 4 times faster this way ?!?
@@ -1193,10 +1193,11 @@ namespace AyaNova.Util
         }
 
         //////////////////////////////////////////////////////
-        //SERVICERATE
+        //TRAVELRATE
         //
         public async Task SeedTravelRateAsync(ILogger log, int count)
         {
+            var Units = new[] { "km", "miles", "hours" };
 
             for (int x = 0; x < count; x++)
             {
@@ -1211,8 +1212,9 @@ namespace AyaNova.Util
                 o.Notes = Fake.Lorem.Sentence();
                 o.Tags = RandomTags();
 
-                o.Cost = Fake.Random.Decimal(0.25m, 50);
+                o.Cost = Fake.Random.Decimal(0.25m, 10);
-                o.Charge = o.Cost * 1.55m;
+                o.Charge = o.Cost * 2m;
+                o.Unit = Fake.PickRandom(Units);