diff --git a/server/src/models/Bill.js b/server/src/models/Bill.js index 5520aadec..c7bbfa032 100644 --- a/server/src/models/Bill.js +++ b/server/src/models/Bill.js @@ -109,6 +109,54 @@ export default class Bill extends TenantModel { column: 'created_at', columnType: 'date', }, + vendor: { + label: 'Vendor', + column: 'vendor_id', + relation: 'contacts.id', + relationColumn: 'contacts.display_name', + }, + bill_number: { + label: 'Bill number', + column: 'bill_number', + columnType: 'string', + fieldType: 'text', + }, + bill_date: { + label: 'Bill date', + column: 'bill_date', + columnType: 'date', + fieldType: 'date', + }, + due_date: { + label: 'Due date', + column: 'due_date', + }, + reference_no: { + label: 'Reference No.', + column: 'reference_no', + columnType: 'string', + fieldType: 'text', + }, + status: { + label: 'Status', + column: 'status', + }, + amount: { + label: 'Amount', + column: 'amount', + columnType: 'number', + fieldType: 'number', + }, + payment_amount: { + label: 'Payment amount', + column: 'payment_amount', + columnType: 'number', + fieldType: 'number', + }, + note: { + label: 'Note', + column: 'note', + }, } } } diff --git a/server/src/models/BillPayment.js b/server/src/models/BillPayment.js index 8dd198718..11638bfbd 100644 --- a/server/src/models/BillPayment.js +++ b/server/src/models/BillPayment.js @@ -74,7 +74,6 @@ export default class BillPayment extends TenantModel { }; } - static get fields() { return { created_at: { @@ -82,6 +81,53 @@ export default class BillPayment extends TenantModel { column: 'created_at', columnType: 'date', }, + vendor: { + lable: "Vendor name", + column: 'vendor_id', + relation: 'contacts.id', + relationColumn: 'contacts.display_name', + }, + amount: { + label: "Amount", + column: "amount", + columnType: 'number', + fieldType: 'number', + }, + payment_account: { + label: "Payment account", + column: "payment_account_id", + relation: "accounts", + relationColumn: "accounts.name", + + fieldType: 'options', + optionsResource: 'Account', + optionsKey: 'id', + optionsLabel: 'name', + }, + payment_number: { + label: "Payment number", + column: "payment_number", + columnType: 'string', + fieldType: 'text', + }, + payment_date: { + label: "Payment date", + column: "payment_date", + columnType: 'date', + fieldType: 'date', + }, + reference: { + label: "Reference No.", + column: "reference", + columnType: 'string', + fieldType: 'text', + }, + description: { + label: "Description", + column: "description", + columnType: 'string', + fieldType: 'text', + } } } }