From c7a3bac44cad486107aad7ef6ce6b6c6e5e76013 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Sun, 27 Aug 2023 15:50:52 +0200 Subject: [PATCH] fix(server): change the default from/date date value of reports --- .../BalanceSheet/BalanceSheetService.ts | 2 +- .../CashFlow/CashFlowService.ts | 2 +- .../GeneralLedger/GeneralLedgerService.ts | 4 ++-- .../InventoryDetailsService.ts | 10 +++++----- .../InventoryValuationSheetService.ts | 2 +- .../JournalSheet/JournalSheetService.ts | 4 ++-- .../ProfitLossSheet/utils.ts | 2 +- .../PurchasesByItemsService.ts | 19 ++++++++----------- .../SalesByItems/SalesByItemsService.ts | 4 ++-- .../TransactionsByCustomersService.ts | 4 ++-- .../TransactionsByVendorService.ts | 2 +- .../TrialBalanceSheetService.ts | 2 +- .../APAgingSummary/APAgingSummaryTable.tsx | 4 ++-- .../VendorsBalanceSummaryTable.tsx | 5 ++--- .../VendorsTransactions/_utils.ts | 2 +- 15 files changed, 32 insertions(+), 36 deletions(-) diff --git a/packages/server/src/services/FinancialStatements/BalanceSheet/BalanceSheetService.ts b/packages/server/src/services/FinancialStatements/BalanceSheet/BalanceSheetService.ts index f674048bc..b0470c745 100644 --- a/packages/server/src/services/FinancialStatements/BalanceSheet/BalanceSheetService.ts +++ b/packages/server/src/services/FinancialStatements/BalanceSheet/BalanceSheetService.ts @@ -37,7 +37,7 @@ export default class BalanceSheetStatementService displayColumnsBy: 'month', fromDate: moment().startOf('year').format('YYYY-MM-DD'), - toDate: moment().endOf('year').format('YYYY-MM-DD'), + toDate: moment().format('YYYY-MM-DD'), numberFormat: { precision: 2, diff --git a/packages/server/src/services/FinancialStatements/CashFlow/CashFlowService.ts b/packages/server/src/services/FinancialStatements/CashFlow/CashFlowService.ts index 58fd5d2ad..09fdf91ca 100644 --- a/packages/server/src/services/FinancialStatements/CashFlow/CashFlowService.ts +++ b/packages/server/src/services/FinancialStatements/CashFlow/CashFlowService.ts @@ -40,7 +40,7 @@ export default class CashFlowStatementService displayColumnsType: 'total', displayColumnsBy: 'day', fromDate: moment().startOf('year').format('YYYY-MM-DD'), - toDate: moment().endOf('year').format('YYYY-MM-DD'), + toDate: moment().format('YYYY-MM-DD'), numberFormat: { precision: 2, divideOn1000: false, diff --git a/packages/server/src/services/FinancialStatements/GeneralLedger/GeneralLedgerService.ts b/packages/server/src/services/FinancialStatements/GeneralLedger/GeneralLedgerService.ts index 74633d81e..012a05b94 100644 --- a/packages/server/src/services/FinancialStatements/GeneralLedger/GeneralLedgerService.ts +++ b/packages/server/src/services/FinancialStatements/GeneralLedger/GeneralLedgerService.ts @@ -31,8 +31,8 @@ export default class GeneralLedgerService { */ get defaultQuery() { return { - fromDate: moment().startOf('year').format('YYYY-MM-DD'), - toDate: moment().endOf('year').format('YYYY-MM-DD'), + fromDate: moment().startOf('month').format('YYYY-MM-DD'), + toDate: moment().format('YYYY-MM-DD'), basis: 'cash', numberFormat: { noCents: false, diff --git a/packages/server/src/services/FinancialStatements/InventoryDetails/InventoryDetailsService.ts b/packages/server/src/services/FinancialStatements/InventoryDetails/InventoryDetailsService.ts index 7cc1d0667..cdeca4f39 100644 --- a/packages/server/src/services/FinancialStatements/InventoryDetails/InventoryDetailsService.ts +++ b/packages/server/src/services/FinancialStatements/InventoryDetails/InventoryDetailsService.ts @@ -16,13 +16,13 @@ import { Tenant } from '@/system/models'; @Service() export default class InventoryDetailsService extends FinancialSheet { @Inject() - tenancy: TenancyService; + private tenancy: TenancyService; @Inject() - reportRepo: InventoryDetailsRepository; + private reportRepo: InventoryDetailsRepository; @Inject() - inventoryService: InventoryService; + private inventoryService: InventoryService; /** * Defaults balance sheet filter query. @@ -30,8 +30,8 @@ export default class InventoryDetailsService extends FinancialSheet { */ private get defaultQuery(): IInventoryDetailsQuery { return { - fromDate: moment().startOf('year').format('YYYY-MM-DD'), - toDate: moment().endOf('year').format('YYYY-MM-DD'), + fromDate: moment().startOf('month').format('YYYY-MM-DD'), + toDate: moment().format('YYYY-MM-DD'), itemsIds: [], numberFormat: { precision: 2, diff --git a/packages/server/src/services/FinancialStatements/InventoryValuationSheet/InventoryValuationSheetService.ts b/packages/server/src/services/FinancialStatements/InventoryValuationSheet/InventoryValuationSheetService.ts index 41650ccde..75c871ce8 100644 --- a/packages/server/src/services/FinancialStatements/InventoryValuationSheet/InventoryValuationSheetService.ts +++ b/packages/server/src/services/FinancialStatements/InventoryValuationSheet/InventoryValuationSheetService.ts @@ -27,7 +27,7 @@ export default class InventoryValuationSheetService { */ get defaultQuery(): IInventoryValuationReportQuery { return { - asDate: moment().endOf('year').format('YYYY-MM-DD'), + asDate: moment().format('YYYY-MM-DD'), itemsIds: [], numberFormat: { precision: 2, diff --git a/packages/server/src/services/FinancialStatements/JournalSheet/JournalSheetService.ts b/packages/server/src/services/FinancialStatements/JournalSheet/JournalSheetService.ts index f932efd8c..fe0a071ff 100644 --- a/packages/server/src/services/FinancialStatements/JournalSheet/JournalSheetService.ts +++ b/packages/server/src/services/FinancialStatements/JournalSheet/JournalSheetService.ts @@ -25,8 +25,8 @@ export default class JournalSheetService { */ get defaultQuery() { return { - fromDate: moment().startOf('year').format('YYYY-MM-DD'), - toDate: moment().endOf('year').format('YYYY-MM-DD'), + fromDate: moment().startOf('month').format('YYYY-MM-DD'), + toDate: moment().format('YYYY-MM-DD'), fromRange: null, toRange: null, accountsIds: [], diff --git a/packages/server/src/services/FinancialStatements/ProfitLossSheet/utils.ts b/packages/server/src/services/FinancialStatements/ProfitLossSheet/utils.ts index 8f17be584..85663a0b8 100644 --- a/packages/server/src/services/FinancialStatements/ProfitLossSheet/utils.ts +++ b/packages/server/src/services/FinancialStatements/ProfitLossSheet/utils.ts @@ -8,7 +8,7 @@ import { IProfitLossSheetQuery } from '@/interfaces'; */ export const getDefaultPLQuery = (): IProfitLossSheetQuery => ({ fromDate: moment().startOf('year').format('YYYY-MM-DD'), - toDate: moment().endOf('year').format('YYYY-MM-DD'), + toDate: moment().format('YYYY-MM-DD'), numberFormat: { divideOn1000: false, diff --git a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsService.ts b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsService.ts index 4c226e48a..df4aee1ad 100644 --- a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsService.ts +++ b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsService.ts @@ -12,10 +12,7 @@ import { Tenant } from '@/system/models'; @Service() export default class InventoryValuationReportService { @Inject() - tenancy: TenancyService; - - @Inject('logger') - logger: any; + private tenancy: TenancyService; /** * Defaults balance sheet filter query. @@ -23,8 +20,8 @@ export default class InventoryValuationReportService { */ get defaultQuery(): IInventoryValuationReportQuery { return { - fromDate: moment().startOf('year').format('YYYY-MM-DD'), - toDate: moment().endOf('year').format('YYYY-MM-DD'), + fromDate: moment().startOf('month').format('YYYY-MM-DD'), + toDate: moment().format('YYYY-MM-DD'), itemsIds: [], numberFormat: { precision: 2, @@ -73,9 +70,9 @@ export default class InventoryValuationReportService { tenantId: number, query: IInventoryValuationReportQuery ): Promise<{ - data: IInventoryValuationStatement, - query: IInventoryValuationReportQuery, - meta: IInventoryValuationSheetMeta, + data: IInventoryValuationStatement; + query: IInventoryValuationReportQuery; + meta: IInventoryValuationSheetMeta; }> { const { Item, InventoryTransaction } = this.tenancy.models(tenantId); @@ -87,7 +84,7 @@ export default class InventoryValuationReportService { ...this.defaultQuery, ...query, }; - const inventoryItems = await Item.query().onBuild(q => { + const inventoryItems = await Item.query().onBuild((q) => { q.where('type', 'inventory'); if (filter.itemsIds.length > 0) { @@ -106,7 +103,7 @@ export default class InventoryValuationReportService { builder.whereIn('itemId', inventoryItemsIds); // Filter the date range of the sheet. - builder.modify('filterDateRange', filter.fromDate, filter.toDate) + builder.modify('filterDateRange', filter.fromDate, filter.toDate); } ); diff --git a/packages/server/src/services/FinancialStatements/SalesByItems/SalesByItemsService.ts b/packages/server/src/services/FinancialStatements/SalesByItems/SalesByItemsService.ts index 8d0032f7a..7570ef572 100644 --- a/packages/server/src/services/FinancialStatements/SalesByItems/SalesByItemsService.ts +++ b/packages/server/src/services/FinancialStatements/SalesByItems/SalesByItemsService.ts @@ -23,8 +23,8 @@ export default class SalesByItemsReportService { */ get defaultQuery(): ISalesByItemsReportQuery { return { - fromDate: moment().startOf('year').format('YYYY-MM-DD'), - toDate: moment().endOf('year').format('YYYY-MM-DD'), + fromDate: moment().startOf('month').format('YYYY-MM-DD'), + toDate: moment().format('YYYY-MM-DD'), itemsIds: [], numberFormat: { precision: 2, diff --git a/packages/server/src/services/FinancialStatements/TransactionsByCustomer/TransactionsByCustomersService.ts b/packages/server/src/services/FinancialStatements/TransactionsByCustomer/TransactionsByCustomersService.ts index 24723caaa..a6f56d9fe 100644 --- a/packages/server/src/services/FinancialStatements/TransactionsByCustomer/TransactionsByCustomersService.ts +++ b/packages/server/src/services/FinancialStatements/TransactionsByCustomer/TransactionsByCustomersService.ts @@ -31,8 +31,8 @@ export default class TransactionsByCustomersService */ get defaultQuery(): ITransactionsByCustomersFilter { return { - fromDate: moment().startOf('year').format('YYYY-MM-DD'), - toDate: moment().endOf('year').format('YYYY-MM-DD'), + fromDate: moment().startOf('month').format('YYYY-MM-DD'), + toDate: moment().format('YYYY-MM-DD'), numberFormat: { precision: 2, divideOn1000: false, diff --git a/packages/server/src/services/FinancialStatements/TransactionsByVendor/TransactionsByVendorService.ts b/packages/server/src/services/FinancialStatements/TransactionsByVendor/TransactionsByVendorService.ts index 18be5b7ed..c112a059a 100644 --- a/packages/server/src/services/FinancialStatements/TransactionsByVendor/TransactionsByVendorService.ts +++ b/packages/server/src/services/FinancialStatements/TransactionsByVendor/TransactionsByVendorService.ts @@ -32,7 +32,7 @@ export default class TransactionsByVendorsService */ get defaultQuery(): ITransactionsByVendorsFilter { return { - fromDate: moment().format('YYYY-MM-DD'), + fromDate: moment().startOf('month').format('YYYY-MM-DD'), toDate: moment().format('YYYY-MM-DD'), numberFormat: { precision: 2, diff --git a/packages/server/src/services/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetService.ts b/packages/server/src/services/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetService.ts index e06ed6b02..f22624a3e 100644 --- a/packages/server/src/services/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetService.ts +++ b/packages/server/src/services/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetService.ts @@ -27,7 +27,7 @@ export default class TrialBalanceSheetService extends FinancialSheet { get defaultQuery(): ITrialBalanceSheetQuery { return { fromDate: moment().startOf('year').format('YYYY-MM-DD'), - toDate: moment().endOf('year').format('YYYY-MM-DD'), + toDate: moment().format('YYYY-MM-DD'), numberFormat: { divideOn1000: false, negativeFormat: 'mines', diff --git a/packages/webapp/src/containers/FinancialStatements/APAgingSummary/APAgingSummaryTable.tsx b/packages/webapp/src/containers/FinancialStatements/APAgingSummary/APAgingSummaryTable.tsx index 96924e97b..115a8a887 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 }, + APAgingSummary: { table, query }, isAPAgingLoading, } = useAPAgingSummaryContext(); @@ -31,7 +31,7 @@ export default function APAgingSummaryTable({ { * Retrieves the default query of vendors transactions. */ export const getVendorsTransactionsDefaultQuery = () => ({ - fromDate: moment().toDate(), + fromDate: moment().startOf('month').toDate(), toDate: moment().toDate(), vendorsIds: [], });