Merge branch 'master' of https://github.com/abouolia/Ratteb

# Conflicts:
#	client/src/style/App.scss

client/src/containers/FinancialStatements/BalanceSheet/BalanceSheetActionsBar.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState } from 'react';
 import {
   NavbarGroup,
   Button,
@@ -13,6 +13,7 @@ import classNames from 'classnames';
 
 import Icon from 'components/Icon';
 import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
+import NumberFormats from 'components/NumberFormats';
 
 import { compose } from 'utils';
 import withBalanceSheetDetail from './withBalanceSheetDetail';
@@ -72,6 +73,18 @@ function BalanceSheetActionsBar({
             icon={<Icon icon="filter-16" iconSize={16} />}
           />
         </Popover>
+        <Popover
+          content={<NumberFormats />}
+          minimal={true}
+          interactionKind={PopoverInteractionKind.CLICK}
+          position={Position.BOTTOM_LEFT}
+        >
+          <Button
+            className={classNames(Classes.MINIMAL, 'button--filter')}
+            text={<T id={'format'} />}
+            icon={<Icon icon="filter-16" iconSize={16} />}
+          />
+        </Popover>
 
         <NavbarDivider />
 

client/src/containers/FinancialStatements/FinancialAccountsFilter.js

@@ -54,7 +54,7 @@ export default function FinancialAccountsFilter({ ...restProps }) {
                 filterable={false}
                 selectedItem={value}
                 selectedItemProp={'key'}
-                labelProp={'name'}
+                textProp={'name'}
                 onItemSelect={(item) => {
                   setFieldValue('accountsFilter', item.key);
                 }}

client/src/containers/FinancialStatements/SelectDisplayColumnsBy.js

@@ -27,7 +27,7 @@ export default function SelectsListColumnsBy(props) {
                 filterable={false}
                 selectedItem={value}
                 selectedItemProp={'key'}
-                labelProp={'name'}
+                textProp={'name'}
                 onItemSelect={(item) => {
                   form.setFieldValue('displayColumnsType', item.key);
                 }}