Merge remote-tracking branch 'refs/remotes/origin/develop' into develop

2026-02-17 21:30:31 +00:00 · 2023-08-28 21:03:23 +02:00
parent cb6dab08d8 5112ef9b64
commit 75d8864aae
36 changed files with 132 additions and 83 deletions
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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: [],
--- 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,
--- 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);
      }
    );

--- 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,
--- 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,
--- 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,
--- 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',