Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ahmed Bouhuolia
2020-11-29 00:17:05 +02:00
39 changed files with 1410 additions and 680 deletions

View File

@@ -17,6 +17,11 @@ import MakeJournalEntriesField from './MakeJournalEntriesField';
import MakeJournalNumberWatcher from './MakeJournalNumberWatcher';
import MakeJournalFormFooter from './MakeJournalFormFooter';
import {
CreateMakeJournalFormSchema,
EditMakeJournalFormSchema,
} from './MakeJournalEntriesForm.schema';
import withJournalsActions from 'containers/Accounting/withJournalsActions';
import withManualJournalDetail from 'containers/Accounting/withManualJournalDetail';
import withAccountsActions from 'containers/Accounts/withAccountsActions';
@@ -83,8 +88,8 @@ function MakeJournalEntriesForm({
onFormSubmit,
onCancelForm,
}) {
const isNewMode = !manualJournalId;
const { formatMessage } = useIntl();
const isNewMode = manualJournalId;
const journalNumber = isNewMode
? `${journalNumberPrefix}-${journalNextNumber}`