diff --git a/packages/webapp/src/components/FinancialSheet/FinancialSheet.tsx b/packages/webapp/src/components/FinancialSheet/FinancialSheet.tsx
index 7f3153fc8..b82b69fe1 100644
--- a/packages/webapp/src/components/FinancialSheet/FinancialSheet.tsx
+++ b/packages/webapp/src/components/FinancialSheet/FinancialSheet.tsx
@@ -3,7 +3,7 @@ import React, { useMemo, useCallback } from 'react';
import moment from 'moment';
import intl from 'react-intl-universal';
-import { If, FormattedMessage as T } from '@/components';
+import { FormattedMessage as T } from '@/components';
import {
FinancialSheetRoot,
FinancialSheetFooterCurrentTime,
@@ -23,9 +23,7 @@ import {
export function FinancialSheet({
companyName,
sheetType,
- fromDate,
- toDate,
- asDate,
+ dateText,
children,
accountingBasis,
basis,
@@ -34,19 +32,6 @@ export function FinancialSheet({
currentDate = true,
className,
}) {
- const format = 'DD MMMM YYYY';
- const formattedFromDate = useMemo(
- () => moment(fromDate).format(format),
- [fromDate],
- );
- const formattedToDate = useMemo(
- () => moment(toDate).format(format),
- [toDate],
- );
- const formattedAsDate = useMemo(
- () => moment(asDate).format(format),
- [asDate],
- );
const methodsLabels = useMemo(
() => ({
cash: intl.get('cash'),
@@ -69,15 +54,7 @@ export function FinancialSheet({
{companyName && {companyName}}
{sheetType && {sheetType}}
-
-
- {formattedAsDate}
-
-
- {formattedFromDate} | {' '}
- {formattedToDate}
-
-
+ {dateText && {dateText}}
{children}
diff --git a/packages/webapp/src/containers/FinancialStatements/APAgingSummary/APAgingSummaryTable.tsx b/packages/webapp/src/containers/FinancialStatements/APAgingSummary/APAgingSummaryTable.tsx
index 0c04fc9aa..a14eea73b 100644
--- a/packages/webapp/src/containers/FinancialStatements/APAgingSummary/APAgingSummaryTable.tsx
+++ b/packages/webapp/src/containers/FinancialStatements/APAgingSummary/APAgingSummaryTable.tsx
@@ -20,7 +20,7 @@ export default function APAgingSummaryTable({
}) {
// AP aging summary report content.
const {
- APAgingSummary: { table, query },
+ APAgingSummary: { table, query, meta },
isAPAgingLoading,
} = useAPAgingSummaryContext();
@@ -31,7 +31,7 @@ export default function APAgingSummaryTable({
diff --git a/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsTable.tsx b/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsTable.tsx
index b33e81db2..22d82fafc 100644
--- a/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsTable.tsx
+++ b/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsTable.tsx
@@ -18,7 +18,7 @@ export function InventoryItemDetailsTable({
companyName,
}) {
const {
- inventoryItemDetails: { tableRows },
+ inventoryItemDetails: { tableRows, meta },
isInventoryItemDetailsLoading,
query,
} = useInventoryItemDetailsContext();
@@ -35,8 +35,7 @@ export function InventoryItemDetailsTable({
companyName={companyName}
sheetType={intl.get('inventory_item_details')}
loading={isInventoryItemDetailsLoading}
- fromDate={query.fromDate}
- toDate={query.toDate}
+ dateText={meta?.formatted_date_range ?? meta?.formatted_as_date}
fullWidth={true}
>
}
- fromDate={query.from_date}
- toDate={query.to_date}
+ dateText={meta?.formatted_date_range ?? meta?.formatted_as_date}
basis={query.basis}
>
diff --git a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.tsx b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.tsx
index 28659d404..e6d884529 100644
--- a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.tsx
+++ b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.tsx
@@ -17,7 +17,7 @@ import { usePurchasesByItemsTableColumns } from './dynamicColumns';
export default function PurchasesByItemsTable({ companyName }) {
// Purchases by items context.
const {
- purchaseByItems: { table, query },
+ purchaseByItems: { table, query, meta },
} = usePurchaseByItemsContext();
// Purchases by items table columns.
@@ -27,8 +27,7 @@ export default function PurchasesByItemsTable({ companyName }) {
({
query: res.data.query,
table: res.data.table,
+ meta: res.data.meta,
}),
defaultData: {
table: {},
query: {},
+ meta: {},
},
...props,
},
diff --git a/packages/webapp/src/hooks/query/FinancialReports/use-customer-transactions.ts b/packages/webapp/src/hooks/query/FinancialReports/use-customer-transactions.ts
index f2760b8ae..1238bdfda 100644
--- a/packages/webapp/src/hooks/query/FinancialReports/use-customer-transactions.ts
+++ b/packages/webapp/src/hooks/query/FinancialReports/use-customer-transactions.ts
@@ -22,10 +22,12 @@ export function useCustomersTransactionsReport(query, props) {
select: (res) => ({
data: res.data.table,
tableRows: res.data.table.rows,
+ meta: res.data.meta,
}),
defaultData: {
tableRows: [],
data: [],
+ meta: {},
},
...props,
},
diff --git a/packages/webapp/src/hooks/query/FinancialReports/use-vendor-balance-summary.ts b/packages/webapp/src/hooks/query/FinancialReports/use-vendor-balance-summary.ts
index 0249beeb6..8ce3a7756 100644
--- a/packages/webapp/src/hooks/query/FinancialReports/use-vendor-balance-summary.ts
+++ b/packages/webapp/src/hooks/query/FinancialReports/use-vendor-balance-summary.ts
@@ -22,10 +22,12 @@ export function useVendorsBalanceSummaryReport(query, props) {
select: (res) => ({
query: res.data.query,
table: res.data.table,
+ meta: res.data.meta,
}),
defaultData: {
table: {},
query: {},
+ meta: {},
},
...props,
},