Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ahmed Bouhuolia
2020-11-24 12:48:27 +02:00
25 changed files with 192 additions and 117 deletions

View File

@@ -42,10 +42,10 @@ const MIN_LINES_NUMBER = 4;
const defaultInvoice = {
index: 0,
item_id: null,
rate: null,
item_id: '',
rate: '',
discount: 0,
quantity: null,
quantity: '',
description: '',
};

View File

@@ -112,7 +112,7 @@ function InvoicesDataTable({
{
id: 'invoice_no',
Header: formatMessage({ id: 'invoice_no__' }),
accessor: (row) => `#${row.invoice_no}`,
accessor: (row) => (row.invoice_no ? `#${row.invoice_no}` : null),
width: 140,
className: 'invoice_no',
},