QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-17 21:30:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2020-05-20 07:06:15 +02:00
parent 741c78c5d0 67a23ce452
commit fa558a047c
78 changed files with 833 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/containers/Accounting/MakeJournalEntriesForm.js
View File

@@ -63,8 +63,8 @@ function MakeJournalEntriesForm({
}, [changePageTitle, changePageSubtitle, manualJournal]);
const validationSchema = Yup.object().shape({
journal_number: Yup.string().required(),
date: Yup.date().required(),
journal_number: Yup.string().required().label(formatMessage({id:'journal_number_'})),
date: Yup.date().required().label(formatMessage({id:'date'})),
reference: Yup.string(),
description: Yup.string(),
entries: Yup.array().of(
@@ -147,7 +147,7 @@ function MakeJournalEntriesForm({
// Validate the total credit should be eqials total debit.
if (totalCredit !== totalDebit) {
AppToaster.show({
message: 'credit_and_debit_not_equal',
message: formatMessage({id:'credit_and_debit_not_equal'}),
});
setSubmitting(false);
return;

4
client/src/containers/Accounting/MakeJournalEntriesPage.js
View File

@@ -26,11 +26,11 @@ function MakeJournalEntriesPage({
const handleFormSubmit = useCallback((payload) => {
payload.redirect &&
history.push('/dashboard/accounting/manual-journals');
history.push('/manual-journals');
}, [history]);
const handleCancel = useCallback(() => {
history.push('/dashboard/accounting/manual-journals');
history.push('/manual-journals');
}, [history]);
return (

2
client/src/containers/Accounting/ManualJournalActionsBar.js
View File

@@ -54,7 +54,7 @@ function ManualJournalActionsBar({
});
const onClickNewManualJournal = useCallback(() => {
history.push('/dashboard/accounting/make-journal-entry');
history.push('/make-journal-entry');
}, [history]);
const filterDropdown = FilterDropdown({

6
client/src/containers/Accounting/ManualJournalsList.js
View File

@@ -122,7 +122,7 @@ function ManualJournalsTable({
const handleEditJournal = useCallback(
(journal) => {
history.push(`/dashboard/accounting/manual-journals/${journal.id}/edit`);
history.push(`/manual-journals/${journal.id}/edit`);
},
[history]
);
@@ -182,8 +182,8 @@ function ManualJournalsTable({
<Route
exact={true}
path={[
'/dashboard/accounting/manual-journals/:custom_view_id/custom_view',
'/dashboard/accounting/manual-journals',
'/manual-journals/:custom_view_id/custom_view',
'/manual-journals',
]}>
<ManualJournalsViewTabs />

4
client/src/containers/Accounting/ManualJournalsViewTabs.js
View File

@@ -41,7 +41,7 @@ function ManualJournalsViewTabs({
const handleClickNewView = () => {
setTopbarEditView(null);
history.push('/dashboard/custom_views/manual_journals/new');
history.push('/custom_views/manual_journals/new');
};
const handleViewLinkClick = () => {
setTopbarEditView(customViewId);
@@ -63,7 +63,7 @@ function ManualJournalsViewTabs({
}, [customViewId]);
const tabs = manualJournalsViews.map((view) => {
const baseUrl = '/dashboard/accounting/manual-journals';
const baseUrl = '/manual-journals';
const link = (
<Link
to={`${baseUrl}/${view.id}/custom_view`}