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

feat(S&P): fix navigation bar if warehouses or branches feature.

Browse Source
This commit is contained in:
elforjani13
2022-03-07 18:43:21 +02:00
parent b26b4c5491
commit 87a56dcd95
8 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/BranchSuggestField.js
View File

@@ -39,10 +39,10 @@ export default function BranchSuggestField({
<MenuItem <MenuItem
// active={modifiers.active} // active={modifiers.active}
disabled={modifiers.disabled} disabled={modifiers.disabled}
label={branch.code.toString()} label={branch.code}
key={branch.id} key={branch.id}
onClick={handleClick} onClick={handleClick}
text={branch.name.toString()} text={branch.name}
/> />
); );
}; };

55
src/containers/Accounting/MakeJournal/MakeJournalEntriesHeaderFields.js
View File

@@ -195,32 +195,35 @@ function MakeJournalEntriesHeader({
</FastField> </FastField>
{/*------------ Currency -----------*/} {/*------------ Currency -----------*/}
{/* <FeatureCan feature={Features.ManualJournal}> */} <FeatureCan feature={Features.ManualJournal}>
<FastField <FastField
name={'currency_code'} name={'currency_code'}
currencies={currencies} currencies={currencies}
shouldUpdate={currenciesFieldShouldUpdate} shouldUpdate={currenciesFieldShouldUpdate}
> >
{({ form, field: { value }, meta: { error, touched } }) => ( {({ form, field: { value }, meta: { error, touched } }) => (
<FormGroup <FormGroup
label={<T id={'currency'} />} label={<T id={'currency'} />}
className={classNames('form-group--currency', CLASSES.FILL)} className={classNames('form-group--currency', CLASSES.FILL)}
inline={true} inline={true}
> >
<CurrencySelectList <CurrencySelectList
currenciesList={currencies} currenciesList={currencies}
selectedCurrencyCode={value} selectedCurrencyCode={value}
onCurrencySelected={(currencyItem) => { onCurrencySelected={(currencyItem) => {
form.setFieldValue('currency_code', currencyItem.currency_code); form.setFieldValue(
form.setFieldValue('exchange_rate', ''); 'currency_code',
setSelactJournalCurrency(currencyItem); currencyItem.currency_code,
}} );
defaultSelectText={value} form.setFieldValue('exchange_rate', '');
/> setSelactJournalCurrency(currencyItem);
</FormGroup> }}
)} defaultSelectText={value}
</FastField> />
{/* </FeatureCan> */} </FormGroup>
)}
</FastField>
</FeatureCan>
{/* ----------- Exchange rate ----------- */} {/* ----------- Exchange rate ----------- */}
<If condition={isForeignJournal}> <If condition={isForeignJournal}>

2
src/containers/Purchases/Bills/BillForm/BillFormTopBar.js
View File

@@ -38,7 +38,7 @@ export default function BillFormTopBar() {
useSetPrimaryBranchToForm(); useSetPrimaryBranchToForm();
// Can't display the navigation bar if warehouses or branches feature is not enabled. // Can't display the navigation bar if warehouses or branches feature is not enabled.
if (!featureCan(Features.Warehouses) || !featureCan(Features.Branches)) { if (!featureCan(Features.Warehouses) && !featureCan(Features.Branches)) {
return null; return null;
} }

2
src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormTopBar.js
View File

@@ -39,7 +39,7 @@ export default function VendorCreditNoteFormTopBar() {
useSetPrimaryBranchToForm(); useSetPrimaryBranchToForm();
// Can't display the navigation bar if warehouses or branches feature is not enabled. // Can't display the navigation bar if warehouses or branches feature is not enabled.
if (!featureCan(Features.Warehouses) || !featureCan(Features.Branches)) { if (!featureCan(Features.Warehouses) && !featureCan(Features.Branches)) {
return null; return null;
} }

2
src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormTopBar.js
View File

@@ -38,7 +38,7 @@ export default function CreditNoteFormTopbar() {
useSetPrimaryBranchToForm(); useSetPrimaryBranchToForm();
// Can't display the navigation bar if warehouses or branches feature is not enabled. // Can't display the navigation bar if warehouses or branches feature is not enabled.
if (!featureCan(Features.Warehouses) || !featureCan(Features.Branches)) { if (!featureCan(Features.Warehouses) && !featureCan(Features.Branches)) {
return null; return null;
} }

2
src/containers/Sales/Estimates/EstimateForm/EstimtaeFormTopBar.js
View File

@@ -39,7 +39,7 @@ export default function EstimtaeFormTopBar() {
useSetPrimaryBranchToForm(); useSetPrimaryBranchToForm();
// Can't display the navigation bar if warehouses or branches feature is not enabled. // Can't display the navigation bar if warehouses or branches feature is not enabled.
if (!featureCan(Features.Warehouses) || !featureCan(Features.Branches)) { if (!featureCan(Features.Warehouses) && !featureCan(Features.Branches)) {
return null; return null;
} }

2
src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.js
View File

@@ -40,7 +40,7 @@ export default function InvoiceFormTopBar() {
useSetPrimaryBranchToForm(); useSetPrimaryBranchToForm();
// Can't display the navigation bar if warehouses or branches feature is not enabled. // Can't display the navigation bar if warehouses or branches feature is not enabled.
if (!featureCan(Features.Warehouses) || !featureCan(Features.Branches)) { if (!featureCan(Features.Warehouses) && !featureCan(Features.Branches)) {
return null; return null;
} }
return ( return (

2
src/containers/Sales/Receipts/ReceiptForm/ReceiptFormTopbar.js
View File

@@ -40,7 +40,7 @@ export default function ReceiptFormTopBar() {
useSetPrimaryBranchToForm(); useSetPrimaryBranchToForm();
// Can't display the navigation bar if warehouses or branches feature is not enabled. // Can't display the navigation bar if warehouses or branches feature is not enabled.
if (!featureCan(Features.Warehouses) || !featureCan(Features.Branches)) { if (!featureCan(Features.Warehouses) && !featureCan(Features.Branches)) {
return null; return null;
} }