diff --git a/models/baseModels/JournalEntry/JournalEntry.ts b/models/baseModels/JournalEntry/JournalEntry.ts index 7a9e16d1..d53f8c57 100644 --- a/models/baseModels/JournalEntry/JournalEntry.ts +++ b/models/baseModels/JournalEntry/JournalEntry.ts @@ -49,7 +49,7 @@ export class JournalEntry extends Transactional { return { formRoute: (name) => `/edit/JournalEntry/${name}`, columns: [ - 'date', + 'name', { label: t`Status`, fieldtype: 'Select', @@ -72,14 +72,7 @@ export class JournalEntry extends Transactional { }; }, }, - { - label: t`Entry ID`, - fieldtype: 'Data', - fieldname: 'name', - getValue(doc) { - return doc.name as string; - }, - }, + 'date', 'entryType', 'referenceNumber', ], diff --git a/models/baseModels/Payment/Payment.ts b/models/baseModels/Payment/Payment.ts index 9232f163..2bceac5d 100644 --- a/models/baseModels/Payment/Payment.ts +++ b/models/baseModels/Payment/Payment.ts @@ -442,7 +442,7 @@ export class Payment extends Transactional { static getListViewSettings(fyo: Fyo): ListViewSettings { return { columns: [ - 'party', + 'name', { label: t`Status`, fieldname: 'status', @@ -465,7 +465,7 @@ export class Payment extends Transactional { }; }, }, - 'paymentType', + 'party', 'date', 'amount', ], diff --git a/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts b/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts index b1d586d4..df76ebd6 100644 --- a/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts +++ b/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts @@ -36,9 +36,9 @@ export class PurchaseInvoice extends Invoice { return { formRoute: (name) => `/edit/PurchaseInvoice/${name}`, columns: [ - 'party', 'name', getTransactionStatusColumn(), + 'party', 'date', 'grandTotal', 'outstandingAmount', diff --git a/models/baseModels/SalesInvoice/SalesInvoice.ts b/models/baseModels/SalesInvoice/SalesInvoice.ts index 180e48cc..c5b27317 100644 --- a/models/baseModels/SalesInvoice/SalesInvoice.ts +++ b/models/baseModels/SalesInvoice/SalesInvoice.ts @@ -35,9 +35,9 @@ export class SalesInvoice extends Invoice { return { formRoute: (name) => `/edit/SalesInvoice/${name}`, columns: [ - 'party', 'name', getTransactionStatusColumn(), + 'party', 'date', 'grandTotal', 'outstandingAmount', diff --git a/src/pages/ListView/List.vue b/src/pages/ListView/List.vue index d17baf94..f48f2ae5 100644 --- a/src/pages/ListView/List.vue +++ b/src/pages/ListView/List.vue @@ -1,10 +1,10 @@