diff --git a/client/src/containers/Accounting/JournalsLanding/utils.js b/client/src/containers/Accounting/JournalsLanding/utils.js
index bedabbb83..aa1540009 100644
--- a/client/src/containers/Accounting/JournalsLanding/utils.js
+++ b/client/src/containers/Accounting/JournalsLanding/utils.js
@@ -6,7 +6,6 @@ import {
StatusAccessor,
DateAccessor,
AmountAccessor,
- ActionsCell,
} from './components';
/**
@@ -65,14 +64,6 @@ export const useManualJournalsColumns = () => {
width: 125,
className: 'created_at',
},
- {
- id: 'actions',
- Header: '',
- Cell: ActionsCell,
- className: 'actions',
- width: 50,
- disableResizing: true,
- },
],
[],
);
diff --git a/client/src/containers/Accounting/MakeJournal/utils.js b/client/src/containers/Accounting/MakeJournal/utils.js
index e8f7daf3a..f8e9ac58b 100644
--- a/client/src/containers/Accounting/MakeJournal/utils.js
+++ b/client/src/containers/Accounting/MakeJournal/utils.js
@@ -125,19 +125,20 @@ export const transformErrors = (resErrors, { setErrors, errors }) => {
setEntriesErrors(error.indexes, 'contact_id', 'error');
}
if ((error = getError(ERROR.ENTRIES_SHOULD_ASSIGN_WITH_CONTACT))) {
- if (error.meta.contact_type === 'customer') {
+ if (error.meta.find(meta => meta.contact_type === 'customer')) {
toastMessages.push(
formatMessage({
id: 'receivable_accounts_should_assign_with_customers',
}),
);
}
- if (error.meta.contact_type === 'vendor') {
+ if (error.meta.find(meta => meta.contact_type === 'vendor')) {
toastMessages.push(
formatMessage({ id: 'payable_accounts_should_assign_with_vendors' }),
);
}
- setEntriesErrors(error.meta.indexes, 'contact_id', 'error');
+ const indexes = error.meta.map((meta => meta.indexes)).flat();
+ setEntriesErrors(indexes, 'contact_id', 'error');
}
if ((error = getError(ERROR.JOURNAL_NUMBER_ALREADY_EXISTS))) {
newErrors = setWith(
@@ -153,7 +154,7 @@ export const transformErrors = (resErrors, { setErrors, errors }) => {
if (toastMessages.length > 0) {
AppToaster.show({
message: toastMessages.map((message) => {
- return - {message}
;
+ return {message}
;
}),
intent: Intent.DANGER,
});
diff --git a/client/src/containers/Purchases/Bills/BillsLanding/components.js b/client/src/containers/Purchases/Bills/BillsLanding/components.js
index 9fb4fe210..f08bfc18c 100644
--- a/client/src/containers/Purchases/Bills/BillsLanding/components.js
+++ b/client/src/containers/Purchases/Bills/BillsLanding/components.js
@@ -201,14 +201,6 @@ export function useBillsTableColumns() {
width: 90,
className: 'reference_no',
},
- {
- id: 'actions',
- Header: '',
- Cell: ActionsCell,
- className: 'actions',
- width: 50,
- disableResizing: true,
- },
],
[formatMessage],
);
diff --git a/client/src/containers/Purchases/PaymentMades/PaymentsLanding/components.js b/client/src/containers/Purchases/PaymentMades/PaymentsLanding/components.js
index 8cc12346e..f5e00ac41 100644
--- a/client/src/containers/Purchases/PaymentMades/PaymentsLanding/components.js
+++ b/client/src/containers/Purchases/PaymentMades/PaymentsLanding/components.js
@@ -118,15 +118,6 @@ export function usePaymentMadesTableColumns() {
width: 140,
className: 'reference',
},
-
- {
- id: 'actions',
- Header: '',
- Cell: ActionsCell,
- className: 'actions',
- width: 50,
- disableResizing: true,
- },
],
[formatMessage],
);
diff --git a/client/src/containers/Sales/Estimates/EstimatesLanding/components.js b/client/src/containers/Sales/Estimates/EstimatesLanding/components.js
index b8c49f4e6..2dba0f690 100644
--- a/client/src/containers/Sales/Estimates/EstimatesLanding/components.js
+++ b/client/src/containers/Sales/Estimates/EstimatesLanding/components.js
@@ -203,15 +203,7 @@ export function useEstiamtesTableColumns() {
accessor: 'reference',
width: 90,
className: 'reference',
- },
- {
- id: 'actions',
- Header: '',
- Cell: ActionsCell,
- className: 'actions',
- width: 50,
- disableResizing: true,
- },
+ }
],
[formatMessage],
);
diff --git a/client/src/containers/Sales/Invoices/InvoicesLanding/components.js b/client/src/containers/Sales/Invoices/InvoicesLanding/components.js
index 71ee3ba9d..91b40c45f 100644
--- a/client/src/containers/Sales/Invoices/InvoicesLanding/components.js
+++ b/client/src/containers/Sales/Invoices/InvoicesLanding/components.js
@@ -221,14 +221,6 @@ export function useInvoicesTableColumns() {
width: 90,
className: 'reference_no',
},
- {
- id: 'actions',
- Header: '',
- Cell: ActionsCell,
- className: 'actions',
- width: 50,
- disableResizing: true,
- },
],
[formatMessage],
);
diff --git a/client/src/containers/Sales/PaymentReceives/PaymentsLanding/components.js b/client/src/containers/Sales/PaymentReceives/PaymentsLanding/components.js
index 748b3b8f5..0735ba797 100644
--- a/client/src/containers/Sales/PaymentReceives/PaymentsLanding/components.js
+++ b/client/src/containers/Sales/PaymentReceives/PaymentsLanding/components.js
@@ -127,15 +127,7 @@ export function usePaymentReceivesColumns() {
accessor: 'reference_no',
width: 140,
className: 'reference_no',
- },
- {
- id: 'actions',
- Header: '',
- Cell: ActionsCell,
- className: 'actions',
- width: 50,
- disableResizing: true,
- },
+ }
],
[formatMessage],
);
diff --git a/client/src/containers/Sales/Receipts/ReceiptsLanding/components.js b/client/src/containers/Sales/Receipts/ReceiptsLanding/components.js
index 2e22b83e7..f90073c1d 100644
--- a/client/src/containers/Sales/Receipts/ReceiptsLanding/components.js
+++ b/client/src/containers/Sales/Receipts/ReceiptsLanding/components.js
@@ -146,14 +146,6 @@ export function useReceiptsTableColumns() {
width: 140,
className: 'reference_no',
},
- {
- id: 'actions',
- Header: '',
- Cell: ActionsCell,
- className: 'actions',
- width: 50,
- disableResizing: true,
- },
],
[formatMessage],
);
diff --git a/client/src/containers/Vendors/VendorsLanding/components.js b/client/src/containers/Vendors/VendorsLanding/components.js
index bdc28ef3b..d9c2aae25 100644
--- a/client/src/containers/Vendors/VendorsLanding/components.js
+++ b/client/src/containers/Vendors/VendorsLanding/components.js
@@ -127,15 +127,7 @@ export function useVendorsTableColumns() {
accessor: BalanceAccessor,
className: 'receivable_balance',
width: 100,
- },
- {
- id: 'actions',
- Cell: ActionsCell,
- className: 'actions',
- width: 70,
- disableResizing: true,
- disableSortBy: true,
- },
+ }
],
[formatMessage],
);
diff --git a/client/src/style/components/DataTable/DataTableEditable.scss b/client/src/style/components/DataTable/DataTableEditable.scss
index db59421e5..e10c4f78f 100644
--- a/client/src/style/components/DataTable/DataTableEditable.scss
+++ b/client/src/style/components/DataTable/DataTableEditable.scss
@@ -30,7 +30,6 @@
padding: 10px 10px;
background-color: #f0f2f8;
font-size: 14px;
- font-weight: 500;
color: #415060;
border-bottom: 1px solid #d2dce2;
diff --git a/client/src/style/pages/Bills/List.scss b/client/src/style/pages/Bills/List.scss
index 845808f0c..4fa38a7a9 100644
--- a/client/src/style/pages/Bills/List.scss
+++ b/client/src/style/pages/Bills/List.scss
@@ -1,6 +1,9 @@
.dashboard__insider--bills {
.bigcapital-datatable {
.tbody {
+ .tr {
+ min-height: 50px;
+ }
.td.amount {
.cell-inner {
> span {
diff --git a/client/src/style/pages/Customers/List.scss b/client/src/style/pages/Customers/List.scss
index c5fd10539..b271d1a3a 100644
--- a/client/src/style/pages/Customers/List.scss
+++ b/client/src/style/pages/Customers/List.scss
@@ -4,6 +4,11 @@
.bigcapital-datatable{
+ .tr .td{
+ padding-top: 0.6rem;
+ padding-bottom: 0.6rem;
+ }
+
.avatar.td{
.avatar{
diff --git a/client/src/style/pages/Expense/List.scss b/client/src/style/pages/Expense/List.scss
index 9cb9b0c1e..eb9900e9d 100644
--- a/client/src/style/pages/Expense/List.scss
+++ b/client/src/style/pages/Expense/List.scss
@@ -5,6 +5,10 @@
.bigcapital-datatable {
.table {
.tbody {
+
+ .tr{
+ min-height: 50px;
+ }
.td.amount {
span {
font-weight: 600;
diff --git a/client/src/style/pages/InventoryAdjustments/List.scss b/client/src/style/pages/InventoryAdjustments/List.scss
new file mode 100644
index 000000000..d904555ef
--- /dev/null
+++ b/client/src/style/pages/InventoryAdjustments/List.scss
@@ -0,0 +1,15 @@
+
+// Blueprint framework.
+// @import '@blueprintjs/core/src/blueprint.scss';
+
+.dashboard__insider--inventory_adjustments {
+ .bigcapital-datatable {
+ .table {
+ .tbody {
+ .tr{
+ min-height: 50px;
+ }
+ }
+ }
+ }
+}
diff --git a/client/src/style/pages/Items/List.scss b/client/src/style/pages/Items/List.scss
index 494dee324..e0fcf371a 100644
--- a/client/src/style/pages/Items/List.scss
+++ b/client/src/style/pages/Items/List.scss
@@ -6,6 +6,9 @@
.bigcapital-datatable {
.table {
.tbody {
+ .tr{
+ min-height: 50px;
+ }
.item_type.td {
.bp3-tag {
font-size: 13px;
diff --git a/client/src/style/pages/ItemsCategories/List.scss b/client/src/style/pages/ItemsCategories/List.scss
new file mode 100644
index 000000000..a925a3f21
--- /dev/null
+++ b/client/src/style/pages/ItemsCategories/List.scss
@@ -0,0 +1,14 @@
+
+
+.dashboard__insider--items-categories-list{
+
+ .bigcapital-datatable {
+ .table {
+ .tbody {
+ .tr{
+ min-height: 50px;
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/client/src/style/pages/ManualJournal/List.scss b/client/src/style/pages/ManualJournal/List.scss
index 37c2b87a2..3dff76dab 100644
--- a/client/src/style/pages/ManualJournal/List.scss
+++ b/client/src/style/pages/ManualJournal/List.scss
@@ -4,6 +4,9 @@
}
.tbody {
+ .tr .td{
+ padding: 0.8rem 0.5rem;
+ }
.td.amount {
.bp3-popover-target {
border-bottom: 1px solid #e7e7e7;
diff --git a/client/src/style/pages/PaymentMade/List.scss b/client/src/style/pages/PaymentMade/List.scss
index 249dfd8d5..aab384b28 100644
--- a/client/src/style/pages/PaymentMade/List.scss
+++ b/client/src/style/pages/PaymentMade/List.scss
@@ -4,6 +4,9 @@
.bigcapital-datatable{
.tbody{
+ .tr{
+ min-height: 50px;
+ }
.td.amount {
diff --git a/client/src/style/pages/PaymentReceive/List.scss b/client/src/style/pages/PaymentReceive/List.scss
index 44e284fde..491f47e0f 100644
--- a/client/src/style/pages/PaymentReceive/List.scss
+++ b/client/src/style/pages/PaymentReceive/List.scss
@@ -4,6 +4,9 @@
.bigcapital-datatable{
.tbody{
+ .tr .td{
+ min-height: 50px;
+ }
.td.amount {
diff --git a/client/src/style/pages/SaleEstimate/List.scss b/client/src/style/pages/SaleEstimate/List.scss
index 33688fad7..5706c00b7 100644
--- a/client/src/style/pages/SaleEstimate/List.scss
+++ b/client/src/style/pages/SaleEstimate/List.scss
@@ -5,6 +5,11 @@
.tbody{
+ .tr .td{
+ padding-top: 0.88rem;
+ padding-bottom: 0.88rem;
+ }
+
.td.amount {
.cell-inner{
diff --git a/client/src/style/pages/SaleInvoice/List.scss b/client/src/style/pages/SaleInvoice/List.scss
index 0c02f8a88..2f3e85bff 100644
--- a/client/src/style/pages/SaleInvoice/List.scss
+++ b/client/src/style/pages/SaleInvoice/List.scss
@@ -7,6 +7,9 @@
.tbody{
+ .tr{
+ min-height: 50px;
+ }
.balance.td{
.cell-inner{
diff --git a/client/src/style/pages/SaleReceipt/List.scss b/client/src/style/pages/SaleReceipt/List.scss
index 7aec30dd2..06e8073f5 100644
--- a/client/src/style/pages/SaleReceipt/List.scss
+++ b/client/src/style/pages/SaleReceipt/List.scss
@@ -5,6 +5,10 @@
.tbody{
+ .tr .td{
+ min-height: 50px;
+ }
+
.td.amount {
.cell-inner{
diff --git a/client/src/style/pages/Vendors/List.scss b/client/src/style/pages/Vendors/List.scss
index 948e9d488..97764e88a 100644
--- a/client/src/style/pages/Vendors/List.scss
+++ b/client/src/style/pages/Vendors/List.scss
@@ -2,6 +2,13 @@
.bigcapital-datatable {
+ tbody {
+ .tr .td {
+ padding-top: 0.6rem;
+ padding-bottom: 0.6rem;
+ }
+ }
+
.avatar.td {
.avatar {
diff --git a/client/src/style/pages/authentication.scss b/client/src/style/pages/authentication.scss
index e69de29bb..57a29bab1 100644
--- a/client/src/style/pages/authentication.scss
+++ b/client/src/style/pages/authentication.scss
@@ -0,0 +1,15 @@
+
+// Blueprint framework.
+// @import '@blueprintjs/core/src/blueprint.scss';
+
+.dashboard__insider--inventory-adjustments-list {
+ .bigcapital-datatable {
+ .table {
+ .tbody {
+ .tr .td{
+ padding: 0.88rem 0.5rem;
+ }
+ }
+ }
+ }
+}