diff --git a/src/components/FMultiSelect/BranchesMultiSelect.js b/src/components/FMultiSelect/BranchesMultiSelect.js index 60110e399..34b92e8b6 100644 --- a/src/components/FMultiSelect/BranchesMultiSelect.js +++ b/src/components/FMultiSelect/BranchesMultiSelect.js @@ -50,17 +50,11 @@ const branchItemRenderer = ( const branchSelectProps = { itemPredicate: branchItemPredicate, itemRenderer: branchItemRenderer, - valueAccessor: 'id', - labelAccessor: 'name', - tagRenderer: 'name', + valueAccessor: (item) => item.id, + labelAccessor: (item) => item.label, + tagRenderer: (item) => item.name, }; export function BranchesMultiSelect({ branches, ...rest }) { - return ( - - ); + return ; } diff --git a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.js b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.js index f92c7917f..addc26e63 100644 --- a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.js +++ b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.js @@ -41,7 +41,6 @@ function BalanceSheetHeader({ ...pageFilter, fromDate: moment(pageFilter.fromDate).toDate(), toDate: moment(pageFilter.toDate).toDate(), - branches_id: [], }, defaultValues, ); @@ -89,7 +88,7 @@ function BalanceSheetHeader({ /> } + title={'dimensions'} panel={} /> diff --git a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderDimensionsPanel.js b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderDimensionsPanel.js index 32bb0d96c..5c162f62e 100644 --- a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderDimensionsPanel.js +++ b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderDimensionsPanel.js @@ -14,10 +14,8 @@ function BalanceSheetHeaderDimensionsPanel() { return (
@@ -25,7 +23,3 @@ function BalanceSheetHeaderDimensionsPanel() { } export default BalanceSheetHeaderDimensionsPanel; - -function BranchMulitSelectButton() { - return