diff --git a/src/pages/10_invoice/TableInvoice.vue b/src/pages/10_invoice/TableInvoice.vue
index 901533ca..9fe591dd 100644
--- a/src/pages/10_invoice/TableInvoice.vue
+++ b/src/pages/10_invoice/TableInvoice.vue
@@ -83,11 +83,16 @@ defineEmits<{
           <!-- NOTE: custom column will starts with # -->
           <template v-if="!col.name.startsWith('#')">
             <span>
-              {{
-                typeof col.field === 'string'
-                  ? props.row[col.field as keyof Invoice]
-                  : col.field(props.row)
-              }}
+              <template v-if="typeof col.field === 'function'">
+                {{
+                  typeof col.field(props.row) === 'object'
+                    ? col.field(props.row)[$i18n.locale]
+                    : col.field(props.row)
+                }}
+              </template>
+              <template v-else>
+                {{ props.row[col.field as keyof Invoice] }}
+              </template>
             </span>
           </template>
           <template v-if="col.name === '#order'">
diff --git a/src/pages/10_invoice/constants.ts b/src/pages/10_invoice/constants.ts
index f7d350d7..139ea76b 100644
--- a/src/pages/10_invoice/constants.ts
+++ b/src/pages/10_invoice/constants.ts
@@ -29,7 +29,16 @@ export const columns = [
     name: 'customer',
     align: 'center',
     label: 'general.customer',
-    field: (v: Invoice) => v.quotation.customerBranch.registerName,
+    field: (v: Invoice) =>
+      v.quotation.customerBranch.customer.customerType === 'CORP'
+        ? {
+            tha: v.quotation.customerBranch.registerName,
+            eng: v.quotation.customerBranch.registerNameEN,
+          }
+        : {
+            tha: `${v.quotation.customerBranch.firstName || ''} ${v.quotation.customerBranch.lastName || ''}`,
+            eng: `${v.quotation.customerBranch.firstNameEN || ''} ${v.quotation.customerBranch.lastNameEN || ''}`,
+          },
   },
 
   {