Merge remote-tracking branch 'origin/feature/breadcrumb/fix_localize'

This commit is contained in:
Ahmed Bouhuolia
2020-05-20 07:06:15 +02:00
78 changed files with 833 additions and 538 deletions

View File

@@ -1,12 +1,10 @@
import React, {useState, useCallback, useMemo} from 'react';
import React, { useCallback } from 'react';
import * as Yup from 'yup';
import {Row, Col} from 'react-grid-system';
import {
Button,
} from "@blueprintjs/core";
import moment from 'moment';
import {useIntl} from 'react-intl';
import { Row, Col } from 'react-grid-system';
import { FormattedMessage as T, useIntl } from 'react-intl';
import { useFormik } from 'formik';
import { Button } from "@blueprintjs/core";
import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader';
import FinancialStatementDateRange from 'containers/FinancialStatements/FinancialStatementDateRange';
@@ -16,7 +14,7 @@ export default function TrialBalanceSheetHeader({
pageFilter,
onSubmitFilter,
}) {
const intl = useIntl();
const { formatMessage } = useIntl();
const formik = useFormik({
enableReinitialize: true,
initialValues: {
@@ -25,8 +23,8 @@ export default function TrialBalanceSheetHeader({
to_date: moment(pageFilter.to_date).toDate()
},
validationSchema: Yup.object().shape({
from_date: Yup.date().required(),
to_date: Yup.date().min(Yup.ref('from_date')).required(),
from_date: Yup.date().required().label(formatMessage({id:'from_date'})),
to_date: Yup.date().min(Yup.ref('from_date')).required().label(formatMessage({id:'to_date'})),
}),
onSubmit: (values, { setSubmitting }) => {
onSubmitFilter(values);
@@ -49,7 +47,7 @@ export default function TrialBalanceSheetHeader({
onClick={handleSubmitClick}
disabled={formik.isSubmitting}
className={'button--submit-filter'}>
{ 'Run Report' }
<T id={'run_report'} />
</Button>
</Col>
</Row>