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

Merge branch 'develop'

Browse Source
This commit is contained in:
a.bouhuolia
2022-01-03 11:46:00 +02:00
parent d3c5131020 e1b6f0d879
commit cfc625edf9
512 changed files with 20008 additions and 2564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostFormFields.js
View File

@@ -103,8 +103,10 @@ export default function AllocateLandedCostFormFields() {
selectedItem={value}
selectedItemProp={'id'}
textProp={'name'}
labelProp={'id'}
defaultText={intl.get('Select transaction')}
labelProp={'formatted_unallocated_cost_amount'}
defaultText={intl.get(
'landed_cost.dialog.label_select_transaction',
)}
popoverProps={{ minimal: true }}
/>
</FormGroup>
@@ -131,16 +133,17 @@ export default function AllocateLandedCostFormFields() {
>
<ListSelect
items={costTransactionEntries}
onItemSelect={({ id, unallocated_cost_amount }) => {
onItemSelect={(entry) => {
const { id, unallocated_cost_amount: unallocatedAmount } =
entry;
const { items, allocation_method } = form.values;
form.setFieldValue('amount', unallocatedAmount);
form.setFieldValue('transaction_entry_id', id);
form.setFieldValue('amount', unallocated_cost_amount);
form.setFieldValue(
'items',
allocateCostToEntries(
unallocated_cost_amount,
unallocatedAmount,
allocation_method,
items,
),
@@ -150,7 +153,10 @@ export default function AllocateLandedCostFormFields() {
selectedItem={value}
selectedItemProp={'id'}
textProp={'name'}
defaultText={intl.get('Select transaction entry')}
labelProp={'formatted_unallocated_cost_amount'}
defaultText={intl.get(
'landed_cost.dialog.label_select_transaction_entry',
)}
popoverProps={{ minimal: true }}
/>
</FormGroup>