QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-17 21:30:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2020-11-24 12:48:27 +02:00
parent a6bc88f83d 70f4b656d8
commit 209f917a17
25 changed files with 192 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/containers/Sales/Estimate/EstimateForm.js
View File

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

2
client/src/containers/Sales/Estimate/EstimatesDataTable.js
View File

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