{
- setFieldValue('customersIds', contactsIds);
+ items={customers}
+ onItemSelect={(customers) => {
+ const customersIds = customers.map(
+ (customer) => customer.id,
+ );
+ setFieldValue('customersIds', customersIds);
}}
- contacts={customers}
- contactsSelected={value}
/>
)}
diff --git a/client/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerHeaderGeneralPane.js b/client/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerHeaderGeneralPane.js
index 2e76953f9..e48638aef 100644
--- a/client/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerHeaderGeneralPane.js
+++ b/client/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerHeaderGeneralPane.js
@@ -43,7 +43,7 @@ function GLHeaderGeneralPaneContent() {
label={}
className={classNames('form-group--select-list', Classes.FILL)}
>
-
+
diff --git a/client/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsHeaderGeneralPanel.js b/client/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsHeaderGeneralPanel.js
index 0b6d66b57..9df46cbb1 100644
--- a/client/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsHeaderGeneralPanel.js
+++ b/client/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsHeaderGeneralPanel.js
@@ -2,10 +2,18 @@ import React from 'react';
import classNames from 'classnames';
import { FormGroup, Classes } from '@blueprintjs/core';
import { Field } from 'formik';
-import { Row, Col, FormattedMessage as T } from 'components';
+import {
+ ItemsMultiSelect,
+ Row,
+ Col,
+ FormattedMessage as T,
+} from '../../../components';
import FinancialStatementDateRange from 'containers/FinancialStatements/FinancialStatementDateRange';
-import { useInventoryItemDetailsContext } from './InventoryItemDetailsProvider';
-import { InventoryItemDetailsHeaderGeneralProvider } from './InventoryItemDetailsHeaderGeneralProvider';
+
+import {
+ InventoryItemDetailsHeaderGeneralProvider,
+ useInventoryItemDetailsHeaderGeneralContext,
+} from './InventoryItemDetailsHeaderGeneralProvider';
/**
* Inventory item details header - General panel.
@@ -22,7 +30,7 @@ export default function InventoryItemDetailsHeaderGeneralPanel() {
* Inventory item details header - General panel - Content.
*/
function InventoryItemDetailsHeaderGeneralPanelContent() {
- const { items } = useInventoryItemDetailsContext();
+ const { items } = useInventoryItemDetailsHeaderGeneralContext();
return (
@@ -39,7 +47,15 @@ function InventoryItemDetailsHeaderGeneralPanelContent() {
}
className={classNames('form-group--select-list', Classes.FILL)}
- >
+ >
+ {
+ const itemsIds = items.map((item) => item.id);
+ setFieldValue('itemsIds', itemsIds);
+ }}
+ />
+
)}
diff --git a/client/src/containers/FinancialStatements/InventoryValuation/InventoryValuationHeaderGeneralPanel.js b/client/src/containers/FinancialStatements/InventoryValuation/InventoryValuationHeaderGeneralPanel.js
index 23efe5087..6a6af2922 100644
--- a/client/src/containers/FinancialStatements/InventoryValuation/InventoryValuationHeaderGeneralPanel.js
+++ b/client/src/containers/FinancialStatements/InventoryValuation/InventoryValuationHeaderGeneralPanel.js
@@ -3,8 +3,14 @@ import { FastField, Field } from 'formik';
import { DateInput } from '@blueprintjs/datetime';
import { FormGroup, Position, Classes } from '@blueprintjs/core';
import classNames from 'classnames';
-import { FormattedMessage as T } from 'components';
-import { ItemsMultiSelect, Row, Col, FieldHint } from 'components';
+
+import {
+ FormattedMessage as T,
+ ItemsMultiSelect,
+ Row,
+ Col,
+ FieldHint,
+} from '../../../components';
import {
momentFormatter,
tansformDateValue,
@@ -64,16 +70,18 @@ function InventoryValuationHeaderGeneralPanelContent() {
- {({
- form: { setFieldValue },
- field: { value },
- meta: { error, touched },
- }) => (
+ {({ form: { setFieldValue } }) => (
}
className={classNames('form-group--select-list', Classes.FILL)}
>
-
+ {
+ const itemsIds = items.map((item) => item.id);
+ setFieldValue('itemsIds', itemsIds);
+ }}
+ />
)}
diff --git a/client/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsGeneralPanel.js b/client/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsGeneralPanel.js
index 7dab6a69f..6c2e33ad1 100644
--- a/client/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsGeneralPanel.js
+++ b/client/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsGeneralPanel.js
@@ -1,18 +1,22 @@
import React from 'react';
import { FormGroup, Classes } from '@blueprintjs/core';
import { Field } from 'formik';
-import { Row, Col, FormattedMessage as T } from 'components';
+import {
+ Row,
+ Col,
+ FormattedMessage as T,
+ ItemsMultiSelect,
+} from '../../../components';
import classNames from 'classnames';
import FinancialStatementDateRange from 'containers/FinancialStatements/FinancialStatementDateRange';
-import { ItemsMultiSelect } from 'components';
import {
PurchasesByItemsGeneralPanelProvider,
usePurchaseByItemsGeneralPanelContext,
} from './PurchasesByItemsGeneralPanelProvider';
/**
- *
+ *
*/
export default function PurchasesByItemsGeneralPanel() {
return (
@@ -35,16 +39,18 @@ function PurchasesByItemsGeneralPanelContent() {
- {({
- form: { setFieldValue },
- field: { value },
- meta: { error, touched },
- }) => (
+ {({ form: { setFieldValue } }) => (
}
className={classNames('form-group--select-list', Classes.FILL)}
>
-
+ {
+ const itemsIds = items.map((item) => item.id);
+ setFieldValue('itemsIds', itemsIds);
+ }}
+ />
)}
diff --git a/client/src/containers/FinancialStatements/SalesByItems/SalesByItemsHeader.js b/client/src/containers/FinancialStatements/SalesByItems/SalesByItemsHeader.js
index 23f639815..059de708c 100644
--- a/client/src/containers/FinancialStatements/SalesByItems/SalesByItemsHeader.js
+++ b/client/src/containers/FinancialStatements/SalesByItems/SalesByItemsHeader.js
@@ -28,13 +28,9 @@ function SalesByItemsHeader({
// #withSalesByItemsActions
toggleSalesByItemsFilterDrawer,
}) {
-
-
// Form validation schema.
const validationSchema = Yup.object().shape({
- fromDate: Yup.date()
- .required()
- .label(intl.get('from_date')),
+ fromDate: Yup.date().required().label(intl.get('from_date')),
toDate: Yup.date()
.min(Yup.ref('fromDate'))
.required()
diff --git a/client/src/containers/FinancialStatements/SalesByItems/SalesByItemsHeaderGeneralPanel.js b/client/src/containers/FinancialStatements/SalesByItems/SalesByItemsHeaderGeneralPanel.js
index 909048515..22168e2b2 100644
--- a/client/src/containers/FinancialStatements/SalesByItems/SalesByItemsHeaderGeneralPanel.js
+++ b/client/src/containers/FinancialStatements/SalesByItems/SalesByItemsHeaderGeneralPanel.js
@@ -2,6 +2,7 @@ import React from 'react';
import { FormGroup, Classes } from '@blueprintjs/core';
import { Field } from 'formik';
import classNames from 'classnames';
+import { get } from 'lodash';
import { Row, Col, ItemsMultiSelect, FormattedMessage as T } from 'components';
import FinancialStatementDateRange from 'containers/FinancialStatements/FinancialStatementDateRange';
@@ -34,22 +35,17 @@ function SalesByItemsHeaderGeneralPanelContent() {
- {({
- form: { setFieldValue },
- field: { value },
- meta: { error, touched },
- }) => (
+ {({ form: { setFieldValue }, field: { value } }) => (
}
className={classNames('form-group--select-list', Classes.FILL)}
>
{
+ onItemSelect={(items) => {
+ const itemsIds = items.map((item) => item.id);
setFieldValue('itemsIds', itemsIds);
}}
- onTagRenderer={(value) => value}
/>
)}
diff --git a/client/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryHeaderGeneralContent.js b/client/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryHeaderGeneralContent.js
index d833d7092..4ea6bf884 100644
--- a/client/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryHeaderGeneralContent.js
+++ b/client/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryHeaderGeneralContent.js
@@ -4,7 +4,13 @@ import { DateInput } from '@blueprintjs/datetime';
import classNames from 'classnames';
import { FormGroup, Position, Classes, Checkbox } from '@blueprintjs/core';
-import { Row, Col, FieldHint, FormattedMessage as T } from 'components';
+import {
+ ContactsMultiSelect,
+ Row,
+ Col,
+ FieldHint,
+ FormattedMessage as T,
+} from '../../../components';
import {
momentFormatter,
tansformDateValue,
@@ -68,15 +74,19 @@ export default function VendorsBalanceSummaryHeaderGeneralContent() {
- {({
- form: { setFieldValue },
- field: { value },
- meta: { error, touched },
- }) => (
+ {({ form: { setFieldValue } }) => (
}
className={classNames('form-group--select-list', Classes.FILL)}
- >
+ >
+ {
+ const vendorsIds = contacts.map((contact) => contact.id);
+ setFieldValue('vendorsIds', vendorsIds);
+ }}
+ />
+
)}
diff --git a/client/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsHeaderGeneralPanel.js b/client/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsHeaderGeneralPanel.js
index 2681440d2..85c655ae3 100644
--- a/client/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsHeaderGeneralPanel.js
+++ b/client/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsHeaderGeneralPanel.js
@@ -9,7 +9,7 @@ import {
Col,
ContactsMultiSelect,
FormattedMessage as T,
-} from 'components';
+} from '../../../components';
import {
VendorsTransactionsGeneralPanelProvider,
useVendorsTransactionsGeneralPanelContext,
@@ -45,11 +45,11 @@ function VendorsTransactionsHeaderGeneralPanelContent() {
className={classNames('form-group--select-list', Classes.FILL)}
>
{
- setFieldValue('vendorsIds', contactsIds);
+ items={vendors}
+ onItemSelect={(vendors) => {
+ const vendorsIds = vendors.map((customer) => customer.id);
+ setFieldValue('vendorsIds', vendorsIds);
}}
- contacts={vendors}
- contactsSelected={value}
/>
)}