diff --git a/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryTable.js b/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryTable.js index 6eb727d9d..29cd28088 100644 --- a/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryTable.js +++ b/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryTable.js @@ -25,7 +25,7 @@ export default function CustomersBalanceSummaryTable({ const columns = useCustomersSummaryColumns(); const rowClassNames = (row) => { - return [`row-type--${row.original.rowTypes}`]; + return [`row-type--${row.original.row_types}`]; }; return ( diff --git a/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactionsTable.js b/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactionsTable.js index 1215da2f7..295725768 100644 --- a/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactionsTable.js +++ b/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactionsTable.js @@ -31,7 +31,7 @@ export default function CustomersTransactionsTable({ ]); const rowClassNames = (row) => { - return [`row-type--${row.original.rowTypes}`]; + return [`row-type--${row.original.row_types}`]; }; return ( diff --git a/src/containers/FinancialStatements/GeneralLedger/components.js b/src/containers/FinancialStatements/GeneralLedger/components.js index 9ccb69a7f..ee60301f0 100644 --- a/src/containers/FinancialStatements/GeneralLedger/components.js +++ b/src/containers/FinancialStatements/GeneralLedger/components.js @@ -35,7 +35,7 @@ export function useGeneralLedgerTableColumns() { return row.date; }, className: 'date', - textOverview: true, + // textOverview: true, width: 120, }, { diff --git a/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsTable.js b/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsTable.js index 5f730f76d..5ab72ed72 100644 --- a/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsTable.js +++ b/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsTable.js @@ -29,7 +29,7 @@ export default function InventoryItemDetailsTable({ ); const rowClassNames = (row) => { - return [`row-type--${row.original.rowTypes}`]; + return [`row-type--${row.original.row_types}`]; }; return ( diff --git a/src/containers/FinancialStatements/InventoryItemDetails/utils.js b/src/containers/FinancialStatements/InventoryItemDetails/utils.js index 5824c4d52..35d2e29f1 100644 --- a/src/containers/FinancialStatements/InventoryItemDetails/utils.js +++ b/src/containers/FinancialStatements/InventoryItemDetails/utils.js @@ -9,7 +9,7 @@ const columnsMapper = (data, index, column) => ({ id: column.key, key: column.key, Header: column.label, - // Cell: CellForceWidth, + Cell: CellForceWidth, accessor: `cells[${index}].value`, forceWidthAccess: `cells[0].value`, className: column.key, diff --git a/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryTable.js b/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryTable.js index 7cb510ab9..55d57644a 100644 --- a/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryTable.js +++ b/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryTable.js @@ -25,7 +25,7 @@ export default function VendorsBalanceSummaryTable({ const columns = useVendorsBalanceColumns(); const rowClassNames = (row) => { - return [`row-type--${row.original.rowTypes}`]; + return [`row-type--${row.original.row_types}`]; }; return ( diff --git a/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsTable.js b/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsTable.js index 98343c537..637115d88 100644 --- a/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsTable.js +++ b/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsTable.js @@ -32,7 +32,7 @@ export default function VendorsTransactionsTable({ ]); const rowClassNames = (row) => { - return [`row-type--${row.original.rowTypes}`]; + return [`row-type--${row.original.row_types}`]; }; return ( diff --git a/src/style/pages/FinancialStatements/CashFlowStatement.scss b/src/style/pages/FinancialStatements/CashFlowStatement.scss index 2ff22b8f2..419d7c8c1 100644 --- a/src/style/pages/FinancialStatements/CashFlowStatement.scss +++ b/src/style/pages/FinancialStatements/CashFlowStatement.scss @@ -10,7 +10,11 @@ } .tbody { .tr:not(.no-results) { - &.row-type--CASH_END_PERIOD{ + // &.row-type--AGGREGATE, + &.row-type--ACCOUNTS { + border-top: 1px solid #bbb; + } + &.row-type--CASH_END_PERIOD { border-bottom: 3px double #333; } .td { @@ -30,7 +34,7 @@ .tr.is-expanded { .td.total, - .td.date-period{ + .td.date-period { .cell-inner { display: none; } diff --git a/src/style/pages/FinancialStatements/ContactsBalanceSummary.scss b/src/style/pages/FinancialStatements/ContactsBalanceSummary.scss index 5a2ce5c5e..def379b49 100644 --- a/src/style/pages/FinancialStatements/ContactsBalanceSummary.scss +++ b/src/style/pages/FinancialStatements/ContactsBalanceSummary.scss @@ -11,6 +11,10 @@ } .tbody { .tr:not(.no-results) { + &.row-type--CUSTOMER, + &.row-type--VENDOR { + border-top: 1px solid #BBB + } .td { border-bottom: 0; padding-top: 0.4rem;