QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-17 05:10: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-07 14:31:13 +02:00
parent acd74fd044 703b730fd3
commit c080155fe0
8 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/containers/Purchases/Bill/BillForm.js
View File

@@ -120,7 +120,7 @@ function BillForm({
then: Yup.number().required(),
}),
total: Yup.number().nullable(),
discount: Yup.number().nullable(),
discount: Yup.number().nullable().min(0).max(100),
description: Yup.string().nullable(),
}),
),
@@ -210,7 +210,6 @@ function BillForm({
};
const formik = useFormik({
// enableReinitialize: true,
validationSchema,
initialValues: {
...initialValues,

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

@@ -129,7 +129,7 @@ const EstimateForm = ({
is: (quantity, rate) => quantity || rate,
then: Yup.number().required(),
}),
discount: Yup.number().nullable(),
discount: Yup.number().nullable().min(0).max(100),
description: Yup.string().nullable(),
}),
),

2
client/src/containers/Sales/Invoice/InvoiceForm.js
View File

@@ -127,7 +127,7 @@ function InvoiceForm({
is: (quantity, rate) => quantity || rate,
then: Yup.number().required(),
}),
discount: Yup.number().nullable(),
discount: Yup.number().nullable().min(0).max(100),
description: Yup.string().nullable(),
}),
),

4
client/src/containers/Sales/Receipt/ReceiptForm.js
View File

@@ -129,7 +129,7 @@ function ReceiptForm({
is: (quantity, rate) => quantity || rate,
then: Yup.number().required(),
}),
discount: Yup.number().nullable(),
discount: Yup.number().nullable().min(0).max(100),
description: Yup.string().nullable(),
}),
),
@@ -383,9 +383,9 @@ function ReceiptForm({
export default compose(
withReceiptActions,
withReceiptDetail(),
withDashboardActions,
withMediaActions,
withReceiptDetail(),
withSettings(({ receiptSettings }) => ({
receiptNextNumber: receiptSettings?.nextNumber,
receiptNumberPrefix: receiptSettings?.numberPrefix,

14
client/src/containers/Sales/Receipt/ReceiptsDataTable.js
View File

@@ -152,13 +152,13 @@ function ReceiptsDataTable({
width: 140,
className: 'deposit_account',
},
{
id: 'send_to_email',
Header: formatMessage({ id: 'email' }),
accessor: 'send_to_email',
width: 140,
className: 'send_to_email',
},
// {
// id: 'send_to_email',
// Header: formatMessage({ id: 'email' }),
// accessor: 'send_to_email',
// width: 140,
// className: 'send_to_email',
// },
{
id: 'amount',
Header: formatMessage({ id: 'amount' }),