fix: Add the missing columns to the payment received and made models

This commit is contained in:
Ahmed Bouhuolia
2024-09-01 15:00:51 +02:00
parent 7c07d6b5ff
commit 7f5ffb8da1
9 changed files with 79 additions and 3 deletions

View File

@@ -5,6 +5,8 @@ export default {
sortField: 'bill_date',
},
exportable: true,
exportFlattenOn: 'entries',
importable: true,
importAggregator: 'group',
importAggregateOn: 'entries',
@@ -77,7 +79,7 @@ export default {
paymentDate: {
name: 'bill_payment.field.payment_date',
type: 'date',
accessor: 'formattedPaymentDate'
accessor: 'formattedPaymentDate',
},
paymentNumber: {
name: 'bill_payment.field.payment_number',
@@ -111,6 +113,34 @@ export default {
name: 'bill_payment.field.reference',
type: 'text',
},
entries: {
name: 'Entries',
accessor: 'entries',
type: 'collection',
collectionOf: 'object',
columns: {
date: {
name: 'Bill date',
accessor: 'bill.formattedBillDate',
},
billNo: {
name: 'Bill No.',
accessor: 'bill.billNo',
},
billRefNo: {
name: 'Bill Reference No.',
accessor: 'bill.referenceNo',
},
billAmount: {
name: 'Bill Amount',
accessor: 'bill.totalFormatted',
},
paidAmount: {
name: 'Paid Amount',
accessor: 'paymentAmountFormatted',
},
},
},
},
fields2: {
vendorId: {

View File

@@ -1,6 +1,9 @@
export default {
importable: true,
exportable: true,
exportFlattenOn: 'entries',
importAggregator: 'group',
importAggregateOn: 'entries',
importAggregateBy: 'paymentReceiveNo',
@@ -72,7 +75,7 @@ export default {
amount: {
name: 'payment_receive.field.amount',
type: 'number',
accessor: 'formattedAmount'
accessor: 'formattedAmount',
},
referenceNo: {
name: 'payment_receive.field.reference_no',
@@ -92,6 +95,34 @@ export default {
type: 'text',
printable: false,
},
entries: {
name: 'Entries',
accessor: 'entries',
type: 'collection',
collectionOf: 'object',
columns: {
date: {
name: 'Invoice date',
accessor: 'invoice.invoiceDateFormatted',
},
invoiceNo: {
name: 'Invoice No.',
accessor: 'invoice.invoiceNo',
},
invoiceRefNo: {
name: 'Invoice Reference No.',
accessor: 'invoice.referenceNo',
},
invoiceAmount: {
name: 'Invoice Amount',
accessor: 'invoice.totalFormatted',
},
paidAmount: {
name: 'Paid Amount',
accessor: 'paymentAmountFormatted',
},
},
},
created_at: {
name: 'payment_receive.field.created_at',
type: 'date',

View File

@@ -13,7 +13,7 @@ export default {
importAggregateBy: 'estimateNumber',
print: {
pageTitle: 'Sale Estimates'
pageTitle: 'Sale Estimates',
},
fields: {
@@ -142,6 +142,7 @@ export default {
delivered: {
name: 'Delivered',
type: 'boolean',
accessor: 'isDelivered',
exportable: true,
printable: false,
},

View File

@@ -155,6 +155,7 @@ export default {
name: 'invoice.field.delivered',
type: 'boolean',
printable: false,
accessor: 'isDelivered',
},
entries: {
name: 'Entries',