Merge branch 'BIG-316-crud-branches' into feature/multi-dimensions

src/components/DialogsContainer.js

@@ -35,6 +35,7 @@ import UnlockingPartialTransactionsDialog from '../containers/Dialogs/UnlockingP
 import CreditNotePdfPreviewDialog from '../containers/Dialogs/CreditNotePdfPreviewDialog';
 import PaymentReceivePdfPreviewDialog from '../containers/Dialogs/PaymentReceivePdfPreviewDialog';
 import WarehouseFormDialog from '../containers/Dialogs/WarehouseFormDialog';
+import BranchFormDialog from '../containers/Dialogs/BranchFormDialog';
 
 /**
  * Dialogs container.
@@ -80,6 +81,7 @@ export default function DialogsContainer() {
       <CreditNotePdfPreviewDialog dialogName={'credit-note-pdf-preview'} />
       <PaymentReceivePdfPreviewDialog dialogName={'payment-pdf-preview'} />
       <WarehouseFormDialog dialogName={'warehouse-form'} />
+      <BranchFormDialog dialogName={'branch-form'} />
     </div>
   );
 }

src/components/Preferences/PreferencesTopbar.js

@@ -7,6 +7,7 @@ import DashboardTopbarUser from 'components/Dashboard/TopbarUser';
 import UsersActions from 'containers/Preferences/Users/UsersActions';
 import CurrenciesActions from 'containers/Preferences/Currencies/CurrenciesActions';
 import WarehousesActions from '../../containers/Preferences/Warehouses/WarehousesActions'
+import BranchesActions from '../../containers/Preferences/Branches/BranchesActions';
 import withDashboard from 'containers/Dashboard/withDashboard';
 
 import { compose } from 'utils';
@@ -41,6 +42,11 @@ function PreferencesTopbar({ preferencesPageTitle }) {
               path={'/preferences/warehouses'}
               component={WarehousesActions}
             />
+            <Route
+              exact
+              path={'/preferences/branches'}
+              component={BranchesActions}
+            />
           </Switch>
         </Route>
       </div>