diff --git a/framework/data/CommonL10nData.xml b/framework/data/CommonL10nData.xml
index 103585b01..1c5b32dda 100644
--- a/framework/data/CommonL10nData.xml
+++ b/framework/data/CommonL10nData.xml
@@ -17,61 +17,73 @@ along with this software (see the LICENSE.md file). If not, see
     <moqui.basic.LocalizedMessage original="Add" locale="fr" localized="Ajouter"/>
     <moqui.basic.LocalizedMessage original="Add" locale="it" localized="Aggiungi"/>
     <moqui.basic.LocalizedMessage original="Add" locale="zh" localized="新建"/>
+    <moqui.basic.LocalizedMessage original="Add" locale="vn" localized="Thêm"/>
 
     <moqui.basic.LocalizedMessage original="Create" locale="es" localized="Crear"/>
     <moqui.basic.LocalizedMessage original="Create" locale="fr" localized="Créer"/>
     <moqui.basic.LocalizedMessage original="Create" locale="it" localized="Creare"/>
     <moqui.basic.LocalizedMessage original="Create" locale="zh" localized="新建"/>
+    <moqui.basic.LocalizedMessage original="Create" locale="vn" localized="Tạo mới"/>
 
     <moqui.basic.LocalizedMessage original="Delete" locale="es" localized="Eliminar"/>
     <moqui.basic.LocalizedMessage original="Delete" locale="fr" localized="Supprimer"/>
     <moqui.basic.LocalizedMessage original="Delete" locale="it" localized="Cancella"/>
     <moqui.basic.LocalizedMessage original="Delete" locale="zh" localized="删除"/>
+    <moqui.basic.LocalizedMessage original="Delete" locale="vn" localized="Xóa"/>
 
     <moqui.basic.LocalizedMessage original="Description" locale="es" localized="Descripción"/>
     <moqui.basic.LocalizedMessage original="Description" locale="fr" localized="Description"/>
     <moqui.basic.LocalizedMessage original="Description" locale="it" localized="Descrizione"/>
     <moqui.basic.LocalizedMessage original="Description" locale="zh" localized="描述"/>
+    <moqui.basic.LocalizedMessage original="Description" locale="vn" localized="Diễn giải"/>
 
     <moqui.basic.LocalizedMessage original="Find" locale="es" localized="Buscar"/>
     <moqui.basic.LocalizedMessage original="Find" locale="fr" localized="Rechercher"/>
     <moqui.basic.LocalizedMessage original="Find" locale="it" localized="Ricerca"/>
     <moqui.basic.LocalizedMessage original="Find" locale="zh" localized="查找"/>
+    <moqui.basic.LocalizedMessage original="Find" locale="vn" localized="Tìm"/>
 
     <moqui.basic.LocalizedMessage original="Name" locale="es" localized="Nombre"/>
     <moqui.basic.LocalizedMessage original="Name" locale="fr" localized="Nom"/>
     <moqui.basic.LocalizedMessage original="Name" locale="it" localized="Nome"/>
     <moqui.basic.LocalizedMessage original="Name" locale="zh" localized="名称"/>
+    <moqui.basic.LocalizedMessage original="Name" locale="vn" localized="Tên"/>
 
     <moqui.basic.LocalizedMessage original="Status" locale="es" localized="Estado"/>
     <moqui.basic.LocalizedMessage original="Status" locale="fr" localized="Statut"/>
     <moqui.basic.LocalizedMessage original="Status" locale="it" localized="Stato"/>
     <moqui.basic.LocalizedMessage original="Status" locale="zh" localized="状态"/>
+    <moqui.basic.LocalizedMessage original="Status" locale="vn" localized="Trạng thái"/>
 
     <moqui.basic.LocalizedMessage original="Type" locale="es" localized="Tipo"/>
     <moqui.basic.LocalizedMessage original="Type" locale="fr" localized="Type"/>
     <moqui.basic.LocalizedMessage original="Type" locale="it" localized="Tipo"/>
     <moqui.basic.LocalizedMessage original="Type" locale="zh" localized="类型"/>
+    <moqui.basic.LocalizedMessage original="Type" locale="vn" localized="Loại"/>
 
     <moqui.basic.LocalizedMessage original="Update" locale="es" localized="Actualizar"/>
     <moqui.basic.LocalizedMessage original="Update" locale="fr" localized="Màj"/>
     <moqui.basic.LocalizedMessage original="Update" locale="it" localized="Aggiorna"/>
     <moqui.basic.LocalizedMessage original="Update" locale="zh" localized="更新"/>
+    <moqui.basic.LocalizedMessage original="Update" locale="vn" localized="Cập nhật"/>
 
     <moqui.basic.LocalizedEntityField entityName="moqui.basic.Enumeration" fieldName="description" pkValue="GEOT_CITY" locale="es" localized="Ciudad"/>
     <moqui.basic.LocalizedEntityField entityName="moqui.basic.Enumeration" fieldName="description" pkValue="GEOT_CITY" locale="fr" localized="Ville"/>
     <moqui.basic.LocalizedEntityField entityName="moqui.basic.Enumeration" fieldName="description" pkValue="GEOT_CITY" locale="it" localized="Città"/>
     <moqui.basic.LocalizedEntityField entityName="moqui.basic.Enumeration" fieldName="description" pkValue="GEOT_CITY" locale="zh" localized="市"/>
+    <moqui.basic.LocalizedEntityField entityName="moqui.basic.Enumeration" fieldName="description" pkValue="GEOT_CITY" locale="vn" localized="Tỉnh/TP"/>
 
     <moqui.basic.LocalizedEntityField entityName="moqui.basic.Enumeration" fieldName="description" pkValue="GEOT_STATE" locale="es" localized="Estado"/>
     <moqui.basic.LocalizedEntityField entityName="moqui.basic.Enumeration" fieldName="description" pkValue="GEOT_STATE" locale="fr" localized="Etat"/>
     <moqui.basic.LocalizedEntityField entityName="moqui.basic.Enumeration" fieldName="description" pkValue="GEOT_STATE" locale="it" localized="Stato"/>
     <moqui.basic.LocalizedEntityField entityName="moqui.basic.Enumeration" fieldName="description" pkValue="GEOT_STATE" locale="zh" localized="州"/>
+    <moqui.basic.LocalizedEntityField entityName="moqui.basic.Enumeration" fieldName="description" pkValue="GEOT_STATE" locale="vn" localized="Quận/huyện"/>
 
     <moqui.basic.LocalizedEntityField entityName="moqui.basic.Enumeration" fieldName="description" pkValue="GEOT_COUNTRY" locale="es" localized="País"/>
     <moqui.basic.LocalizedEntityField entityName="moqui.basic.Enumeration" fieldName="description" pkValue="GEOT_COUNTRY" locale="fr" localized="Pays"/>
     <moqui.basic.LocalizedEntityField entityName="moqui.basic.Enumeration" fieldName="description" pkValue="GEOT_COUNTRY" locale="it" localized="Paese"/>
     <moqui.basic.LocalizedEntityField entityName="moqui.basic.Enumeration" fieldName="description" pkValue="GEOT_COUNTRY" locale="zh" localized="国家"/>
+    <moqui.basic.LocalizedEntityField entityName="moqui.basic.Enumeration" fieldName="description" pkValue="GEOT_COUNTRY" locale="vn" localized="Quốc gia"/>
 
     <!-- Message templates for formatting common sets of entity fields (generally for a view-entity) -->
     <moqui.basic.LocalizedMessage locale="default" original="EnumerationNameTemplate" localized="${description}"/>
diff --git a/framework/data/CurrencyData.xml b/framework/data/CurrencyData.xml
index 8c9f92c26..57cc29303 100644
--- a/framework/data/CurrencyData.xml
+++ b/framework/data/CurrencyData.xml
@@ -174,7 +174,7 @@ along with this software (see the LICENSE.md file). If not, see
     <moqui.basic.Uom abbreviation="UYP" description="Uruguayan New Peso" uomId="UYP" uomTypeEnumId="UT_CURRENCY_MEASURE"/>
     <moqui.basic.Uom abbreviation="UYU" description="Uruguay" uomId="UYU" uomTypeEnumId="UT_CURRENCY_MEASURE"/>
     <moqui.basic.Uom abbreviation="VEB" description="Venezuelan Bolivar" uomId="VEB" uomTypeEnumId="UT_CURRENCY_MEASURE"/>
-    <moqui.basic.Uom abbreviation="VND" description="Vietnamese Dong" uomId="VND" uomTypeEnumId="UT_CURRENCY_MEASURE"/>
+    <moqui.basic.Uom abbreviation="VND" description="Viet Nam Dong" uomId="VND" uomTypeEnumId="UT_CURRENCY_MEASURE"/>
     <moqui.basic.Uom abbreviation="VUV" description="Vanuatu Vatu" uomId="VUV" uomTypeEnumId="UT_CURRENCY_MEASURE"/>
     <moqui.basic.Uom abbreviation="WST" description="Samoan Tala" uomId="WST" uomTypeEnumId="UT_CURRENCY_MEASURE"/>
     <moqui.basic.Uom abbreviation="XAF" description="Gabon C.f.A Franc" uomId="XAF" uomTypeEnumId="UT_CURRENCY_MEASURE"/>