diff --git a/models/doctype/Party/PartyList.js b/models/doctype/Party/PartyList.js
index f85a1a97..a6f48f6c 100644
--- a/models/doctype/Party/PartyList.js
+++ b/models/doctype/Party/PartyList.js
@@ -2,6 +2,5 @@ import { _ } from 'frappejs/utils';
 
 export default {
   doctype: 'Party',
-  title: filters => (filters.customer ? 'Customer' : 'Supplier'),
-  columns: ['name', 'defaultAccount', 'address']
+  columns: ['name', 'phone', 'outstandingAmount']
 };
diff --git a/models/doctype/PurchaseInvoice/PurchaseInvoice.js b/models/doctype/PurchaseInvoice/PurchaseInvoice.js
index ba81cd22..1e1821a2 100644
--- a/models/doctype/PurchaseInvoice/PurchaseInvoice.js
+++ b/models/doctype/PurchaseInvoice/PurchaseInvoice.js
@@ -13,6 +13,13 @@ module.exports = {
   settings: 'PurchaseInvoiceSettings',
   showTitle: true,
   fields: [
+    {
+      label: 'Bill No',
+      fieldname: 'name',
+      fieldtype: 'Data',
+      required: 1,
+      readOnly: 1
+    },
     {
       fieldname: 'date',
       label: 'Date',
diff --git a/models/doctype/PurchaseInvoice/PurchaseInvoiceList.js b/models/doctype/PurchaseInvoice/PurchaseInvoiceList.js
index d6ba799d..09d02f40 100644
--- a/models/doctype/PurchaseInvoice/PurchaseInvoiceList.js
+++ b/models/doctype/PurchaseInvoice/PurchaseInvoiceList.js
@@ -7,12 +7,12 @@ export default {
   formRoute: name => `/edit/PurchaseInvoice/${name}`,
   columns: [
     'supplier',
+    'name',
     {
       label: 'Status',
       fieldname: 'status',
       fieldtype: 'Select',
       size: 'small',
-      options: ['Status...', 'Paid', 'Pending'],
       render(doc) {
         let status = 'Pending';
         let color = 'orange';
diff --git a/models/doctype/SalesInvoice/SalesInvoice.js b/models/doctype/SalesInvoice/SalesInvoice.js
index e96c8110..5b8bf249 100644
--- a/models/doctype/SalesInvoice/SalesInvoice.js
+++ b/models/doctype/SalesInvoice/SalesInvoice.js
@@ -16,6 +16,13 @@ module.exports = {
   settings: 'SalesInvoiceSettings',
   showTitle: true,
   fields: [
+    {
+      label: 'Invoice No',
+      fieldname: 'name',
+      fieldtype: 'Data',
+      required: 1,
+      readOnly: 1
+    },
     {
       fieldname: 'date',
       label: 'Date',
diff --git a/models/doctype/SalesInvoice/SalesInvoiceList.js b/models/doctype/SalesInvoice/SalesInvoiceList.js
index 95530fcc..8f96d30d 100644
--- a/models/doctype/SalesInvoice/SalesInvoiceList.js
+++ b/models/doctype/SalesInvoice/SalesInvoiceList.js
@@ -7,14 +7,7 @@ export default {
   formRoute: name => `/edit/SalesInvoice/${name}`,
   columns: [
     'customer',
-    {
-      label: 'Invoice No',
-      fieldname: 'name',
-      fieldtype: 'Data',
-      getValue(doc) {
-        return doc.name;
-      }
-    },
+    'name',
     {
       label: 'Status',
       fieldname: 'status',