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

fix merge conflict.

Browse Source
This commit is contained in:
a.bouhuolia
2021-02-21 19:43:21 +02:00
parent 947e5ad33d
commit 1e3b8df702
8 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/components/DrawersContainer.js
View File

@@ -1,8 +1,8 @@
import React from 'react'; import React from 'react';
import EstimateDrawer from 'containers/Sales/Estimate/EstimateDrawer'; import EstimateDrawer from 'containers/Sales/Estimates/EstimateDetails/EstimateDrawer';
import InvoiceDrawer from 'containers/Sales/Invoice/InvoiceDrawer'; import InvoiceDrawer from 'containers/Sales/Invoices/InvoiceDetails/InvoiceDrawer';
import ReceiptDrawer from 'containers/Sales/Receipt/ReceiptDrawer'; import ReceiptDrawer from 'containers/Sales/Receipts/ReceiptDetails/ReceiptDrawer';
import PaymentReceive from 'containers/Sales/PaymentReceive/PaymentReceiveDrawer'; import PaymentReceive from 'containers/Sales/PaymentReceives/PaymentDetails/PaymentDrawer';
export default function DrawersContainer() { export default function DrawersContainer() {
return ( return (

0
client/src/containers/Sales/Estimates/EstimateForm/EstimateDrawer.js → client/src/containers/Sales/Estimates/EstimateDetails/EstimateDrawer.js
View File

0
client/src/containers/Sales/Invoices/InvoiceForm/InvoiceDrawer.js → client/src/containers/Sales/Invoices/InvoiceDetails/InvoiceDrawer.js
View File

0
client/src/containers/Sales/PaymentReceive/PaymentReceiveDrawer.js → client/src/containers/Sales/PaymentReceives/PaymentDetails/PaymentDrawer.js
View File

0
client/src/containers/Sales/Receipts/ReceiptForm/ReceiptDrawer.js → client/src/containers/Sales/Receipts/ReceiptDetails/ReceiptDrawer.js
View File

2
client/src/containers/Subscriptions/BillingPlansForm.js
View File

@@ -5,7 +5,7 @@ import 'style/pages/Subscription/BillingPlans.scss';
import BillingPlansInput from 'containers/Subscriptions/BillingPlansInput'; import BillingPlansInput from 'containers/Subscriptions/BillingPlansInput';
import BillingPeriodsInput from 'containers/Subscriptions/BillingPeriodsInput'; import BillingPeriodsInput from 'containers/Subscriptions/BillingPeriodsInput';
import BillingPaymentMethod from 'containers/Subscriptions/BillingPaymentmethod'; import BillingPaymentMethod from 'containers/Subscriptions/BillingPaymentMethod';
/** /**
* Billing plans form. * Billing plans form.

19
client/src/routes/dashboard.js
View File

@@ -59,7 +59,7 @@ export default [
), ),
breadcrumb: 'Manual Journals', breadcrumb: 'Manual Journals',
hotkey: 'shift+m', hotkey: 'shift+m',
pageTitle: formatMessage({ id: 'manual_journals' }) pageTitle: formatMessage({ id: 'manual_journals' }),
}, },
{ {
path: `/items/categories`, path: `/items/categories`,
@@ -112,7 +112,7 @@ export default [
hotkey: 'shift+4', hotkey: 'shift+4',
pageTitle: formatMessage({ id: 'general_ledger' }), pageTitle: formatMessage({ id: 'general_ledger' }),
backLink: true, backLink: true,
sidebarShrink: true sidebarShrink: true,
}, },
{ {
path: `/financial-reports/balance-sheet`, path: `/financial-reports/balance-sheet`,
@@ -155,14 +155,13 @@ export default [
backLink: true, backLink: true,
sidebarShrink: true, sidebarShrink: true,
}, },
{ // {
path: '/financial-reports/payable-aging-summary', // path: '/financial-reports/payable-aging-summary',
component: LazyLoader({ // component: lazy(() =>
loader: () => // import('containers/FinancialStatements/APAgingSummary/APAgingSummary'),
import('containers/FinancialStatements/APAgingSummary/APAgingSummary'), // ),
}), // breadcrumb: 'Payable Aging Summary',
breadcrumb: 'Payable Aging Summary', // },
},
{ {
path: `/financial-reports/journal-sheet`, path: `/financial-reports/journal-sheet`,
component: lazy(() => component: lazy(() =>

2
client/src/store/financialStatement/financialStatements.reducer.js
View File

@@ -197,7 +197,7 @@ export default createReducer(initialState, {
columns, columns,
vendors, vendors,
total, total,
tableRows: APAgingSummaryTableRowsMapper({ vendors, columns, total }), // tableRows: APAgingSummaryTableRowsMapper({ vendors, columns, total }),
}; };
state.payableAgingSummary.sheet = receivableSheet; state.payableAgingSummary.sheet = receivableSheet;
}, },