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,9 @@
import React, { useState, useCallback, useEffect } from 'react';
import { useQuery } from 'react-query';
import {compose} from 'utils';
import moment from 'moment';
import { useIntl } from 'react-intl';
import { compose } from 'utils';
import JournalTable from './JournalTable';
import JournalHeader from './JournalHeader';
@@ -15,6 +16,7 @@ import withDashboard from 'containers/Dashboard/withDashboard';
import withJournalActions from './withJournalActions';
function Journal({
// #withJournalActions
requestFetchJournalSheet,
@@ -30,10 +32,11 @@ function Journal({
to_date: moment().endOf('year').format('YYYY-MM-DD'),
basis: 'accural'
});
const { formatMessage } = useIntl();
const [refetch, setRefetch] = useState(false);
useEffect(() => {
changePageTitle('Journal Sheet');
changePageTitle(formatMessage({id:'journal_sheet'}));
}, []);
const fetchHook = useQuery(['journal', filter],