fix merge conflict.

client/src/components/DrawersContainer.js

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

client/src/containers/Subscriptions/BillingPlansForm.js

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

client/src/routes/dashboard.js

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

client/src/store/financialStatement/financialStatements.reducer.js

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