QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-21 15:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(server): change the default from/date date value of reports

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2023-08-27 15:50:52 +02:00
parent 251c54be60
commit c7a3bac44c
15 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/server/src/services/FinancialStatements/BalanceSheet/BalanceSheetService.ts
View File

@@ -37,7 +37,7 @@ export default class BalanceSheetStatementService
displayColumnsBy: 'month', displayColumnsBy: 'month',
fromDate: moment().startOf('year').format('YYYY-MM-DD'), fromDate: moment().startOf('year').format('YYYY-MM-DD'),
toDate: moment().endOf('year').format('YYYY-MM-DD'), toDate: moment().format('YYYY-MM-DD'),
numberFormat: { numberFormat: {
precision: 2, precision: 2,

2
packages/server/src/services/FinancialStatements/CashFlow/CashFlowService.ts
View File

@@ -40,7 +40,7 @@ export default class CashFlowStatementService
displayColumnsType: 'total', displayColumnsType: 'total',
displayColumnsBy: 'day', displayColumnsBy: 'day',
fromDate: moment().startOf('year').format('YYYY-MM-DD'), fromDate: moment().startOf('year').format('YYYY-MM-DD'),
toDate: moment().endOf('year').format('YYYY-MM-DD'), toDate: moment().format('YYYY-MM-DD'),
numberFormat: { numberFormat: {
precision: 2, precision: 2,
divideOn1000: false, divideOn1000: false,

4
packages/server/src/services/FinancialStatements/GeneralLedger/GeneralLedgerService.ts
View File

@@ -31,8 +31,8 @@ export default class GeneralLedgerService {
*/ */
get defaultQuery() { get defaultQuery() {
return { return {
fromDate: moment().startOf('year').format('YYYY-MM-DD'), fromDate: moment().startOf('month').format('YYYY-MM-DD'),
toDate: moment().endOf('year').format('YYYY-MM-DD'), toDate: moment().format('YYYY-MM-DD'),
basis: 'cash', basis: 'cash',
numberFormat: { numberFormat: {
noCents: false, noCents: false,

10
packages/server/src/services/FinancialStatements/InventoryDetails/InventoryDetailsService.ts
View File

@@ -16,13 +16,13 @@ import { Tenant } from '@/system/models';
@Service() @Service()
export default class InventoryDetailsService extends FinancialSheet { export default class InventoryDetailsService extends FinancialSheet {
@Inject() @Inject()
tenancy: TenancyService; private tenancy: TenancyService;
@Inject() @Inject()
reportRepo: InventoryDetailsRepository; private reportRepo: InventoryDetailsRepository;
@Inject() @Inject()
inventoryService: InventoryService; private inventoryService: InventoryService;
/** /**
* Defaults balance sheet filter query. * Defaults balance sheet filter query.
@@ -30,8 +30,8 @@ export default class InventoryDetailsService extends FinancialSheet {
*/ */
private get defaultQuery(): IInventoryDetailsQuery { private get defaultQuery(): IInventoryDetailsQuery {
return { return {
fromDate: moment().startOf('year').format('YYYY-MM-DD'), fromDate: moment().startOf('month').format('YYYY-MM-DD'),
toDate: moment().endOf('year').format('YYYY-MM-DD'), toDate: moment().format('YYYY-MM-DD'),
itemsIds: [], itemsIds: [],
numberFormat: { numberFormat: {
precision: 2, precision: 2,

2
packages/server/src/services/FinancialStatements/InventoryValuationSheet/InventoryValuationSheetService.ts
View File

@@ -27,7 +27,7 @@ export default class InventoryValuationSheetService {
*/ */
get defaultQuery(): IInventoryValuationReportQuery { get defaultQuery(): IInventoryValuationReportQuery {
return { return {
asDate: moment().endOf('year').format('YYYY-MM-DD'), asDate: moment().format('YYYY-MM-DD'),
itemsIds: [], itemsIds: [],
numberFormat: { numberFormat: {
precision: 2, precision: 2,

4
packages/server/src/services/FinancialStatements/JournalSheet/JournalSheetService.ts
View File

@@ -25,8 +25,8 @@ export default class JournalSheetService {
*/ */
get defaultQuery() { get defaultQuery() {
return { return {
fromDate: moment().startOf('year').format('YYYY-MM-DD'), fromDate: moment().startOf('month').format('YYYY-MM-DD'),
toDate: moment().endOf('year').format('YYYY-MM-DD'), toDate: moment().format('YYYY-MM-DD'),
fromRange: null, fromRange: null,
toRange: null, toRange: null,
accountsIds: [], accountsIds: [],

2
packages/server/src/services/FinancialStatements/ProfitLossSheet/utils.ts
View File

@@ -8,7 +8,7 @@ import { IProfitLossSheetQuery } from '@/interfaces';
*/ */
export const getDefaultPLQuery = (): IProfitLossSheetQuery => ({ export const getDefaultPLQuery = (): IProfitLossSheetQuery => ({
fromDate: moment().startOf('year').format('YYYY-MM-DD'), fromDate: moment().startOf('year').format('YYYY-MM-DD'),
toDate: moment().endOf('year').format('YYYY-MM-DD'), toDate: moment().format('YYYY-MM-DD'),
numberFormat: { numberFormat: {
divideOn1000: false, divideOn1000: false,

19
packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsService.ts
View File

@@ -12,10 +12,7 @@ import { Tenant } from '@/system/models';
@Service() @Service()
export default class InventoryValuationReportService { export default class InventoryValuationReportService {
@Inject() @Inject()
tenancy: TenancyService; private tenancy: TenancyService;
@Inject('logger')
logger: any;
/** /**
* Defaults balance sheet filter query. * Defaults balance sheet filter query.
@@ -23,8 +20,8 @@ export default class InventoryValuationReportService {
*/ */
get defaultQuery(): IInventoryValuationReportQuery { get defaultQuery(): IInventoryValuationReportQuery {
return { return {
fromDate: moment().startOf('year').format('YYYY-MM-DD'), fromDate: moment().startOf('month').format('YYYY-MM-DD'),
toDate: moment().endOf('year').format('YYYY-MM-DD'), toDate: moment().format('YYYY-MM-DD'),
itemsIds: [], itemsIds: [],
numberFormat: { numberFormat: {
precision: 2, precision: 2,
@@ -73,9 +70,9 @@ export default class InventoryValuationReportService {
tenantId: number, tenantId: number,
query: IInventoryValuationReportQuery query: IInventoryValuationReportQuery
): Promise<{ ): Promise<{
data: IInventoryValuationStatement, data: IInventoryValuationStatement;
query: IInventoryValuationReportQuery, query: IInventoryValuationReportQuery;
meta: IInventoryValuationSheetMeta, meta: IInventoryValuationSheetMeta;
}> { }> {
const { Item, InventoryTransaction } = this.tenancy.models(tenantId); const { Item, InventoryTransaction } = this.tenancy.models(tenantId);
@@ -87,7 +84,7 @@ export default class InventoryValuationReportService {
...this.defaultQuery, ...this.defaultQuery,
...query, ...query,
}; };
const inventoryItems = await Item.query().onBuild(q => { const inventoryItems = await Item.query().onBuild((q) => {
q.where('type', 'inventory'); q.where('type', 'inventory');
if (filter.itemsIds.length > 0) { if (filter.itemsIds.length > 0) {
@@ -106,7 +103,7 @@ export default class InventoryValuationReportService {
builder.whereIn('itemId', inventoryItemsIds); builder.whereIn('itemId', inventoryItemsIds);
// Filter the date range of the sheet. // Filter the date range of the sheet.
builder.modify('filterDateRange', filter.fromDate, filter.toDate) builder.modify('filterDateRange', filter.fromDate, filter.toDate);
} }
); );

4
packages/server/src/services/FinancialStatements/SalesByItems/SalesByItemsService.ts
View File

@@ -23,8 +23,8 @@ export default class SalesByItemsReportService {
*/ */
get defaultQuery(): ISalesByItemsReportQuery { get defaultQuery(): ISalesByItemsReportQuery {
return { return {
fromDate: moment().startOf('year').format('YYYY-MM-DD'), fromDate: moment().startOf('month').format('YYYY-MM-DD'),
toDate: moment().endOf('year').format('YYYY-MM-DD'), toDate: moment().format('YYYY-MM-DD'),
itemsIds: [], itemsIds: [],
numberFormat: { numberFormat: {
precision: 2, precision: 2,

4
packages/server/src/services/FinancialStatements/TransactionsByCustomer/TransactionsByCustomersService.ts
View File

@@ -31,8 +31,8 @@ export default class TransactionsByCustomersService
*/ */
get defaultQuery(): ITransactionsByCustomersFilter { get defaultQuery(): ITransactionsByCustomersFilter {
return { return {
fromDate: moment().startOf('year').format('YYYY-MM-DD'), fromDate: moment().startOf('month').format('YYYY-MM-DD'),
toDate: moment().endOf('year').format('YYYY-MM-DD'), toDate: moment().format('YYYY-MM-DD'),
numberFormat: { numberFormat: {
precision: 2, precision: 2,
divideOn1000: false, divideOn1000: false,

2
packages/server/src/services/FinancialStatements/TransactionsByVendor/TransactionsByVendorService.ts
View File

@@ -32,7 +32,7 @@ export default class TransactionsByVendorsService
*/ */
get defaultQuery(): ITransactionsByVendorsFilter { get defaultQuery(): ITransactionsByVendorsFilter {
return { return {
fromDate: moment().format('YYYY-MM-DD'), fromDate: moment().startOf('month').format('YYYY-MM-DD'),
toDate: moment().format('YYYY-MM-DD'), toDate: moment().format('YYYY-MM-DD'),
numberFormat: { numberFormat: {
precision: 2, precision: 2,

2
packages/server/src/services/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetService.ts
View File

@@ -27,7 +27,7 @@ export default class TrialBalanceSheetService extends FinancialSheet {
get defaultQuery(): ITrialBalanceSheetQuery { get defaultQuery(): ITrialBalanceSheetQuery {
return { return {
fromDate: moment().startOf('year').format('YYYY-MM-DD'), fromDate: moment().startOf('year').format('YYYY-MM-DD'),
toDate: moment().endOf('year').format('YYYY-MM-DD'), toDate: moment().format('YYYY-MM-DD'),
numberFormat: { numberFormat: {
divideOn1000: false, divideOn1000: false,
negativeFormat: 'mines', negativeFormat: 'mines',

4
packages/webapp/src/containers/FinancialStatements/APAgingSummary/APAgingSummaryTable.tsx
View File

@@ -20,7 +20,7 @@ export default function APAgingSummaryTable({
}) { }) {
// AP aging summary report content. // AP aging summary report content.
const { const {
APAgingSummary: { table }, APAgingSummary: { table, query },
isAPAgingLoading, isAPAgingLoading,
} = useAPAgingSummaryContext(); } = useAPAgingSummaryContext();
@@ -31,7 +31,7 @@ export default function APAgingSummaryTable({
<FinancialSheet <FinancialSheet
companyName={organizationName} companyName={organizationName}
sheetType={intl.get('payable_aging_summary')} sheetType={intl.get('payable_aging_summary')}
asDate={new Date()} asDate={query.as_date}
loading={isAPAgingLoading} loading={isAPAgingLoading}
> >
<APAgingSummaryDataTable <APAgingSummaryDataTable

5
packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryTable.tsx
View File

@@ -9,7 +9,6 @@ import { tableRowTypesToClassnames } from '@/utils';
import { useVendorsBalanceColumns } from './components'; import { useVendorsBalanceColumns } from './components';
import { useVendorsBalanceSummaryContext } from './VendorsBalanceSummaryProvider'; import { useVendorsBalanceSummaryContext } from './VendorsBalanceSummaryProvider';
/** /**
* Vendors balance summary table. * Vendors balance summary table.
*/ */
@@ -18,7 +17,7 @@ export default function VendorsBalanceSummaryTable({
organizationName, organizationName,
}) { }) {
const { const {
VendorBalanceSummary: { table }, VendorBalanceSummary: { table, query },
} = useVendorsBalanceSummaryContext(); } = useVendorsBalanceSummaryContext();
// vendors balance summary columns. // vendors balance summary columns.
@@ -28,7 +27,7 @@ export default function VendorsBalanceSummaryTable({
<VendorBalanceFinancialSheet <VendorBalanceFinancialSheet
companyName={organizationName} companyName={organizationName}
sheetType={intl.get('vendors_balance_summary')} sheetType={intl.get('vendors_balance_summary')}
asDate={new Date()} asDate={query.as_date}
> >
<VendorBalanceDataTable <VendorBalanceDataTable
columns={columns} columns={columns}

2
packages/webapp/src/containers/FinancialStatements/VendorsTransactions/_utils.ts
View File

@@ -19,7 +19,7 @@ export const getVendorTransactionsQuerySchema = () => {
* Retrieves the default query of vendors transactions. * Retrieves the default query of vendors transactions.
*/ */
export const getVendorsTransactionsDefaultQuery = () => ({ export const getVendorsTransactionsDefaultQuery = () => ({
fromDate: moment().toDate(), fromDate: moment().startOf('month').toDate(),
toDate: moment().toDate(), toDate: moment().toDate(),
vendorsIds: [], vendorsIds: [],
}); });