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

Merge branch 'develop' into feature/multi-dimensions

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2022-03-23 12:12:20 +02:00
committed by GitHub
parent 8dac7e3d98 c7673f57cd
commit 4882afd63f
60 changed files with 449 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/containers/FinancialStatements/InventoryValuation/InventoryValuationHeader.js
View File

@@ -1,9 +1,11 @@
import React from 'react';
import * as Yup from 'yup';
import moment from 'moment';
import { FormattedMessage as T } from 'components';
import { Formik, Form } from 'formik';
import { Tabs, Tab, Button, Intent } from '@blueprintjs/core';
import styled from 'styled-components';
import { FormattedMessage as T } from 'components';
import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader';
import InventoryValuationHeaderGeneralPanel from './InventoryValuationHeaderGeneralPanel';
@@ -68,7 +70,7 @@ function InventoryValuationHeader({
};
return (
<FinancialStatementHeader
<InventoryValuationDrawerHeader
isOpen={isFilterDrawerOpen}
drawerProps={{ onClose: handleDrawerClose }}
>
@@ -100,7 +102,7 @@ function InventoryValuationHeader({
</div>
</Form>
</Formik>
</FinancialStatementHeader>
</InventoryValuationDrawerHeader>
);
}
@@ -110,3 +112,9 @@ export default compose(
})),
withInventoryValuationActions,
)(InventoryValuationHeader);
const InventoryValuationDrawerHeader = styled(FinancialStatementHeader)`
.bp3-drawer {
max-height: 450px;
}
`;

4
src/containers/FinancialStatements/InventoryValuation/InventoryValuationTable.js
View File

@@ -2,7 +2,7 @@ import React from 'react';
import intl from 'react-intl-universal';
import styled from 'styled-components';
import { DataTable, FinancialSheet } from 'components';
import { ReportDataTable, FinancialSheet } from 'components';
import { useInventoryValuationContext } from './InventoryValuationProvider';
import { useInventoryValuationTableColumns } from './components';
@@ -54,7 +54,7 @@ const InventoryValuationSheet = styled(FinancialSheet)`
min-width: 850px;
`;
const InventoryValuationDataTable = styled(DataTable)`
const InventoryValuationDataTable = styled(ReportDataTable)`
.table {
.tbody {
.tr .td {