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,8 +1,7 @@
import React, {useEffect, useMemo, useCallback, useState} from 'react';
import React, { useEffect, useMemo, useCallback, useState } from 'react';
import {compose} from 'utils';
import { compose } from 'utils';
import { useQuery } from 'react-query';
import { useIntl } from 'react-intl';
import moment from 'moment';
import BalanceSheetHeader from './BalanceSheetHeader';
@@ -17,6 +16,8 @@ import withSettings from 'containers/Settings/withSettings';
import withBalanceSheetActions from './withBalanceSheetActions';
import withBalanceSheetDetail from './withBalanceSheetDetail';
import { FormattedMessage as T, useIntl } from 'react-intl';
function BalanceSheet({
// #withDashboard
@@ -24,14 +25,14 @@ function BalanceSheet({
// #withBalanceSheetActions
fetchBalanceSheet,
// #withBalanceSheetDetail
balanceSheetLoading,
// #withPreferences
organizationSettings
}) {
const intl = useIntl();
const { formatMessage } = useIntl();
const [filter, setFilter] = useState({
from_date: moment().startOf('year').format('YYYY-MM-DD'),
to_date: moment().endOf('year').format('YYYY-MM-DD'),
@@ -52,7 +53,7 @@ function BalanceSheet({
}, []);
useEffect(() => {
changePageTitle('Balance Sheet');
changePageTitle(formatMessage({ id: 'balance_sheet' }));
}, []);
// Handle re-fetch balance sheet after filter change.