From 30b17d697f55fb236ef3f058162e17214a417e24 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Wed, 30 Mar 2022 16:28:42 +0200 Subject: [PATCH 1/3] BIG-355: remove expandable in item categories. --- src/containers/ItemsCategories/ItemCategoriesTable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/ItemsCategories/ItemCategoriesTable.js b/src/containers/ItemsCategories/ItemCategoriesTable.js index 5f2436e91..654500e24 100644 --- a/src/containers/ItemsCategories/ItemCategoriesTable.js +++ b/src/containers/ItemsCategories/ItemCategoriesTable.js @@ -50,7 +50,7 @@ function ItemsCategoryTable({ loading={isCategoriesLoading} headerLoading={isCategoriesLoading} progressBarLoading={isCategoriesFetching} - expandable={true} + // expandable={false} sticky={true} selectionColumn={true} TableLoadingRenderer={TableSkeletonRows} From 9bd13b0d4691e5967d64277cf3077c5c92ae1580 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Wed, 30 Mar 2022 16:31:34 +0200 Subject: [PATCH 2/3] BIG-355: remove expandable in item categories. --- src/containers/ItemsCategories/ItemCategoriesTable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/ItemsCategories/ItemCategoriesTable.js b/src/containers/ItemsCategories/ItemCategoriesTable.js index 654500e24..305865f45 100644 --- a/src/containers/ItemsCategories/ItemCategoriesTable.js +++ b/src/containers/ItemsCategories/ItemCategoriesTable.js @@ -50,7 +50,7 @@ function ItemsCategoryTable({ loading={isCategoriesLoading} headerLoading={isCategoriesLoading} progressBarLoading={isCategoriesFetching} - // expandable={false} + expandable={false} sticky={true} selectionColumn={true} TableLoadingRenderer={TableSkeletonRows} From 86c6de361bf3899edfea696fa010bbecb14746b3 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Wed, 30 Mar 2022 16:34:51 +0200 Subject: [PATCH 3/3] BIG-356: add localize remove line entries. --- src/containers/Accounting/MakeJournal/components.js | 12 ++++++++++-- src/containers/Entries/components.js | 2 +- src/containers/Expenses/ExpenseForm/components.js | 7 +++++-- src/containers/WarehouseTransfers/utils.js | 5 ++++- src/lang/ar/index.json | 5 ++++- src/lang/en/index.json | 5 ++++- 6 files changed, 28 insertions(+), 8 deletions(-) diff --git a/src/containers/Accounting/MakeJournal/components.js b/src/containers/Accounting/MakeJournal/components.js index cec39f28c..260adddd4 100644 --- a/src/containers/Accounting/MakeJournal/components.js +++ b/src/containers/Accounting/MakeJournal/components.js @@ -4,7 +4,12 @@ import { Popover2 } from '@blueprintjs/popover2'; import { useFormikContext } from 'formik'; import intl from 'react-intl-universal'; -import { ExchangeRateInputGroup, Icon, Hint, FormattedMessage as T } from 'components'; +import { + ExchangeRateInputGroup, + Icon, + Hint, + FormattedMessage as T, +} from 'components'; import { AccountsListFieldCell, MoneyFieldCell, @@ -63,7 +68,10 @@ export const ActionsCellRenderer = ({ }; const exampleMenu = ( - + ); return ( diff --git a/src/containers/Entries/components.js b/src/containers/Entries/components.js index bb0bc53a2..d7877cd1b 100644 --- a/src/containers/Entries/components.js +++ b/src/containers/Entries/components.js @@ -43,7 +43,7 @@ export function ActionsCellRenderer({ const exampleMenu = ( - + ); diff --git a/src/containers/Expenses/ExpenseForm/components.js b/src/containers/Expenses/ExpenseForm/components.js index 417d81506..c0426d9a3 100644 --- a/src/containers/Expenses/ExpenseForm/components.js +++ b/src/containers/Expenses/ExpenseForm/components.js @@ -48,7 +48,10 @@ const ActionsCellRenderer = ({ }; const exampleMenu = ( - + ); return ( @@ -163,4 +166,4 @@ export function ExpensesExchangeRateInputField({ ...props }) { /> ); } -ExpensesExchangeRateInputField.cellType = CellType.Field; \ No newline at end of file +ExpensesExchangeRateInputField.cellType = CellType.Field; diff --git a/src/containers/WarehouseTransfers/utils.js b/src/containers/WarehouseTransfers/utils.js index cc118fdd7..638a55a22 100644 --- a/src/containers/WarehouseTransfers/utils.js +++ b/src/containers/WarehouseTransfers/utils.js @@ -21,7 +21,10 @@ export function ActionsCellRenderer({ const exampleMenu = ( - + ); diff --git a/src/lang/ar/index.json b/src/lang/ar/index.json index 944d6ea7a..9d09a3bff 100644 --- a/src/lang/ar/index.json +++ b/src/lang/ar/index.json @@ -2010,5 +2010,8 @@ "item.error.you_could_not_delete_item_has_associated": "لا يمكنك حذف العنصر لديه معاملات مرتبطة به ", "warehouse_transfer.quantity_cannot_be_zero_or_empty": "لا يمكن أن تكون الكمية صفراً أو فارغة.", "invoice.validation.due_date": "يجب أن يكون حقل {path} في وقت لاحق من {min}", - "estimate.validation.expiration_date": "يجب أن يكون حقل {path} في وقت لاحق من {min}" + "estimate.validation.expiration_date": "يجب أن يكون حقل {path} في وقت لاحق من {min}", + "make_journal.entries.remove_row": "حذف الصف", + "expense.entries.remove_row": "حذف الصف", + "warehouse_transfer.entries.remove_row": "حذف الصف" } \ No newline at end of file diff --git a/src/lang/en/index.json b/src/lang/en/index.json index 2a4d0b094..dbd9b1e32 100644 --- a/src/lang/en/index.json +++ b/src/lang/en/index.json @@ -2010,5 +2010,8 @@ "warehouse_transfer.form.reason.placeholder": "Enter the reason behind the transfer order.", "warehouse_transfer.quantity_cannot_be_zero_or_empty": "Quantity cannot be zero or empty.", "invoice.validation.due_date": "{path} field must be later than {min}", - "estimate.validation.expiration_date": "{path} field must be later than {min}" + "estimate.validation.expiration_date": "{path} field must be later than {min}", + "make_journal.entries.remove_row": "Remove line", + "expense.entries.remove_row": "Remove line", + "warehouse_transfer.entries.remove_row": "Remove line" } \ No newline at end of file