Publish

- @bigcapital/server@0.10.1 - @bigcapital/webapp@0.10.2
tst
2023-10-03 22:07:42 +02:00 · 2023-10-03 22:06:33 +02:00 · 2023-10-03 22:05:57 +02:00 · 2023-10-03 12:11:55 +02:00 · 2023-09-29 15:54:47 +02:00 · 2023-09-27 22:44:54 +02:00
1361 changed files with 38302 additions and 57573 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -60,78 +60,6 @@
      "contributions": [
        "bug"
      ]
-    },
-    {
-      "login": "kochie",
-      "name": "Robert Koch",
-      "avatar_url": "https://avatars.githubusercontent.com/u/10809884?v=4",
-      "profile": "https://me.kochie.io",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "cschuijt",
-      "name": "Casper Schuijt",
-      "avatar_url": "https://avatars.githubusercontent.com/u/5460015?v=4",
-      "profile": "http://cschuijt.nl",
-      "contributions": [
-        "bug"
-      ]
-    },
-    {
-      "login": "ANasouf",
-      "name": "ANasouf",
-      "avatar_url": "https://avatars.githubusercontent.com/u/19536487?v=4",
-      "profile": "https://github.com/ANasouf",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "xprnio",
-      "name": "Ragnar Laud",
-      "avatar_url": "https://avatars.githubusercontent.com/u/3042904?v=4",
-      "profile": "https://ragnarlaud.dev",
-      "contributions": [
-        "bug"
-      ]
-    },
-    {
-      "login": "asenawritescode",
-      "name": "Asena",
-      "avatar_url": "https://avatars.githubusercontent.com/u/67445192?v=4",
-      "profile": "https://github.com/asenawritescode",
-      "contributions": [
-        "bug"
-      ]
-    },
-    {
-      "login": "benpsnyder",
-      "name": "Ben Snyder",
-      "avatar_url": "https://avatars.githubusercontent.com/u/707567?v=4",
-      "profile": "https://snyder.tech",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "cloudsbird",
-      "name": "Vederis Leunardus",
-      "avatar_url": "https://avatars.githubusercontent.com/u/13505006?v=4",
-      "profile": "http://vederis.id",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "ccantrell72",
-      "name": "Chris Cantrell",
-      "avatar_url": "https://avatars.githubusercontent.com/u/104120598?v=4",
-      "profile": "http://www.pivoten.com",
-      "contributions": [
-        "bug"
-      ]
    }
  ],
  "contributorsPerLine": 7,
--- a/.env.example
+++ b/.env.example
@@ -8,7 +8,7 @@ MAIL_FROM_NAME=
 MAIL_FROM_ADDRESS=

 # Database
-DB_HOST=localhost
+DB_HOST=mysql
 DB_USER=bigcapital
 DB_PASSWORD=bigcapital
 DB_ROOT_PASSWORD=root
@@ -48,65 +48,5 @@ SIGNUP_DISABLED=false
 SIGNUP_ALLOWED_DOMAINS=
 SIGNUP_ALLOWED_EMAILS=

-# Sign-up Email Confirmation
-SIGNUP_EMAIL_CONFIRMATION=false
-
 # API rate limit (points,duration,block duration).
-API_RATE_LIMIT=120,60,600
-
-# Gotenberg API for PDF printing - (production).
-GOTENBERG_URL=http://gotenberg:3000
-GOTENBERG_DOCS_URL=http://server:3000/public/
-
-# Gotenberg API - (development)
-# GOTENBERG_URL=http://localhost:9000
-# GOTENBERG_DOCS_URL=http://host.docker.internal:3000/public/
-
-# Exchange Rate Service
-EXCHANGE_RATE_SERVICE=open-exchange-rate
-
-# Open Exchange Rate
-OPEN_EXCHANGE_RATE_APP_ID=
-
-# The Plaid environment to use ('sandbox' or 'development').
-# https://plaid.com/docs/#api-host
-PLAID_ENV=sandbox
-
-# Your Plaid keys, which can be found in the Plaid Dashboard.
-# https://dashboard.plaid.com/account/keys
-PLAID_CLIENT_ID=
-PLAID_SECRET_DEVELOPMENT=
-PLAID_SECRET_SANDBOX=
-
-PLAID_LINK_WEBHOOK=
-
-# (Optional) Redirect URI settings section
-# Only required for OAuth redirect URI testing (not common on desktop):
-# Sandbox Mode:
-# Set the PLAID_SANDBOX_REDIRECT_URI below to 'http://localhost:3001/oauth-link'.
-# The OAuth redirect flow requires an endpoint on the developer's website
-# that the bank website should redirect to. You will also need to configure
-# this redirect URI for your client ID through the Plaid developer dashboard
-# at https://dashboard.plaid.com/team/api.
-# Development mode:
-# When running in development mode, you must use an https:// url.
-# You will need to configure this https:// redirect URI in the Plaid developer dashboard.
-# Instructions to create a self-signed certificate for localhost can be found at
-# https://github.com/plaid/pattern/blob/master/README.md#testing-oauth.
-# If your system is not set up to run localhost with https://, you will be unable to test
-# the OAuth in development and should leave the PLAID_DEVELOPMENT_REDIRECT_URI blank.
-
-PLAID_SANDBOX_REDIRECT_URI=
-PLAID_DEVELOPMENT_REDIRECT_URI=
-
-# https://docs.lemonsqueezy.com/guides/developer-guide/getting-started#create-an-api-key
-LEMONSQUEEZY_API_KEY=
-LEMONSQUEEZY_STORE_ID=
-LEMONSQUEEZY_WEBHOOK_SECRET=
-
-# S3 documents and attachments 
-S3_REGION=
-S3_ACCESS_KEY_ID=
-S3_SECRET_ACCESS_KEY=
-S3_ENDPOINT=
-S3_BUCKET=
+API_RATE_LIMIT=120,60,600
--- a/.github/workflows/build-deploy-container.yml
+++ b/.github/workflows/build-deploy-container.yml
@@ -6,66 +6,43 @@ on:
  workflow_dispatch:

 env:
-  WEBAPP_IMAGE_NAME: bigcapitalhq/webapp
-  SERVER_IMAGE_NAME: bigcapitalhq/server
+  REGISTRY: ghcr.io
+  WEBAPP_IMAGE_NAME: bigcapital/bigcapital-webapp
+  SERVER_IMAGE_NAME: bigcapital/bigcapital-server

 jobs:
  build-publish-webapp:
-    strategy:
-      fail-fast: false
    name: Build and deploy webapp container
    runs-on: ubuntu-latest
    environment: production
    steps:
-      - name: Prepare
-        run: |
-          platform=${{ matrix.platform }}
-          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
-
      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: actions/checkout@v2

      # Login to Container registry.
      - name: Log in to the Container registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+            registry: ${{ env.REGISTRY }}
+            username: ${{ github.actor }}
+            password: ${{ secrets.GH_TOKEN }}

      - name: Extract metadata (tags, labels) for Docker
        id: meta
        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
        with:
-            images: ${{ env.WEBAPP_IMAGE_NAME }}
+            images: ${{ env.REGISTRY }}/${{ env.WEBAPP_IMAGE_NAME }}

      # Builds and push the Docker image.
      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        id: build
+        uses: docker/build-push-action@v2
        with:
-          context: ./
-          file: ./packages/webapp/Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: true
-          labels: ${{ steps.meta.outputs.labels }}
-          tags: bigcapitalhq/webapp:latest, bigcapitalhq/webapp:${{github.ref_name}}
+            context: .
+            file: ./packages/webapp/Dockerfile
+            push: true
+            tags: ghcr.io/bigcapitalhq/webapp:latest
+            labels: ${{ steps.meta.outputs.labels }}

-      - name: Export digest
-        run: |
-          mkdir -p /tmp/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"
-
-      - name: Upload digest
-        uses: actions/upload-artifact@v4
-        with:
-          name: digests-webapp
-          path: /tmp/digests/*
-          if-no-files-found: error
-          retention-days: 1
      # Send notification to Slack channel.
      - name: Slack Notification built and published webapp container successfully.
        uses: rtCamp/action-slack-notify@v2
@@ -76,52 +53,29 @@ jobs:
    name: Build and deploy server container
    runs-on: ubuntu-latest
    steps:
-      - name: Prepare
-        run: |
-          platform=${{ matrix.platform }}
-          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+      - name: Checkout code
+        uses: actions/checkout@v2

      # Login to Container registry.
      - name: Log in to the Container registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GH_TOKEN }}

      # Builds and push the Docker image.
      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        id: build
+        uses: docker/build-push-action@v2
        with:
          context: ./
          file: ./packages/server/Dockerfile
-          platforms: linux/amd64,linux/arm64
          push: true
-          tags: bigcapitalhq/server:latest, bigcapitalhq/server:${{github.ref_name}}
+          tags: ghcr.io/bigcapitalhq/server:latest
          labels: ${{ steps.meta.outputs.labels }}

-      - name: Export digest
-        run: |
-          mkdir -p /tmp/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"
-  
-      - name: Upload digest
-        uses: actions/upload-artifact@v4
-        with:
-          name: digests-server
-          path: /tmp/digests/*
-          if-no-files-found: error
-          retention-days: 1
-
      # Send notification to Slack channel.
      - name: Slack Notification built and published server container successfully.
        uses: rtCamp/action-slack-notify@v2
        env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
--- a/.github/workflows/build-deploy-develop-container.yaml
+++ b/.github/workflows/build-deploy-develop-container.yaml
@@ -1,127 +0,0 @@
-# This workflow will build a docker container, publish it to Github Registry.
-name: Build and Deploy Develop Docker Container
-on:
-  push:
-    branches:
-      - develop
-
-env:
-  WEBAPP_IMAGE_NAME: bigcapitalhq/webapp
-  SERVER_IMAGE_NAME: bigcapitalhq/server
-
-jobs:
-  build-publish-webapp:
-    strategy:
-      fail-fast: false
-    name: Build and deploy webapp container
-    runs-on: ubuntu-latest
-    environment: production
-    steps:
-      - name: Prepare
-        run: |
-          platform=${{ matrix.platform }}
-          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      # Login to Container registry.
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
-        with:
-          images: ${{ env.WEBAPP_IMAGE_NAME }}
-
-      # Builds and push the Docker image.
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        id: build
-        with:
-          context: ./
-          file: ./packages/webapp/Dockerfile
-          platforms: linux/amd64
-          push: true
-          labels: ${{ steps.meta.outputs.labels }}
-          tags: bigcapitalhq/webapp:develop
-
-      - name: Export digest
-        run: |
-          mkdir -p /tmp/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"
-
-      - name: Upload digest
-        uses: actions/upload-artifact@v4
-        with:
-          name: digests-webapp
-          path: /tmp/digests/*
-          if-no-files-found: error
-          retention-days: 1
-      # Send notification to Slack channel.
-      - name: Slack Notification built and published webapp container successfully.
-        uses: rtCamp/action-slack-notify@v2
-        env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-
-  build-publish-server:
-    name: Build and deploy server container
-    runs-on: ubuntu-latest
-    steps:
-      - name: Prepare
-        run: |
-          platform=${{ matrix.platform }}
-          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      # Login to Container registry.
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      # Builds and push the Docker image.
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        id: build
-        with:
-          context: ./
-          file: ./packages/server/Dockerfile
-          platforms: linux/amd64
-          push: true
-          tags: bigcapitalhq/server:develop
-          labels: ${{ steps.meta.outputs.labels }}
-
-      - name: Export digest
-        run: |
-          mkdir -p /tmp/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"
-
-      - name: Upload digest
-        uses: actions/upload-artifact@v4
-        with:
-          name: digests-server
-          path: /tmp/digests/*
-          if-no-files-found: error
-          retention-days: 1
-
-      # Send notification to Slack channel.
-      - name: Slack Notification built and published server container successfully.
-        uses: rtCamp/action-slack-notify@v2
-        env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -8,14 +8,14 @@ on:
      - '**.ts'
      - '**.tsx'
      - '**/tsconfig.json'
-      - 'pnpm-lock.yaml'
+      - 'yarn.lock'
      - '.github/workflows/e2e.yml'
  pull_request:
    paths:
      - '**.ts'
      - '**.tsx'
      - '**/tsconfig.json'
-      - 'pnpm-lock.yaml'
+      - 'yarn.lock'
      - '.github/workflows/e2e.yml'

 defaults:
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,22 +0,0 @@
-tasks:
-  - name: Init
-    init: |
-      pnpm install &&
-      cp .env.example .env &&
-      docker-compose up -d &&
-      pnpm run build:server &&
-      node packages/server/build/commands.js system:migrate:latest
-    command: | 
-      docker-compose up -d &&
-      pnpm run dev
-
-ports:
-  - port: 4000
-    visibility: public
-    onOpen: open-preview
-  - port: 3000
-    visibility: public
-    onOpen: ignore
-  - port: 3306
-    visibility: public
-    onOpen: ignore
--- a/.husky/commit-msg
+++ b/.husky/commit-msg
@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"

-pnpx commitlint --edit 
+yarn commitlint --edit 
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,147 +2,11 @@

 All notable changes to Bigcapital server-side will be in this file.

-## [0.16.11] - 06-05-2024
-
-### improvements
-
-* feat: Export resource data to csv, xlsx by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/430
-* feat: User email verification after signing-up. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/426
-
-### Fixes
-* feat(repo): upgrade to latest lerna v8 and pnpm v9 by @benpsnyder in https://github.com/bigcapitalhq/bigcapital/pull/414
-* feat: Update Docker Build-Push Action and Add ARM64 Support by @cloudsbird in https://github.com/bigcapitalhq/bigcapital/pull/412
-* feat: Pushing docker containers by version tag by @cloudsbird in https://github.com/bigcapitalhq/bigcapital/pull/421
-
-## [0.16.10]
-
-* fix: Running migration Docker container on Windows by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/432
-
-## [0.16.9]
-
-* feat: New Relic for tracking by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/429
-
-## [0.16.8]
-
-* feat: Ability to enable/disable the bank connect feature by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/423
-
-## [0.16.6]
-
-* hotfix: fix the subscription plan when subscribe on cloud by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/422
-
-## [0.16.5]
-
-IMPORTANT: If you upgraded to the v0.16 recently you should upgrade to v0.16.4 as soon as possible, because there're some breaking changes affected the sign-in and some users reported couldn't sign-in.
-
-* feat: Seed free subscription to tenants that have no subscription. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/410
-
-## [0.16.3]
-
-* feat: Integrate Lemon Squeezy payment by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/402
-* feat: optimize the onboarding subscription experience. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/404
-* feat: subscription page content by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/405
-* feat: auto subscribe to free plan once signup on community version. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/406
-* chore: add default value to env variable by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/407
-* fix: absolute storage imports path. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/408
-
-## [0.16.0]
-
-* feat: add convert to invoice button on estimate drawer toolbar by @ANasouf in https://github.com/bigcapitalhq/bigcapital/pull/361
-* feat(webapp): add mark as delivered to action bar of invoice details … by @ANasouf in https://github.com/bigcapitalhq/bigcapital/pull/360
-* feat(webapp): Dialog to choose the bank service provider by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/378
-* feat: Categorize the bank synced transactions by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/377
-* feat: uncategorize the cashflow transaction by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/381
-* Import resources from csv/xlsx by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/382
-* feat(webapp): import resource UI by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/386
-* fix: import resources improvements by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/388
-* feat: add sample sheet to accounts and bank transactions by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/389
-* fix: show the unique row value in the import preview by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/392
-* feat: advanced parser for numeric and boolean import values by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/394
-* feat: validate the given imported sheet whether is empty by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/395
-* feat: linking relation with id in importing by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/393
-* feat: Aggregate rows import by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/396
-* feat: clean up the imported temp files by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/400
-* feat: add hints to import fields by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/401
-
-## [0.15.0]
-
-* feat: Printing financial reports by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/363
-* feat: Convert invoice status after sending mail notification by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/332
-* feat: Bigcapital <> Plaid Integration by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/346
-* fix: Broken transactions by vendor report by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/369
-* fix: Optimize the print style some financial reports by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/370
-
-## [0.14.0] - 30-01-2024
-
-* feat: purchases by items exporting by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/327
-* fix: expense amounts should not be rounded by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/339
-* feat: get latest exchange rate from third party services by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/340
-* fix(webapp): inconsistency in currency of universal search items by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/335
-* hotfix: editing sales and expense transactions don't reflect GL entries by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/342
-
-## [0.13.3] - 22-01-2024
-
-* hotfix(server): Unhandled thrown errors of services by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/329
-
-## [0.13.2] - 21-01-2024
-
-* feat: show customer / vendor balance. by @asenawritescode in https://github.com/bigcapitalhq/bigcapital/pull/311
-* feat: inventory valuation csv and xlsx export by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/308
-* feat: sales by items export csv & xlsx by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/310
-* fix(server): the invoice and payment receipt printing by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/315
-* fix: get cashflow transaction broken cause transaction type by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/318
-* fix: `AccountActivateAlert` import by @xprnio in https://github.com/bigcapitalhq/bigcapital/pull/322
-
-## [0.13.1] - 15-01-2024
-
-* feat(webapp): add approve/reject to action bar of estimate details dr… by @ANasouf in https://github.com/bigcapitalhq/bigcapital/pull/304
-* docs: add ANasouf as a contributor for code by @allcontributors in https://github.com/bigcapitalhq/bigcapital/pull/305
-* feat: Export general ledger & Journal to CSV and XLSX by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/303
-* feat: Auto re-calculate the items rate once changing the invoice exchange rate. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/270
-
-## [0.13.0] - 31-12-2023
-
-* feat: Send an invoice mail the customer email by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/292
-* fix: Allow non-numeric postal codes by @cschuijt in https://github.com/bigcapitalhq/bigcapital/pull/294
-* docs: add cschuijt as a contributor for bug by @allcontributors in https://github.com/bigcapitalhq/bigcapital/pull/295
-
-## [0.12.1] - 17-11-2023
-
-* feat: Add default customer message and terms conditions to the transactions by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/291
-* fix: The currency code of transaction tax rate entry by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/293
-
-## [0.12.0] - 04-11-2023
-
-* feat: Export reports via CSV and XLSX by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/286
-* fix: Axios upgrade by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/288
-* fix(server): Allow decimal amount in sale/purchase transactions. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/289
-* feat: Optimize invoice documents printing by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/280
-* chore(deps): bump axios from 0.20.0 to 1.6.0 in /packages/server by @dependabot in https://github.com/bigcapitalhq/bigcapital/pull/284
-* chore(deps): bump axios from 0.20.0 to 1.6.0 by @dependabot in https://github.com/bigcapitalhq/bigcapital/pull/283
-
-## [0.11.0] - 28-10-2023
-
-* feat: Migrate to pnpm by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/253
-* feat: Integrate tax rates to bills by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/260
-* feat: Assign default sell/purchase tax rates to items by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/261
-* chore(deps-dev): bump @babel/traverse from 7.23.0 to 7.23.2 in /packages/server by @dependabot in https://github.com/bigcapitalhq/bigcapital/pull/272
-* feat: Improve financial statements rows color by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/276
-* fix: Trial balance sheet adjusted balance by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/273
-* feat: Adds tax numbers to organization and customers by @kochie in https://github.com/bigcapitalhq/bigcapital/pull/269
-* docs: Add kochie as a contributor for code by @allcontributors in https://github.com/bigcapitalhq/bigcapital/pull/277
-* feat: Computed Net Income under Equity in Balance Sheet report. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/271
-* fix: Change Dockerfile files with new pnpm by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/278
-
-## [0.10.2] - 02-10-2023
-
-fix(webapp): Disable tax rates from item entries editor table services do not support tax rates (https://github.com/bigcapitalhq/bigcapital/commit/69afa07e3ba45495a4cab3490c15f2b0c40c4790) by @abouolia 
-fix(server): Add missing method in ItemEntry model (https://github.com/bigcapitalhq/bigcapital/commit/07628ddc37f46c98959ced0323f28752e0a98944) by @abouolia
-
-## [0.10.1] - 25-09-2023
+# [0.10.1] - 25-09-2023

 * Fix: Running tenants migration on Docker migration container by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/242

-## [0.10.0] - 24-09-2023
+# [0.10.0] - 24-09-2023

 * Added: Tax rates service by @abouolia @elforjani13  in https://github.com/bigcapitalhq/bigcapital/pull/204
 * Added: Sales Tax Liability Summary report by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/204
@@ -152,7 +16,7 @@ fix(server): Add missing method in ItemEntry model (https://github.com/bigcapita
 * chore(deps): bump word-wrap from 1.2.3 to 1.2.4 in /packages/webapp by @dependabot in https://github.com/bigcapitalhq/bigcapital/pull/199
 * chore(deps): bump mongoose from 5.13.15 to 5.13.20 by @dependabot in https://github.com/bigcapitalhq/bigcapital/pull/197

-## [0.9.12] - 29-08-2023
+# [0.9.12] - 29-08-2023

 * Refactor: split the services to multiple service classes. (by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/202)
 * Fix: create quick customer/vendor by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/206
@@ -166,18 +30,18 @@ fix(server): Add missing method in ItemEntry model (https://github.com/bigcapita
 * Fix: filter by customers, vendors and items in reports do not work by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/224
 https://github.com/bigcapitalhq/bigcapital/pull/225

-## [0.9.11] - 23-07-2023
+# [0.9.11] - 23-07-2023

 * added: Restart policy to docker compose files. by @suhaibaffan in https://github.com/bigcapitalhq/bigcapital/pull/198
 * fix: Expose and expand the rate limit to the env variables by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/195

-## [0.9.10] - 18-07-2023
+# [0.9.10] - 18-07-2023

 * feat(e2e): E2E onboarding process by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/176
 * fix(webapp): Show loading message of cost computing job on financial reports by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/196
 * fix(webapp): Change the currency code of sales and purchases transactions with foreign contacts. 

-## [0.9.9] - 28-06-2023
+# [0.9.9] - 28-06-2023

 * refactor: Customer and vendor select component by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/171
 * chore: Move auto-increment components in separate files by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/170
@@ -189,7 +53,7 @@ https://github.com/bigcapitalhq/bigcapital/pull/225
 * fix: No currency in amount field on money in/out dialogs by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/179
 * fix: No default branch for customer/vendor opening balance branch by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/182

-## [0.9.8] - 19-06-2023
+# [0.9.8] - 19-06-2023

 `bigcapitalhq/webapp`

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -33,8 +33,7 @@ Contributions via pull requests are much appreciated. Once the approach is agree
 ---

 ## Local Setup Prerequisites
-  - The application currently supports **Node.js v18.x**.
-  - `pnpm` packages manager, (from pnpm [guide](https://pnpm.io/installation) pick any installation method).
+ - The application currently supports **Node.js v14.x**. Please ensure that you are using this version of Node.js when developing. (use [nvm](https://github.com/nvm-sh/nvm#installing-and-updating) to switch between node versions)

 ## Contribute to Backend

@@ -45,10 +44,11 @@ Contributions via pull requests are much appreciated. Once the approach is agree
 cp .env.example .env
 ```

- Install all npm dependencies of the monorepo, you don't have to change directory to the `backend` package. just hit the command on root directory and it will install dependencies of all packages.
+- Install all npm dependencies of the monorepo, you don't have to change directory to the `backend` package. just hit these command on root directory and it will install dependencies of all packages.

 ```
-pnpm install
+npm install
+npm run bootstrap
 ```

 - Run all required docker containers in the development, we already configured all containers under `docker-compose.yml`.
@@ -69,7 +69,7 @@ cefa73fe2881   bigcapital-redis   "docker-entrypoint.s…"   7 seconds ago   Up
 - There're some CLI commands we should run before running the server like databaase migration, so we need to build the `server` app first.

 ```
-pnpm run build:server
+npm run build:server
 ```

 - Run the database migration for system database.
@@ -87,7 +87,7 @@ Batch 1 run: 6 migrations
 - Next, start the webapp application.

 ```
-pnpm run dev:server
+npm run dev:server
 ```

 **[`^top^`](#)**
@@ -105,13 +105,14 @@ git clone https://github.com/bigcapital/bigcapital.git && cd bigcaptial
 - Install all npm dependencies of the monorepo, you don't have to change directory to the `frontend` package. just hit that command and will install all packages across all application.

 ```
-pnpm install
+npm install
+npm run bootstrap
 ```

 - Next, start the webapp application.

 ```
-pnpm run dev:webapp
+npm run dev:webapp
 ```

 **[`^top^`](#)**
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 <p align="center">
  <p align="center">
-    <a href="https://bigcapital.app" target="_blank">
+    <a href="https://bigcapital.ly" target="_blank">
      <img src="https://raw.githubusercontent.com/abouolia/blog/main/public/bigcapital.svg" alt="Bigcapital" width="280" height="75">
    </a>
  </p>
@@ -25,10 +25,6 @@
      <img src="https://img.shields.io/twitter/follow/bigcapitalhq?style=social" alt="twitter" />
    </a>
  </p>
-
-  <p align="center">
-    <a href="https://my.bigcapital.app">Bigcapital Cloud</a>
-  </p>
 </p>

 # What's Bigcapital?
@@ -41,40 +37,9 @@ Bigcapital is a smart and open-source accounting and inventory software, Bigcapi
  <img src="https://raw.githubusercontent.com/abouolia/blog/main/public/screenshot-3.png" width="270">
 </p>

-# Getting Started
-
-We've got serveral options on dev and prod depending on your need to get started quickly with Bigcapital.
-
-## Self-hosted 
-
-Bigcapital is available open-source under AGPL license. You can host it on your own servers using Docker.
-
-### Docker
-
-To get started with self-hosted with Docker and Docker Compose, take a look at the [Docker guide](https://docs.bigcapital.app/deployment/docker).
-
-## Development
-
-### Local Setup
-
-To get started locally, we have a [guide to help you](https://github.com/bigcapitalhq/bigcapital/blob/develop/CONTRIBUTING.md).
-
-### Gitpod
-
- Click the Gitpod button below to open this project in development mode.
- This will open and configure the workspace in your browser with all the necessary dependencies.
-
-[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/new/#https://github.com/bigcapitalhq/bigcapital)
-
-## Headless Accounting
-
-You can integrate Bigcapital API with your system to organize your transactions in double-entry system to get the best financial reports.
-
-[![Run in Postman](https://run.pstmn.io/button.svg)](https://www.postman.com/bigcapital/workspace/bigcapital-api)
-
 # Resources

- [Documentation](https://docs.bigcapital.app/) - Learn how to use.
+- [Documentation](https://docs.bigcapital.ly/) - Learn how to use.
 - [Contribution](https://github.com/bigcapitalhq/bigcapital/blob/develop/CONTRIBUTING.md) - Welcome to any contributions.
 - [Discord](https://discord.com/invite/c8nPBJafeb) - Ask for help.
 - [Bug Tracker](https://github.com/bigcapitalhq/bigcapital/issues) - Notify us new bugs.
@@ -115,16 +80,6 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
      <td align="center" valign="top" width="14.28%"><a href="https://scheibling.se"><img src="https://avatars.githubusercontent.com/u/24367830?v=4?s=100" width="100px;" alt="Lars Scheibling"/><br /><sub><b>Lars Scheibling</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Ascheibling" title="Bug reports">🐛</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/suhaibaffan"><img src="https://avatars.githubusercontent.com/u/18115937?v=4?s=100" width="100px;" alt="Suhaib Affan"/><br /><sub><b>Suhaib Affan</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/commits?author=suhaibaffan" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/KalliopiPliogka"><img src="https://avatars.githubusercontent.com/u/81677549?v=4?s=100" width="100px;" alt="Kalliopi Pliogka"/><br /><sub><b>Kalliopi Pliogka</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3AKalliopiPliogka" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://me.kochie.io"><img src="https://avatars.githubusercontent.com/u/10809884?v=4?s=100" width="100px;" alt="Robert Koch"/><br /><sub><b>Robert Koch</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/commits?author=kochie" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="http://cschuijt.nl"><img src="https://avatars.githubusercontent.com/u/5460015?v=4?s=100" width="100px;" alt="Casper Schuijt"/><br /><sub><b>Casper Schuijt</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Acschuijt" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ANasouf"><img src="https://avatars.githubusercontent.com/u/19536487?v=4?s=100" width="100px;" alt="ANasouf"/><br /><sub><b>ANasouf</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/commits?author=ANasouf" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://ragnarlaud.dev"><img src="https://avatars.githubusercontent.com/u/3042904?v=4?s=100" width="100px;" alt="Ragnar Laud"/><br /><sub><b>Ragnar Laud</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Axprnio" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/asenawritescode"><img src="https://avatars.githubusercontent.com/u/67445192?v=4?s=100" width="100px;" alt="Asena"/><br /><sub><b>Asena</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Aasenawritescode" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://snyder.tech"><img src="https://avatars.githubusercontent.com/u/707567?v=4?s=100" width="100px;" alt="Ben Snyder"/><br /><sub><b>Ben Snyder</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/commits?author=benpsnyder" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://vederis.id"><img src="https://avatars.githubusercontent.com/u/13505006?v=4?s=100" width="100px;" alt="Vederis Leunardus"/><br /><sub><b>Vederis Leunardus</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/commits?author=cloudsbird" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.pivoten.com"><img src="https://avatars.githubusercontent.com/u/104120598?v=4?s=100" width="100px;" alt="Chris Cantrell"/><br /><sub><b>Chris Cantrell</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Accantrell72" title="Bug reports">🐛</a></td>
    </tr>
  </tbody>
 </table>
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -21,18 +21,20 @@ services:
    depends_on:
      - server
      - webapp
-    restart: on-failure
+    deploy:
+      restart_policy:
+        condition: unless-stopped

  webapp:
    container_name: bigcapital-webapp
-    image: bigcapitalhq/webapp:latest
-    restart: on-failure
+    image: ghcr.io/bigcapitalhq/webapp:latest
+    deploy:
+      restart_policy:
+        condition: unless-stopped

  server:
    container_name: bigcapital-server
-    image: bigcapitalhq/server:latest
-    expose:
-      - '3000'
+    image: ghcr.io/bigcapitalhq/server:latest
    links:
      - mysql
      - mongo
@@ -41,7 +43,9 @@ services:
      - mysql
      - mongo
      - redis
-    restart: on-failure
+    deploy:
+      restart_policy:
+        condition: unless-stopped
    environment:
      # Mail
      - MAIL_HOST=${MAIL_HOST}
@@ -82,45 +86,6 @@ services:
      - SIGNUP_ALLOWED_DOMAINS=${SIGNUP_ALLOWED_DOMAINS}
      - SIGNUP_ALLOWED_EMAILS=${SIGNUP_ALLOWED_EMAILS}

-      # Sign-up email confirmation
-      - SIGNUP_EMAIL_CONFIRMATION=${SIGNUP_EMAIL_CONFIRMATION}
-
-      # Gotenberg (Pdf generator)
-      - GOTENBERG_URL=${GOTENBERG_URL}
-      - GOTENBERG_DOCS_URL=${GOTENBERG_DOCS_URL}
-
-      # Bank Sync
-      - BANKING_CONNECT=${BANKING_CONNECT}
-
-      # Plaid
-      - PLAID_ENV=${PLAID_ENV}
-      - PLAID_CLIENT_ID=${PLAID_CLIENT_ID}
-      - PLAID_SECRET_DEVELOPMENT=${PLAID_SECRET_DEVELOPMENT}
-      - PLAID_SECRET_SANDBOX=${b8cf42b441e110451e2f69ad7e1e9f}
-      - PLAID_LINK_WEBHOOK=${PLAID_LINK_WEBHOOK}
-
-      # Lemon Squeez
-      - LEMONSQUEEZY_API_KEY=${LEMONSQUEEZY_API_KEY}
-      - LEMONSQUEEZY_STORE_ID=${LEMONSQUEEZY_STORE_ID}
-      - LEMONSQUEEZY_WEBHOOK_SECRET=${LEMONSQUEEZY_WEBHOOK_SECRET}
-      - HOSTED_ON_BIGCAPITAL_CLOUD=${HOSTED_ON_BIGCAPITAL_CLOUD}
-
-      # New Relic matrics tracking.
-      - NEW_RELIC_DISTRIBUTED_TRACING_ENABLED=${NEW_RELIC_DISTRIBUTED_TRACING_ENABLED}
-      - NEW_RELIC_LOG=${NEW_RELIC_LOG}
-      - NEW_RELIC_AI_MONITORING_ENABLED=${NEW_RELIC_AI_MONITORING_ENABLED}
-      - NEW_RELIC_CUSTOM_INSIGHTS_EVENTS_MAX_SAMPLES_STORED=${NEW_RELIC_CUSTOM_INSIGHTS_EVENTS_MAX_SAMPLES_STORED}
-      - NEW_RELIC_SPAN_EVENTS_MAX_SAMPLES_STORED=${NEW_RELIC_SPAN_EVENTS_MAX_SAMPLES_STORED}
-      - NEW_RELIC_LICENSE_KEY=${NEW_RELIC_LICENSE_KEY}
-      - NEW_RELIC_APP_NAME=${NEW_RELIC_APP_NAME}
-
-      # S3
-      - S3_REGION=${S3_REGION}
-      - S3_ACCESS_KEY_ID=${S3_ACCESS_KEY_ID}
-      - S3_SECRET_ACCESS_KEY=${S3_SECRET_ACCESS_KEY}
-      - S3_ENDPOINT=${S3_ENDPOINT}
-      - S3_BUCKET=${S3_BUCKET}
-
  database_migration:
    container_name: bigcapital-database-migration
    build:
@@ -140,7 +105,9 @@ services:

  mysql:
    container_name: bigcapital-mysql
-    restart: on-failure
+    deploy:
+      restart_policy:
+        condition: unless-stopped
    build:
      context: ./docker/mariadb
    environment:
@@ -155,7 +122,9 @@ services:

  mongo:
    container_name: bigcapital-mongo
-    restart: on-failure
+    deploy:
+      restart_policy:
+        condition: unless-stopped
    build: ./docker/mongo
    expose:
      - '27017'
@@ -164,7 +133,9 @@ services:

  redis:
    container_name: bigcapital-redis
-    restart: on-failure
+    deploy:
+      restart_policy:
+        condition: unless-stopped
    build:
      context: ./docker/redis
    expose:
@@ -172,11 +143,6 @@ services:
    volumes:
      - redis:/data

-  gotenberg:
-    image: gotenberg/gotenberg:7
-    expose:
-      - '9000'
-
 # Volumes
 volumes:
  mysql:
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -47,11 +47,6 @@ services:
      restart_policy:
        condition: unless-stopped

-  gotenberg:
-    image: gotenberg/gotenberg:7
-    ports:
-      - "9000:3000"
-
 # Volumes
 volumes:
  mysql:
--- a/docker/migration/Dockerfile
+++ b/docker/migration/Dockerfile
@@ -1,4 +1,4 @@
-FROM bigcapitalhq/server:latest as build
+FROM ghcr.io/bigcapitalhq/server:latest as build

 ARG DB_HOST= \
  DB_USER= \
@@ -34,5 +34,7 @@ WORKDIR /app/packages/server

 RUN git clone https://github.com/vishnubob/wait-for-it.git

-# Once we listen the mysql port run the migration task.
-CMD ./wait-for-it/wait-for-it.sh mysql:3306 -- sh -c "node ./build/commands.js system:migrate:latest && node ./build/commands.js tenants:migrate:latest"
+ADD docker/migration/start.sh /
+RUN chmod +x /start.sh
+
+CMD ["/start.sh"]
--- a/docker/migration/start.sh
+++ b/docker/migration/start.sh
@@ -0,0 +1,5 @@
+# Migrate the master system database.
+./wait-for-it/wait-for-it.sh mysql:3306 -- node ./build/commands.js system:migrate:latest
+
+# Migrate all tenants.
+./wait-for-it/wait-for-it.sh mysql:3306 -- node ./build/commands.js tenants:migrate:latest
--- a/lerna.json
+++ b/lerna.json
@@ -2,7 +2,5 @@
  "$schema": "node_modules/lerna/schemas/lerna-schema.json",
  "version": "independent",
  "npmClient": "pnpm",
-  "packages": [
-    "packages/*"
-  ]
+  "packages": ["packages/*"]
 }
--- a/package.json
+++ b/package.json
@@ -2,6 +2,7 @@
  "name": "bigcapital-monorepo",
  "private": true,
  "scripts": {
+    "bootstrap": "lerna exec pnpm install",
    "dev": "lerna run dev",
    "build": "lerna run build",
    "dev:webapp": "lerna run dev --scope \"@bigcapital/webapp\"",
@@ -19,11 +20,10 @@
    "@faker-js/faker": "^8.0.2",
    "@playwright/test": "^1.32.3",
    "husky": "^8.0.3",
-    "lerna": "^8.1.2",
-    "pnpm": "^9.0.5"
+    "lerna": "^6.4.1"
  },
  "engines": {
-    "node": "16.x || 17.x || 18.x"
+    "node": "14.x"
  },
  "husky": {
    "hooks": {
--- a/packages/server/.gitignore
+++ b/packages/server/.gitignore
@@ -1,8 +1,6 @@
 /node_modules/
 /.env
+/storage
 stdout.log
 /dist
 /build
-/public/imports
-
-dist
--- a/packages/server/Dockerfile
+++ b/packages/server/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18.16.0-alpine as build
+FROM node:14.20-alpine as build

 USER root

@@ -78,33 +78,20 @@ ENV MAIL_HOST=$MAIL_HOST \
  SIGNUP_ALLOWED_DOMAINS=$SIGNUP_ALLOWED_DOMAINS \
  SIGNUP_ALLOWED_EMAILS=$SIGNUP_ALLOWED_EMAILS

-# New Relic config file.
-ENV NEW_RELIC_NO_CONFIG_FILE=true
-
 # Create app directory.
 WORKDIR /app

 RUN chown node:node /

-# Install pnpm 
-RUN npm install -g pnpm
-
 # Copy application dependency manifests to the container image.
 COPY ./package*.json ./
-COPY ./pnpm-lock.yaml ./pnpm-lock.yaml
-COPY ./lerna.json ./lerna.json
-COPY ./pnpm-workspace.yaml ./pnpm-workspace.yaml
 COPY ./packages/server/package*.json ./packages/server/

-# Install application dependencies
-RUN apk update
-RUN apk add python3 build-base chromium
+COPY ./lerna.json ./lerna.json

-# Set PYHTON env
-ENV PYTHON=/usr/bin/python3
-
-# Install packages dependencies for production.
-RUN pnpm install
+# Install app dependencies for production.
+RUN npm install
+RUN npm run bootstrap

 COPY --chown=node:node ./packages/server ./packages/server

--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@bigcapital/server",
-  "version": "0.10.2",
+  "version": "0.10.1",
  "description": "",
  "main": "src/server.ts",
  "scripts": {
@@ -20,23 +20,18 @@
    "bigcapital": "./bin/bigcapital.js"
  },
  "dependencies": {
-    "@aws-sdk/client-s3": "^3.576.0",
-    "@aws-sdk/s3-request-presigner": "^3.583.0",
    "@casl/ability": "^5.4.3",
    "@hapi/boom": "^7.4.3",
-    "@lemonsqueezy/lemonsqueezy.js": "^2.2.0",
-    "@types/express": "^4.17.21",
    "@types/i18n": "^0.8.7",
    "@types/knex": "^0.16.1",
    "@types/mathjs": "^6.0.12",
-    "@types/yup": "^0.29.13",
    "accepts": "^1.3.7",
    "accounting": "^0.4.1",
    "agenda": "^4.2.1",
    "agendash": "^3.1.0",
    "app-root-path": "^3.0.0",
    "async": "^3.2.0",
-    "axios": "^1.6.0",
+    "axios": "^0.20.0",
    "babel-loader": "^9.1.2",
    "bcryptjs": "^2.4.3",
    "bluebird": "^3.7.2",
@@ -48,7 +43,7 @@
    "crypto-random-string": "^3.2.0",
    "csurf": "^1.10.0",
    "deep-map": "^2.0.0",
-    "deepdash": "^5.3.9",
+    "deepdash": "^5.3.7",
    "dotenv": "^8.1.0",
    "errorhandler": "^1.5.1",
    "es6-weak-map": "^2.0.3",
@@ -58,9 +53,9 @@
    "express": "^4.17.1",
    "express-basic-auth": "^1.2.0",
    "express-boom": "^3.0.0",
+    "express-fileupload": "^1.1.7-alpha.3",
    "express-oauth-server": "^2.0.0",
    "express-validator": "^6.12.2",
-    "form-data": "^4.0.0",
    "gulp": "^4.0.2",
    "gulp-sass": "^5.0.0",
    "helmet": "^3.21.0",
@@ -76,18 +71,14 @@
    "lru-cache": "^6.0.0",
    "mathjs": "^9.4.0",
    "memory-cache": "^0.2.0",
-    "mime-types": "^2.1.35",
    "moment": "^2.24.0",
    "moment-range": "^4.0.2",
    "moment-timezone": "^0.5.43",
    "mongodb": "^6.1.0",
    "mongoose": "^5.10.0",
-    "multer": "1.4.5-lts.1",
-    "multer-s3": "^3.0.1",
    "mustache": "^3.0.3",
    "mysql": "^2.17.1",
    "mysql2": "^1.6.5",
-    "newrelic": "^11.15.0",
    "node-cache": "^4.2.1",
    "nodemailer": "^6.3.0",
    "nodemon": "^1.19.1",
@@ -96,7 +87,6 @@
    "objection-filter": "^4.0.1",
    "objection-soft-delete": "^1.0.7",
    "objection-unique": "^1.2.2",
-    "plaid": "^10.3.0",
    "pluralize": "^8.0.0",
    "pug": "^3.0.2",
    "puppeteer": "^10.2.0",
@@ -105,20 +95,14 @@
    "rate-limiter-flexible": "^2.1.14",
    "reflect-metadata": "^0.1.13",
    "rtl-detect": "^1.0.4",
-    "socket.io": "^4.7.4",
-    "source-map-loader": "^4.0.1",
-    "tmp-promise": "^3.0.3",
    "ts-transformer-keys": "^0.4.2",
    "tsyringe": "^4.3.0",
    "typedi": "^0.8.0",
    "uniqid": "^5.2.0",
-    "winston": "^3.2.1",
-    "xlsx": "^0.18.5",
-    "yup": "^0.28.1"
+    "winston": "^3.2.1"
  },
  "devDependencies": {
    "@types/lodash": "^4.14.158",
-    "@types/multer": "^1.4.11",
    "@types/ramda": "^0.27.64",
    "@typescript-eslint/eslint-plugin": "^5.50.0",
    "@typescript-eslint/parser": "^5.50.0",
--- a/packages/server/public/.DS_Store
+++ b/packages/server/public/.DS_Store
--- a/packages/server/public/imports/.DS_Store
+++ b/packages/server/public/imports/.DS_Store
--- a/packages/server/resources/locales/ar.json
+++ b/packages/server/resources/locales/ar.json
@@ -242,7 +242,7 @@
  "account.field.normal.credit": "دائن",
  "account.field.normal.debit": "مدين",
  "account.field.type": "نوع الحساب",
-  "account.field.active": "Active",
+  "account.field.active": "Activity",
  "account.field.balance": "الرصيد",
  "account.field.created_at": "أنشئت في",
  "item.field.type": "نوع الصنف",
--- a/packages/server/resources/locales/en.json
+++ b/packages/server/resources/locales/en.json
@@ -176,7 +176,6 @@
  "invoice.paper.conditions_title": "Conditions & terms",
  "invoice.paper.notes_title": "Notes",
  "invoice.paper.total": "Total",
-  "invoice.paper.subtotal": "Subtotal", 
  "invoice.paper.payment_amount": "Payment Amount",
  "invoice.paper.balance_due": "Balance Due",

@@ -241,32 +240,28 @@
  "account.field.normal.credit": "Credit",
  "account.field.normal.debit": "Debit",
  "account.field.type": "Type",
-  "account.field.active": "Active",
-  "account.field.currency": "Currency",
+  "account.field.active": "Activity",
  "account.field.balance": "Balance",
-  "account.field.bank_balance": "Bank Balance",
-  "account.field.parent_account": "Parent Account",
  "account.field.created_at": "Created at",
-  "item.field.type": "Item Type",
+  "item.field.type": "Item type",
  "item.field.type.inventory": "Inventory",
  "item.field.type.service": "Service",
-  "item.field.type.non-inventory": "Non Inventory",
-  "item.field.name": "Item Name",
-  "item.field.code": "Item Code",
+  "item.field.type.non-inventory": "Non inventory",
+  "item.field.name": "Name",
+  "item.field.code": "Code",
  "item.field.sellable": "Sellable",
  "item.field.purchasable": "Purchasable",
-  "item.field.cost_price": "Cost Price",
-  "item.field.sell_price": "Sell Price",
-  "item.field.cost_account": "Cost Account",
-  "item.field.sell_account": "Sell Account",
-  "item.field.sell_description": "Sell Description",
-  "item.field.inventory_account": "Inventory Account",
-  "item.field.purchase_description": "Purchase Description",
-  "item.field.quantity_on_hand": "Quantity on Hand",
+  "item.field.cost_price": "Cost price",
+  "item.field.cost_account": "Cost account",
+  "item.field.sell_account": "Sell account",
+  "item.field.sell_description": "Sell description",
+  "item.field.inventory_account": "Inventory account",
+  "item.field.purchase_description": "Purchase description",
+  "item.field.quantity_on_hand": "Quantity on hand",
  "item.field.note": "Note",
  "item.field.category": "Category",
  "item.field.active": "Active",
-  "item.field.created_at": "Created At",
+  "item.field.created_at": "Created at",
  "item_category.field.name": "Name",
  "item_category.field.description": "Description",
  "item_category.field.count": "Count",
@@ -279,14 +274,8 @@
  "invoice.field.invoice_message": "Invoice message",
  "invoice.field.terms_conditions": "Terms & conditions",
  "invoice.field.amount": "Amount",
-  "invoice.field.exchange_rate": "Exchange Rate",
  "invoice.field.payment_amount": "Payment amount",
  "invoice.field.due_amount": "Due amount",
-  "invoice.field.delivered": "Delivered",
-  "invoice.field.item_name": "Item Name",
-  "invoice.field.rate": "Rate",
-  "invoice.field.quantity": "Quantity",
-  "invoice.field.description": "Description",
  "invoice.field.status": "Status",
  "invoice.field.status.paid": "Paid",
  "invoice.field.status.partially-paid": "Partially paid",
@@ -295,8 +284,6 @@
  "invoice.field.status.delivered": "Delivered",
  "invoice.field.status.draft": "Draft",
  "invoice.field.created_at": "Created at",
-  "invoice.field.currency": "Currency",
-  "invoice.field.entries": "Entries",
  "estimate.field.amount": "Amount",
  "estimate.field.estimate_number": "Estimate number",
  "estimate.field.customer": "Customer",
@@ -311,31 +298,22 @@
  "estimate.field.status.approved": "Approved",
  "estimate.field.status.draft": "Draft",
  "estimate.field.created_at": "Created at",
+  "payment_receive.field.customer": "Customer",
+  "payment_receive.field.payment_date": "Payment date",
  "payment_receive.field.amount": "Amount",
+  "payment_receive.field.reference_no": "Reference No.",
+  "payment_receive.field.deposit_account": "Deposit account",
  "payment_receive.field.payment_receive_no": "Payment receive No.",
  "payment_receive.field.statement": "Statement",
  "payment_receive.field.created_at": "Created at",
-  "payment_receive.field.customer": "Customer",
-  "payment_receive.field.exchange_rate": "Exchange Rate",
-  "payment_receive.field.payment_date": "Payment Date",
-  "payment_receive.field.reference_no": "Reference No.",
-  "payment_receive.field.deposit_account": "Deposit Account",
-  "payment_receive.field.entries": "Entries",
-  "payment_receive.field.invoice": "Invoice",
-  "payment_receive.field.entries.payment_amount": "Payment Amount",
  "bill_payment.field.vendor": "Vendor",
  "bill_payment.field.amount": "Amount",
-  "bill_payment.field.due_amount": "Due Amount",
-  "bill_payment.field.payment_account": "Payment Account",
-  "bill_payment.field.payment_number": "Payment No.",
-  "bill_payment.field.payment_date": "Payment Date",
+  "bill_payment.field.due_amount": "Due amount",
+  "bill_payment.field.payment_account": "Payment account",
+  "bill_payment.field.payment_number": "Payment number",
+  "bill_payment.field.payment_date": "Payment date",
  "bill_payment.field.reference_no": "Reference No.",
  "bill_payment.field.description": "Description",
-  "bill_payment.field.exchange_rate": "Exchange Rate",
-  "bill_payment.field.note": "Note",
-  "bill_payment.field.entries.bill": "Bill No.",
-  "bill_payment.field.entries.payment_amount": "Payment Amount",
-  "bill_payment.field.reference": "Reference No.",
  "bill_payment.field.created_at": "Created at",
  "bill.field.vendor": "Vendor",
  "bill.field.bill_number": "Bill number",
@@ -363,30 +341,22 @@
  "inventory_adjustment.field.description": "Description",
  "inventory_adjustment.field.published_at": "Published at",
  "inventory_adjustment.field.created_at": "Created at",
-  "expense.field.payment_date": "Payment Date",
-  "expense.field.payment_account": "Payment Account",
+  "expense.field.payment_date": "Payment date",
+  "expense.field.payment_account": "Payment account",
  "expense.field.amount": "Amount",
-  "expense.field.currency_code": "Currency",
-  "expense.field.exchange_rate": "Exchange Rate", 
  "expense.field.reference_no": "Reference No.",
  "expense.field.description": "Description",
-  "expense.field.line_description": "Line Description",
  "expense.field.published": "Published",
-  "expense.field.categories": "Categories",
-  "expense.field.expense_account": "Expense Account",
-  "expense.field.publish": "Publish",
  "expense.field.status": "Status",
  "expense.field.status.draft": "Draft",
  "expense.field.status.published": "Published",
  "expense.field.created_at": "Created at",
  "manual_journal.field.date": "Date",
-  "manual_journal.field.journal_number": "Journal No.",
+  "manual_journal.field.journal_number": "Journal number",
  "manual_journal.field.reference": "Reference No.",
-  "manual_journal.field.journal_type": "Journal Type",
+  "manual_journal.field.journal_type": "Journal type",
  "manual_journal.field.amount": "Amount",
  "manual_journal.field.description": "Description",
-  "manual_journal.field.currency": "Currency",
-  "manual_journal.field.exchange_rate": "Exchange Rate",
  "manual_journal.field.status": "Status",
  "manual_journal.field.created_at": "Created at",
  "receipt.field.amount": "Amount",
@@ -405,8 +375,8 @@
  "customer.field.last_name": "Last name",
  "customer.field.display_name": "Display name",
  "customer.field.email": "Email",
-  "customer.field.work_phone": "Work Phone Number",
-  "customer.field.personal_phone": "Personal Phone Number",
+  "customer.field.work_phone": "Work phone",
+  "customer.field.personal_phone": "Personal phone",
  "customer.field.company_name": "Company name",
  "customer.field.website": "Website",
  "customer.field.opening_balance_at": "Opening balance at",
@@ -414,7 +384,7 @@
  "customer.field.created_at": "Created at",
  "customer.field.balance": "Balance",
  "customer.field.status": "Status",
-  "customer.field.currency": "Currency",
+  "customer.field.currency": "Curreny",
  "customer.field.status.active": "Active",
  "customer.field.status.inactive": "Inactive",
  "customer.field.status.overdue": "Overdue",
@@ -423,8 +393,8 @@
  "vendor.field.last_name": "Last name",
  "vendor.field.display_name": "Display name",
  "vendor.field.email": "Email",
-  "vendor.field.work_phone": "Work Phone Number",
-  "vendor.field.personal_phone": "Personal Phone Number",
+  "vendor.field.work_phone": "Work phone",
+  "vendor.field.personal_phone": "Personal phone",
  "vendor.field.company_name": "Company name",
  "vendor.field.website": "Website",
  "vendor.field.opening_balance_at": "Opening balance at",
@@ -432,16 +402,13 @@
  "vendor.field.created_at": "Created at",
  "vendor.field.balance": "Balance",
  "vendor.field.status": "Status",
-  "vendor.field.note": "Note",
-  "vendor.field.currency": "Currency",
+  "vendor.field.currency": "Curreny",
  "vendor.field.status.active": "Active",
  "vendor.field.status.inactive": "Inactive",
  "vendor.field.status.overdue": "Overdue",
  "vendor.field.status.unpaid": "Unpaid",
  "Invoice write-off": "Invoice write-off",

-  
-
  "transaction_type.credit_note": "Credit note",
  "transaction_type.refund_credit_note": "Refund credit note",
  "transaction_type.vendor_credit": "Vendor credit",
@@ -620,7 +587,6 @@
  "balance_sheet.long_term_liabilities": "Long-Term Liabilities",
  "balance_sheet.non_current_liabilities": "Non-Current Liabilities",
  "balance_sheet.equity": "Equity",
-  "balance_sheet.net_income": "Net Income",

  "balance_sheet.account_name": "Account name",
  "balance_sheet.total": "Total",
--- a/packages/server/resources/scss/modules/export-resource-table.scss
+++ b/packages/server/resources/scss/modules/export-resource-table.scss
@@ -1,38 +0,0 @@
-@import "../base.scss";
-
-body {
-  font-family: system-ui,-apple-system,"Segoe UI",Roboto,"Helvetica Neue","Noto Sans","Liberation Sans",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";
-  font-size: 12px;
-  line-height: 1.4;
-  margin: 0;
-}
-.sheet__title{
-  margin-bottom: 18px;
-}
-.sheet__title h2{
-  line-height: 1;
-  margin-top: 0;
-  margin-bottom: 10px;
-  font-size: 16px;
-}
-.sheet__table {
-  font-size: inherit;
-  line-height: inherit;
-  width: 100%;
-}
-.sheet__table {
-  table-layout: auto;
-  border-collapse: collapse;  
-  width: 100%;
-}
-.sheet__table thead tr th {
-  border-top: 1px solid #000;
-  border-bottom: 1px solid #000;
-  background: #fff;
-  padding: 8px;
-  line-height: 1.2;
-}
-.sheet__table tbody tr td {
-  padding: 4px 8px;
-  border-bottom: 1px solid #CCC;    
-}
--- a/packages/server/resources/scss/modules/financial-sheet.scss
+++ b/packages/server/resources/scss/modules/financial-sheet.scss
@@ -1,57 +0,0 @@
-@import "../base.scss";
-
-html,
-body {
-  font-size: 14px;
-}
-body{
-  font-weight: 400;
-  letter-spacing: 0;
-  line-height: 1.28581;
-  text-transform: none;
-  color: #000;
-  font-family: Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Open Sans, Helvetica Neue, Icons16, sans-serif;
-}
-.sheet{
-  padding: 20px;
-}
-.sheet__company-name{
-  margin: 0;
-  font-size: 1.4rem;
-}
-.sheet__sheet-type {
-  margin: 0
-}
-.sheet__sheet-date {
-  margin-top: 0.35rem;
-}
-
-.sheet__header {
-  text-align: center;
-  margin-bottom: 1rem;
-}
-
-.sheet__table {
-  border-top: 1px solid #000;
-  table-layout: fixed;
-  border-spacing: 0;
-  text-align: left;
-  font-size: inherit;
-  width: 100%;
-}
-
-.sheet__table thead th {
-  color: #000;
-  border-bottom: 1px solid #000000;
-  padding: 0.5rem;
-}
-
-.sheet__table tbody td {
-  border-bottom: 0;
-  padding-top: 0.28rem;
-  padding-bottom: 0.28rem;
-  padding-left: 0.5rem;
-  padding-right: 0.5rem;
-  color: #252A31;
-  border-bottom: 1px solid transparent;
-}
--- a/packages/server/resources/scss/modules/invoice.scss
+++ b/packages/server/resources/scss/modules/invoice.scss
@@ -137,14 +137,10 @@
      tbody tr.payment-amount td:last-child {
        color: red
      }
-      tbody tr.blanace-due td{
+      tbody tr.blanace-due td {
        border-top: 3px double #666;
        font-weight: bold;
      }
-      tbody tr.total td {
-        border-top: 1px solid #666;
-        font-weight: bold;
-      }
    }
  }

--- a/packages/server/resources/views/modules/export-resource-table.pug
+++ b/packages/server/resources/views/modules/export-resource-table.pug
@@ -1,24 +0,0 @@
-block head
-  style 
-    include ../../css/modules/export-resource-table.css
-
-style.
-  !{customCSS}
-
-block content 
-  .sheet
-    .sheet__title 
-      h2.sheetTitle= sheetTitle
-      p.sheetDesc= sheetDescription
-
-    table.sheet__table
-      thead
-        tr
-          each column in table.columns
-            th(style=column.style class='column--' + column.key)= column.name
-      tbody
-        each row in table.rows
-          tr(class=row.classNames)
-            each cell in row.cells 
-              td(class='cell--' + cell.key)
-                span!= cell.value
--- a/packages/server/resources/views/modules/financial-sheet.pug
+++ b/packages/server/resources/views/modules/financial-sheet.pug
@@ -1,25 +0,0 @@
-block head
-  style 
-    include ../../css/modules/financial-sheet.css
-
-style.
-  !{customCSS}
-
-block content 
-  .sheet 
-    .sheet__header 
-      .sheet__company-name=organizationName
-      .sheet__sheet-type=sheetName
-      .sheet__sheet-date=sheetDate
-
-    table.sheet__table
-      thead
-        tr
-          each column in table.columns
-            th(style=column.style class='column--' + column.key)= column.label
-      tbody
-        each row in table.rows
-          tr(class=row.classNames)
-            each cell in row.cells 
-              td(class='cell--' + cell.key)
-                span!= cell.value
--- a/packages/server/resources/views/modules/invoice-regular.pug
+++ b/packages/server/resources/views/modules/invoice-regular.pug
@@ -22,12 +22,12 @@ block content

  div.invoice__due-amount
    div.label #{__('invoice.paper.invoice_amount')}
-    div.amount #{saleInvoice.totalFormatted}
+    div.amount #{saleInvoice.formattedAmount}

  div.invoice__meta
   div.invoice__meta-item.invoice__meta-item--amount
    span.label #{__('invoice.paper.due_amount')}
-    span.value #{saleInvoice.dueAmountFormatted}
+    span.value #{saleInvoice.formattedDueAmount}

   div.invoice__meta-item.invoice__meta-item--billed-to
    span.label #{__("invoice.paper.billed_to")}
@@ -35,11 +35,11 @@ block content

   div.invoice__meta-item.invoice__meta-item--invoice-date
    span.label #{__("invoice.paper.invoice_date")}
-    span.value #{saleInvoice.invoiceDateFormatted}
+    span.value #{saleInvoice.formattedInvoiceDate}

   div.invoice__meta-item.invoice__meta-item--due-date
    span.label #{__("invoice.paper.due_date")}
-    span.value #{saleInvoice.dueDateFormatted}
+    span.value #{saleInvoice.formattedDueDate}

  div.invoice__table
   table 
@@ -63,22 +63,15 @@ block content
    div.invoice__table-total
      table 
        tbody
-          tr.subtotal
-            td #{__('invoice.paper.subtotal')}
-            td #{saleInvoice.subtotalFormatted}
-          each tax in saleInvoice.taxes
-            tr.tax_line 
-              td #{tax.name} [#{tax.taxRate}%]
-              td #{tax.taxRateAmountFormatted}
          tr.total
            td #{__('invoice.paper.total')}
-            td #{saleInvoice.totalFormatted}
+            td #{saleInvoice.formattedAmount}
          tr.payment-amount
            td #{__('invoice.paper.payment_amount')}
-            td #{saleInvoice.paymentAmountFormatted}
+            td #{saleInvoice.formattedPaymentAmount}
          tr.blanace-due
            td #{__('invoice.paper.balance_due')}
-            td #{saleInvoice.dueAmountFormatted}
+            td #{saleInvoice.formattedDueAmount}

  div.invoice__footer        
    if saleInvoice.termsConditions
--- a/packages/server/resources/views/modules/payment-receive-standard.pug
+++ b/packages/server/resources/views/modules/payment-receive-standard.pug
@@ -45,9 +45,9 @@ block content
      each entry in paymentReceive.entries
       tr
        td.item=entry.invoice.invoiceNo
-        td.date=entry.invoice.invoiceDateFormatted
-        td.invoiceAmount=entry.invoice.totalFormatted
-        td.paymentAmount=entry.invoice.paymentAmountFormatted
+        td.date=entry.invoice.formattedInvoiceDate
+        td.invoiceAmount=entry.invoice.formattedAmount
+        td.paymentAmount=entry.invoice.formattedPaymentAmount

  div.payment__table-after
    div.payment__table-total
--- a/packages/server/scripts/gulpConfig.js
+++ b/packages/server/scripts/gulpConfig.js
@@ -66,14 +66,12 @@ module.exports = {
        // sourcemaps: true, // Allow to enable/disable sourcemaps or pass object to configure it.
        // minify: true, // Allow to enable/disable minify the source.
      },
-      {
-        src: `${RESOURCES_PATH}/scss/modules/financial-sheet.scss`,
-        dest: `${RESOURCES_PATH}/css/modules`,
-      },
-      {
-        src: `${RESOURCES_PATH}/scss/modules/export-resource-table.scss`,
-        dest: `${RESOURCES_PATH}/css/modules`,
-      },
+    //   {
+    //     src: './assets/sass/editor-style.scss',
+    //     dest: './assets/css',
+    //     sourcemaps: true,
+    //     minify: true,
+    //   },
    ],
    // RTL builds.
    rtl: [
@@ -116,7 +114,7 @@ module.exports = {
    // SASS Configuration for all builds.
    sass: {
      errLogToConsole: true,
-      //   outputStyle: 'compact',
+    //   outputStyle: 'compact',
    },

    // CSS MQ Packer configuration for all builds and style tasks.
--- a/packages/server/src/api/controllers/Accounts.ts
+++ b/packages/server/src/api/controllers/Accounts.ts
@@ -27,7 +27,7 @@ export default class AccountsController extends BaseController {
  /**
   * Router constructor method.
   */
-  public router() {
+  router() {
    const router = Router();

    router.get(
@@ -98,7 +98,7 @@ export default class AccountsController extends BaseController {
  /**
   * Create account DTO Schema validation.
   */
-  private get createAccountDTOSchema() {
+  get createAccountDTOSchema() {
    return [
      check('name')
        .exists()
@@ -131,7 +131,7 @@ export default class AccountsController extends BaseController {
  /**
   * Account DTO Schema validation.
   */
-  private get editAccountDTOSchema() {
+  get editAccountDTOSchema() {
    return [
      check('name')
        .exists()
@@ -160,14 +160,14 @@ export default class AccountsController extends BaseController {
    ];
  }

-  private get accountParamSchema() {
+  get accountParamSchema() {
    return [param('id').exists().isNumeric().toInt()];
  }

  /**
   * Accounts list validation schema.
   */
-  private get accountsListSchema() {
+  get accountsListSchema() {
    return [
      query('view_slug').optional({ nullable: true }).isString().trim(),
      query('stringified_filter_roles').optional().isJSON(),
@@ -207,6 +207,7 @@ export default class AccountsController extends BaseController {
        tenantId,
        accountDTO
      );
+
      return res.status(200).send({
        id: account.id,
        message: 'The account has been created successfully.',
--- a/packages/server/src/api/controllers/Attachments/AttachmentsController.ts
+++ b/packages/server/src/api/controllers/Attachments/AttachmentsController.ts
@@ -1,259 +0,0 @@
-import mime from 'mime-types';
-import { Service, Inject } from 'typedi';
-import { Router, Response, NextFunction, Request } from 'express';
-import { body, param } from 'express-validator';
-import BaseController from '@/api/controllers/BaseController';
-import { AttachmentsApplication } from '@/services/Attachments/AttachmentsApplication';
-
-@Service()
-export class AttachmentsController extends BaseController {
-  @Inject()
-  private attachmentsApplication: AttachmentsApplication;
-
-  /**
-   * Router constructor.
-   */
-  public router() {
-    const router = Router();
-
-    router.post(
-      '/',
-      this.attachmentsApplication.uploadPipeline.single('file'),
-      this.validateUploadedFileExistance,
-      this.uploadAttachment.bind(this)
-    );
-    router.delete(
-      '/:id',
-      [param('id').exists()],
-      this.validationResult,
-      this.deleteAttachment.bind(this)
-    );
-    router.get(
-      '/:id',
-      [param('id').exists()],
-      this.validationResult,
-      this.getAttachment.bind(this)
-    );
-    router.post(
-      '/:id/link',
-      [body('modelRef').exists(), body('modelId').exists()],
-      this.validationResult
-    );
-    router.post(
-      '/:id/link',
-      [body('modelRef').exists(), body('modelId').exists()],
-      this.validationResult,
-      this.linkDocument.bind(this)
-    );
-    router.post(
-      '/:id/unlink',
-      [body('modelRef').exists(), body('modelId').exists()],
-      this.validationResult,
-      this.unlinkDocument.bind(this)
-    );
-    router.get(
-      '/:id/presigned-url',
-      [param('id').exists()],
-      this.validationResult,
-      this.getAttachmentPresignedUrl.bind(this)
-    );
-    return router;
-  }
-
-  /**
-   * Validates the upload file existance.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Response|void}
-   */
-  private validateUploadedFileExistance(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    if (!req.file) {
-      return res.boom.badRequest(null, {
-        errorType: 'FILE_UPLOAD_FAILED',
-        message: 'Now file uploaded.',
-      });
-    }
-    next();
-  }
-
-  /**
-   * Uploads the attachments to S3 and store the file metadata to DB.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Response|void}
-   */
-  private async uploadAttachment(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const file = req.file;
-
-    try {
-      const data = await this.attachmentsApplication.upload(tenantId, file);
-
-      return res.status(200).send({
-        status: 200,
-        message: 'The document has uploaded successfully.',
-        data,
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Retrieves the given attachment key.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|void>}
-   */
-  private async getAttachment(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const { id } = req.params;
-
-    try {
-      const data = await this.attachmentsApplication.get(tenantId, id);
-
-      const byte = await data.Body.transformToByteArray();
-      const extension = mime.extension(data.ContentType);
-      const buffer = Buffer.from(byte);
-
-      res.set(
-        'Content-Disposition',
-        `filename="${req.params.id}.${extension}"`
-      );
-      res.set('Content-Type', data.ContentType);
-      res.send(buffer);
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Deletes the given document key.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|void>}
-   */
-  private async deleteAttachment(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const { id: documentId } = req.params;
-
-    try {
-      await this.attachmentsApplication.delete(tenantId, documentId);
-
-      return res.status(200).send({
-        status: 200,
-        message: 'The document has been delete successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Links the given document key.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|void>}
-   */
-  private async linkDocument(
-    req: Request,
-    res: Response,
-    next: Function
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const { id: documentId } = req.params;
-    const { modelRef, modelId } = this.matchedBodyData(req);
-
-    try {
-      await this.attachmentsApplication.link(
-        tenantId,
-        documentId,
-        modelRef,
-        modelId
-      );
-      return res.status(200).send({
-        status: 200,
-        message: 'The document has been linked successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Links the given document key.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|void>}
-   */
-  private async unlinkDocument(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const { id: documentId } = req.params;
-    const { modelRef, modelId } = this.matchedBodyData(req);
-
-    try {
-      await this.attachmentsApplication.link(
-        tenantId,
-        documentId,
-        modelRef,
-        modelId
-      );
-      return res.status(200).send({
-        status: 200,
-        message: 'The document has been linked successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Retreives the presigned url of the given attachment key.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|void>}
-   */
-  private async getAttachmentPresignedUrl(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | void> {
-    const { id: documentKey } = req.params;
-
-    try {
-      const presignedUrl = await this.attachmentsApplication.getPresignedUrl(
-        documentKey
-      );
-      return res.status(200).send({ presignedUrl });
-    } catch (error) {
-      next(error);
-    }
-  }
-}
--- a/packages/server/src/api/controllers/Authentication.ts
+++ b/packages/server/src/api/controllers/Authentication.ts
@@ -9,8 +9,6 @@ import { DATATYPES_LENGTH } from '@/data/DataTypes';
 import LoginThrottlerMiddleware from '@/api/middleware/LoginThrottlerMiddleware';
 import AuthenticationApplication from '@/services/Authentication/AuthApplication';

-import JWTAuth from '@/api/middleware/jwtAuth';
-import AttachCurrentTenantUser from '@/api/middleware/AttachCurrentTenantUser';
@Service()
 export default class AuthenticationController extends BaseController {
  @Inject()
@@ -30,20 +28,6 @@ export default class AuthenticationController extends BaseController {
      asyncMiddleware(this.login.bind(this)),
      this.handlerErrors
    );
-    router.use('/register/verify/resend', JWTAuth);
-    router.use('/register/verify/resend', AttachCurrentTenantUser);
-    router.post(
-      '/register/verify/resend',
-      asyncMiddleware(this.registerVerifyResendMail.bind(this)),
-      this.handlerErrors
-    );
-    router.post(
-      '/register/verify',
-      this.signupVerifySchema,
-      this.validationResult,
-      asyncMiddleware(this.registerVerify.bind(this)),
-      this.handlerErrors
-    );
    router.post(
      '/register',
      this.registerSchema,
@@ -115,17 +99,6 @@ export default class AuthenticationController extends BaseController {
    ];
  }

-  private get signupVerifySchema(): ValidationChain[] {
-    return [
-      check('email')
-        .exists()
-        .isString()
-        .isEmail()
-        .isLength({ max: DATATYPES_LENGTH.STRING }),
-      check('token').exists().isString(),
-    ];
-  }
-
  /**
   * Reset password schema.
   * @returns {ValidationChain[]}
@@ -193,58 +166,6 @@ export default class AuthenticationController extends BaseController {
    }
  }

-  /**
-   * Verifies the provider user's email after signin-up.
-   * @param {Request} req
-   * @param {Response}| res
-   * @param {Function} next
-   * @returns {Response|void}
-   */
-  private async registerVerify(req: Request, res: Response, next: Function) {
-    const signUpVerifyDTO: { email: string; token: string } =
-      this.matchedBodyData(req);
-
-    try {
-      const user = await this.authApplication.signUpConfirm(
-        signUpVerifyDTO.email,
-        signUpVerifyDTO.token
-      );
-      return res.status(200).send({
-        type: 'success',
-        message: 'The given user has verified successfully',
-        user,
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Resends the confirmation email to the user.
-   * @param {Request} req
-   * @param {Response}| res
-   * @param {Function} next
-   */
-  private async registerVerifyResendMail(
-    req: Request,
-    res: Response,
-    next: Function
-  ) {
-    const { user } = req;
-
-    try {
-      const data = await this.authApplication.signUpConfirmResend(user.id);
-
-      return res.status(200).send({
-        type: 'success',
-        message: 'The given user has verified successfully',
-        data,
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
  /**
   * Send reset password handler
   * @param {Request} req
--- a/packages/server/src/api/controllers/Banking/BankingController.ts
+++ b/packages/server/src/api/controllers/Banking/BankingController.ts
@@ -1,18 +0,0 @@
-import Container, { Inject, Service } from 'typedi';
-import { Router } from 'express';
-import BaseController from '@/api/controllers/BaseController';
-import { PlaidBankingController } from './PlaidBankingController';
-
-@Service()
-export class BankingController extends BaseController {
-  /**
-   * Router constructor.
-   */
-  router() {
-    const router = Router();
-
-    router.use('/plaid', Container.get(PlaidBankingController).router());
-
-    return router;
-  }
-}
--- a/packages/server/src/api/controllers/Banking/PlaidBankingController.ts
+++ b/packages/server/src/api/controllers/Banking/PlaidBankingController.ts
@@ -1,53 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { Router, Request, Response } from 'express';
-import BaseController from '@/api/controllers/BaseController';
-import { PlaidApplication } from '@/services/Banking/Plaid/PlaidApplication';
-
-@Service()
-export class PlaidBankingController extends BaseController {
-  @Inject()
-  private plaidApp: PlaidApplication;
-
-  /**
-   * Router constructor.
-   */
-  router() {
-    const router = Router();
-
-    router.post('/link-token', this.linkToken.bind(this));
-    router.post('/exchange-token', this.exchangeToken.bind(this));
-
-    return router;
-  }
-
-  /**
-   * Retrieves the Plaid link token.
-   * @param {Request} req
-   * @param {response} res
-   * @returns {Response}
-   */
-  private async linkToken(req: Request, res: Response) {
-    const { tenantId } = req;
-
-    const linkToken = await this.plaidApp.getLinkToken(tenantId);
-
-    return res.status(200).send(linkToken);
-  }
-
-  /**
-   * Exchanges the given public token.
-   * @param {Request} req
-   * @param {response} res
-   * @returns {Response}
-   */
-  public async exchangeToken(req: Request, res: Response) {
-    const { tenantId } = req;
-    const { public_token, institution_id } = req.body;
-
-    await this.plaidApp.exchangeToken(tenantId, {
-      institutionId: institution_id,
-      publicToken: public_token,
-    });
-    return res.status(200).send({});
-  }
-}
--- a/packages/server/src/api/controllers/Cashflow/CashflowController.ts
+++ b/packages/server/src/api/controllers/Cashflow/CashflowController.ts
@@ -13,9 +13,9 @@ export default class CashflowController {
  router() {
    const router = Router();

-    router.use(Container.get(CommandCashflowTransaction).router());
    router.use(Container.get(GetCashflowTransaction).router());
    router.use(Container.get(GetCashflowAccounts).router());
+    router.use(Container.get(CommandCashflowTransaction).router());
    router.use(Container.get(DeleteCashflowTransaction).router());

    return router;
--- a/packages/server/src/api/controllers/Cashflow/DeleteCashflowTransaction.ts
+++ b/packages/server/src/api/controllers/Cashflow/DeleteCashflowTransaction.ts
@@ -3,15 +3,14 @@ import { Router, Request, Response, NextFunction } from 'express';
 import { param } from 'express-validator';
 import BaseController from '../BaseController';
 import { ServiceError } from '@/exceptions';
+import DeleteCashflowTransactionService from '../../../services/Cashflow/DeleteCashflowTransactionService';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-
 import { AbilitySubject, CashflowAction } from '@/interfaces';
-import { CashflowApplication } from '@/services/Cashflow/CashflowApplication';

@Service()
-export default class DeleteCashflowTransactionController extends BaseController {
+export default class DeleteCashflowTransaction extends BaseController {
  @Inject()
-  private cashflowApplication: CashflowApplication;
+  deleteCashflowService: DeleteCashflowTransactionService;

  /**
   * Controller router.
@@ -45,7 +44,7 @@ export default class DeleteCashflowTransactionController extends BaseController

    try {
      const { oldCashflowTransaction } =
-        await this.cashflowApplication.deleteTransaction(
+        await this.deleteCashflowService.deleteCashflowTransaction(
          tenantId,
          transactionId
        );
@@ -93,19 +92,6 @@ export default class DeleteCashflowTransactionController extends BaseController
          ],
        });
      }
-      if (
-        error.errorType ===
-        'CANNOT_DELETE_TRANSACTION_CONVERTED_FROM_UNCATEGORIZED'
-      ) {
-        return res.boom.badRequest(null, {
-          errors: [
-            {
-              type: 'CANNOT_DELETE_TRANSACTION_CONVERTED_FROM_UNCATEGORIZED',
-              code: 4100,
-            },
-          ],
-        });
-      }
    }
    next(error);
  }
--- a/packages/server/src/api/controllers/Cashflow/GetCashflowAccounts.ts
+++ b/packages/server/src/api/controllers/Cashflow/GetCashflowAccounts.ts
@@ -1,16 +1,20 @@
 import { Service, Inject } from 'typedi';
 import { Router, Request, Response, NextFunction } from 'express';
-import { query } from 'express-validator';
+import { param, query } from 'express-validator';
+import GetCashflowAccountsService from '@/services/Cashflow/GetCashflowAccountsService';
 import BaseController from '../BaseController';
+import GetCashflowTransactionsService from '@/services/Cashflow/GetCashflowTransactionsService';
 import { ServiceError } from '@/exceptions';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
 import { AbilitySubject, CashflowAction } from '@/interfaces';
-import { CashflowApplication } from '@/services/Cashflow/CashflowApplication';

@Service()
 export default class GetCashflowAccounts extends BaseController {
  @Inject()
-  private cashflowApplication: CashflowApplication;
+  getCashflowAccountsService: GetCashflowAccountsService;
+
+  @Inject()
+  getCashflowTransactionsService: GetCashflowTransactionsService;

  /**
   * Controller router.
@@ -58,7 +62,10 @@ export default class GetCashflowAccounts extends BaseController {

    try {
      const cashflowAccounts =
-        await this.cashflowApplication.getCashflowAccounts(tenantId, filter);
+        await this.getCashflowAccountsService.getCashflowAccounts(
+          tenantId,
+          filter
+        );

      return res.status(200).send({
        cashflow_accounts: this.transfromToResponse(cashflowAccounts),
--- a/packages/server/src/api/controllers/Cashflow/GetCashflowTransaction.ts
+++ b/packages/server/src/api/controllers/Cashflow/GetCashflowTransaction.ts
@@ -2,15 +2,15 @@ import { Service, Inject } from 'typedi';
 import { Router, Request, Response, NextFunction } from 'express';
 import { param } from 'express-validator';
 import BaseController from '../BaseController';
+import GetCashflowTransactionsService from '@/services/Cashflow/GetCashflowTransactionsService';
 import { ServiceError } from '@/exceptions';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
 import { AbilitySubject, CashflowAction } from '@/interfaces';
-import { CashflowApplication } from '@/services/Cashflow/CashflowApplication';

@Service()
 export default class GetCashflowAccounts extends BaseController {
  @Inject()
-  private cashflowApplication: CashflowApplication;
+  getCashflowTransactionsService: GetCashflowTransactionsService;

  /**
   * Controller router.
@@ -43,10 +43,11 @@ export default class GetCashflowAccounts extends BaseController {
    const { transactionId } = req.params;

    try {
-      const cashflowTransaction = await this.cashflowApplication.getTransaction(
-        tenantId,
-        transactionId
-      );
+      const cashflowTransaction =
+        await this.getCashflowTransactionsService.getCashflowTransaction(
+          tenantId,
+          transactionId
+        );

      return res.status(200).send({
        cashflow_transaction: this.transfromToResponse(cashflowTransaction),
--- a/packages/server/src/api/controllers/Cashflow/NewCashflowTransaction.ts
+++ b/packages/server/src/api/controllers/Cashflow/NewCashflowTransaction.ts
@@ -1,16 +1,16 @@
 import { Service, Inject } from 'typedi';
-import { ValidationChain, check, param, query } from 'express-validator';
+import { check } from 'express-validator';
 import { Router, Request, Response, NextFunction } from 'express';
 import BaseController from '../BaseController';
 import { ServiceError } from '@/exceptions';
+import NewCashflowTransactionService from '@/services/Cashflow/NewCashflowTransactionService';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
 import { AbilitySubject, CashflowAction } from '@/interfaces';
-import { CashflowApplication } from '@/services/Cashflow/CashflowApplication';

@Service()
 export default class NewCashflowTransactionController extends BaseController {
  @Inject()
-  private cashflowApplication: CashflowApplication;
+  private newCashflowTranscationService: NewCashflowTransactionService;

  /**
   * Router constructor.
@@ -18,18 +18,6 @@ export default class NewCashflowTransactionController extends BaseController {
  public router() {
    const router = Router();

-    router.get(
-      '/transactions/uncategorized/:id',
-      this.asyncMiddleware(this.getUncategorizedCashflowTransaction),
-      this.catchServiceErrors
-    );
-    router.get(
-      '/transactions/:id/uncategorized',
-      this.getUncategorizedTransactionsValidationSchema,
-      this.validationResult,
-      this.asyncMiddleware(this.getUncategorizedCashflowTransactions),
-      this.catchServiceErrors
-    );
    router.post(
      '/transactions',
      CheckPolicies(CashflowAction.Create, AbilitySubject.Cashflow),
@@ -38,72 +26,13 @@ export default class NewCashflowTransactionController extends BaseController {
      this.asyncMiddleware(this.newCashflowTransaction),
      this.catchServiceErrors
    );
-    router.post(
-      '/transactions/:id/uncategorize',
-      this.revertCategorizedCashflowTransaction,
-      this.catchServiceErrors
-    );
-    router.post(
-      '/transactions/:id/categorize',
-      this.categorizeCashflowTransactionValidationSchema,
-      this.validationResult,
-      this.categorizeCashflowTransaction,
-      this.catchServiceErrors
-    );
-    router.post(
-      '/transaction/:id/categorize/expense',
-      this.categorizeAsExpenseValidationSchema,
-      this.validationResult,
-      this.categorizesCashflowTransactionAsExpense,
-      this.catchServiceErrors
-    );
    return router;
  }

-  /**
-   * Getting uncategorized transactions validation schema.
-   * @returns {ValidationChain}
-   */
-  public get getUncategorizedTransactionsValidationSchema() {
-    return [
-      param('id').exists().isNumeric().toInt(),
-      query('page').optional().isNumeric().toInt(),
-      query('page_size').optional().isNumeric().toInt(),
-    ];
-  }
-
-  /**
-   * Categorize as expense validation schema.
-   */
-  public get categorizeAsExpenseValidationSchema() {
-    return [
-      check('expense_account_id').exists(),
-      check('date').isISO8601().exists(),
-      check('reference_no').optional(),
-      check('exchange_rate').optional().isFloat({ gt: 0 }).toFloat(),
-    ];
-  }
-
-  /**
-   * Categorize cashflow tranasction validation schema.
-   */
-  public get categorizeCashflowTransactionValidationSchema() {
-    return [
-      check('date').exists().isISO8601().toDate(),
-      check('credit_account_id').exists().isInt().toInt(),
-      check('transaction_number').optional(),
-      check('transaction_type').exists(),
-      check('reference_no').optional(),
-      check('exchange_rate').optional().isFloat({ gt: 0 }).toFloat(),
-      check('description').optional(),
-      check('branch_id').optional({ nullable: true }).isNumeric().toInt(),
-    ];
-  }
-
  /**
   * New cashflow transaction validation schema.
   */
-  public get newTransactionValidationSchema() {
+  get newTransactionValidationSchema() {
    return [
      check('date').exists().isISO8601().toDate(),
      check('reference_no').optional({ nullable: true }).trim().escape(),
@@ -119,7 +48,9 @@ export default class NewCashflowTransactionController extends BaseController {
      check('credit_account_id').exists().isInt().toInt(),

      check('exchange_rate').optional().isFloat({ gt: 0 }).toFloat(),
+
      check('branch_id').optional({ nullable: true }).isNumeric().toInt(),
+
      check('publish').default(false).isBoolean().toBoolean(),
    ];
  }
@@ -139,12 +70,13 @@ export default class NewCashflowTransactionController extends BaseController {
    const ownerContributionDTO = this.matchedBodyData(req);

    try {
-      const cashflowTransaction =
-        await this.cashflowApplication.createTransaction(
+      const { cashflowTransaction } =
+        await this.newCashflowTranscationService.newCashflowTransaction(
          tenantId,
          ownerContributionDTO,
          userId
        );
+
      return res.status(200).send({
        id: cashflowTransaction.id,
        message: 'New cashflow transaction has been created successfully.',
@@ -154,147 +86,11 @@ export default class NewCashflowTransactionController extends BaseController {
    }
  };

-  /**
-   * Revert the categorized cashflow transaction.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private revertCategorizedCashflowTransaction = async (
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) => {
-    const { tenantId } = req;
-    const { id: cashflowTransactionId } = req.params;
-
-    try {
-      const data = await this.cashflowApplication.uncategorizeTransaction(
-        tenantId,
-        cashflowTransactionId
-      );
-      return res.status(200).send({ data });
-    } catch (error) {
-      next(error);
-    }
-  };
-
-  /**
-   * Categorize the cashflow transaction.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private categorizeCashflowTransaction = async (
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) => {
-    const { tenantId } = req;
-    const { id: cashflowTransactionId } = req.params;
-    const cashflowTransaction = this.matchedBodyData(req);
-
-    try {
-      await this.cashflowApplication.categorizeTransaction(
-        tenantId,
-        cashflowTransactionId,
-        cashflowTransaction
-      );
-      return res.status(200).send({
-        message: 'The cashflow transaction has been created successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  };
-
-  /**
-   * Categorize the transaction as expense transaction.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private categorizesCashflowTransactionAsExpense = async (
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) => {
-    const { tenantId } = req;
-    const { id: cashflowTransactionId } = req.params;
-    const cashflowTransaction = this.matchedBodyData(req);
-
-    try {
-      await this.cashflowApplication.categorizeAsExpense(
-        tenantId,
-        cashflowTransactionId,
-        cashflowTransaction
-      );
-      return res.status(200).send({
-        message: 'The cashflow transaction has been created successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  };
-
-  /**
-   * Retrieves the uncategorized cashflow transactions.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  public getUncategorizedCashflowTransaction = async (
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) => {
-    const { tenantId } = req;
-    const { id: transactionId } = req.params;
-
-    try {
-      const data = await this.cashflowApplication.getUncategorizedTransaction(
-        tenantId,
-        transactionId
-      );
-      return res.status(200).send({ data });
-    } catch (error) {
-      next(error);
-    }
-  };
-
-  /**
-   * Retrieves the uncategorized cashflow transactions.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  public getUncategorizedCashflowTransactions = async (
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) => {
-    const { tenantId } = req;
-    const { id: accountId } = req.params;
-    const query = this.matchedQueryData(req);
-
-    try {
-      const data = await this.cashflowApplication.getUncategorizedTransactions(
-        tenantId,
-        accountId,
-        query
-      );
-
-      return res.status(200).send(data);
-    } catch (error) {
-      next(error);
-    }
-  };
-
  /**
   * Handle the service errors.
   * @param error
-   * @param {Request} req
-   * @param {res
+   * @param req
+   * @param res
   * @param next
   * @returns
   */
@@ -344,16 +140,6 @@ export default class NewCashflowTransactionController extends BaseController {
          ],
        });
      }
-      if (error.errorType === 'UNCATEGORIZED_TRANSACTION_TYPE_INVALID') {
-        return res.boom.badRequest(null, {
-          errors: [
-            {
-              type: 'UNCATEGORIZED_TRANSACTION_TYPE_INVALID',
-              code: 4100,
-            },
-          ],
-        });
-      }
    }
    next(error);
  }
--- a/packages/server/src/api/controllers/Contacts/Contacts.ts
+++ b/packages/server/src/api/controllers/Contacts/Contacts.ts
@@ -26,27 +26,27 @@ export default class ContactsController extends BaseController {
      [...this.autocompleteQuerySchema],
      this.validationResult,
      this.asyncMiddleware(this.autocompleteContacts.bind(this)),
-      this.dynamicListService.handlerErrorsToResponse,
+      this.dynamicListService.handlerErrorsToResponse
    );
    router.get(
      '/:id',
      [param('id').exists().isNumeric().toInt()],
      this.validationResult,
-      this.asyncMiddleware(this.getContact.bind(this)),
+      this.asyncMiddleware(this.getContact.bind(this))
    );
    router.post(
      '/:id/inactivate',
      [param('id').exists().isNumeric().toInt()],
      this.validationResult,
      this.asyncMiddleware(this.inactivateContact.bind(this)),
-      this.handlerServiceErrors,
+      this.handlerServiceErrors
    );
    router.post(
      '/:id/activate',
      [param('id').exists().isNumeric().toInt()],
      this.validationResult,
      this.asyncMiddleware(this.activateContact.bind(this)),
-      this.handlerServiceErrors,
+      this.handlerServiceErrors
    );
    return router;
  }
@@ -77,7 +77,7 @@ export default class ContactsController extends BaseController {
    try {
      const contact = await this.contactsService.getContact(
        tenantId,
-        contactId,
+        contactId
      );
      return res.status(200).send({
        customer: this.transfromToResponse(contact),
@@ -105,7 +105,7 @@ export default class ContactsController extends BaseController {
    try {
      const contacts = await this.contactsService.autocompleteContacts(
        tenantId,
-        filter,
+        filter
      );
      return res.status(200).send({ contacts });
    } catch (error) {
@@ -153,6 +153,7 @@ export default class ContactsController extends BaseController {
      check('email')
        .optional({ nullable: true })
        .isString()
+        .normalizeEmail()
        .isEmail()
        .isLength({ max: DATATYPES_LENGTH.STRING }),
      check('website')
@@ -379,7 +380,7 @@ export default class ContactsController extends BaseController {
    error: Error,
    req: Request,
    res: Response,
-    next: NextFunction,
+    next: NextFunction
  ) {
    if (error instanceof ServiceError) {
      if (error.errorType === 'contact_not_found') {
--- a/packages/server/src/api/controllers/Contacts/Customers.ts
+++ b/packages/server/src/api/controllers/Contacts/Customers.ts
@@ -160,8 +160,10 @@ export default class CustomersController extends ContactsController {
    try {
      const contact = await this.customersApplication.createCustomer(
        tenantId,
-        contactDTO
+        contactDTO,
+        user
      );
+
      return res.status(200).send({
        id: contact.id,
        message: 'The customer has been created successfully.',
--- a/packages/server/src/api/controllers/Contacts/Vendors.ts
+++ b/packages/server/src/api/controllers/Contacts/Vendors.ts
@@ -144,8 +144,10 @@ export default class VendorsController extends ContactsController {
    try {
      const vendor = await this.vendorsApplication.createVendor(
        tenantId,
-        contactDTO
+        contactDTO,
+        user
      );
+
      return res.status(200).send({
        id: vendor.id,
        message: 'The vendor has been created successfully.',
--- a/packages/server/src/api/controllers/Dashboard/index.ts
+++ b/packages/server/src/api/controllers/Dashboard/index.ts
@@ -8,10 +8,10 @@ export default class DashboardMetaController {
  dashboardService: DashboardService;

  /**
-   * Constructor router.
+   *
   * @returns
   */
-  public router() {
+  router() {
    const router = Router();

    router.get('/boot', this.getDashboardBoot);
@@ -25,7 +25,7 @@ export default class DashboardMetaController {
   * @param {Response} res - 
   * @param {NextFunction} next -
   */
-  private getDashboardBoot = async (
+  getDashboardBoot = async (
    req: Request,
    res: Response,
    next: NextFunction
--- a/packages/server/src/api/controllers/ExchangeRates.ts
+++ b/packages/server/src/api/controllers/ExchangeRates.ts
@@ -1,16 +1,19 @@
 import { Service, Inject } from 'typedi';
 import { Router, Request, Response, NextFunction } from 'express';
-import { query, oneOf } from 'express-validator';
+import { check, param, query } from 'express-validator';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import BaseController from './BaseController';
 import { ServiceError } from '@/exceptions';
-import { EchangeRateErrors } from '@/lib/ExchangeRate/types';
-import { ExchangeRateApplication } from '@/services/ExchangeRates/ExchangeRateApplication';
+import ExchangeRatesService from '@/services/ExchangeRates/ExchangeRatesService';
+import DynamicListingService from '@/services/DynamicListing/DynamicListService';

@Service()
 export default class ExchangeRatesController extends BaseController {
  @Inject()
-  private exchangeRatesApp: ExchangeRateApplication;
+  exchangeRatesService: ExchangeRatesService;
+
+  @Inject()
+  dynamicListService: DynamicListingService;

  /**
   * Constructor method.
@@ -19,40 +22,164 @@ export default class ExchangeRatesController extends BaseController {
    const router = Router();

    router.get(
-      '/latest',
-      [
-        oneOf([
-          query('to_currency').exists().isString().isISO4217(),
-          query('from_currency').exists().isString().isISO4217(),
-        ]),
-      ],
+      '/',
+      [...this.exchangeRatesListSchema],
      this.validationResult,
-      asyncMiddleware(this.latestExchangeRate.bind(this)),
+      asyncMiddleware(this.exchangeRates.bind(this)),
+      this.dynamicListService.handlerErrorsToResponse,
+      this.handleServiceError,
+    );
+    router.post(
+      '/',
+      [...this.exchangeRateDTOSchema],
+      this.validationResult,
+      asyncMiddleware(this.addExchangeRate.bind(this)),
+      this.handleServiceError
+    );
+    router.post(
+      '/:id',
+      [...this.exchangeRateEditDTOSchema, ...this.exchangeRateIdSchema],
+      this.validationResult,
+      asyncMiddleware(this.editExchangeRate.bind(this)),
+      this.handleServiceError
+    );
+    router.delete(
+      '/:id',
+      [...this.exchangeRateIdSchema],
+      this.validationResult,
+      asyncMiddleware(this.deleteExchangeRate.bind(this)),
      this.handleServiceError
    );
    return router;
  }

+  get exchangeRatesListSchema() {
+    return [
+      query('page').optional().isNumeric().toInt(),
+      query('page_size').optional().isNumeric().toInt(),
+
+      query('column_sort_by').optional(),
+      query('sort_order').optional().isIn(['desc', 'asc']),
+    ];
+  }
+
+  get exchangeRateDTOSchema() {
+    return [
+      check('exchange_rate').exists().isNumeric().toFloat(),
+      check('currency_code').exists().trim().escape(),
+      check('date').exists().isISO8601(),
+    ];
+  }
+
+  get exchangeRateEditDTOSchema() {
+    return [check('exchange_rate').exists().isNumeric().toFloat()];
+  }
+
+  get exchangeRateIdSchema() {
+    return [param('id').isNumeric().toInt()];
+  }
+
+  get exchangeRatesIdsSchema() {
+    return [
+      query('ids').isArray({ min: 2 }),
+      query('ids.*').isNumeric().toInt(),
+    ];
+  }
+
  /**
   * Retrieve exchange rates.
   * @param {Request} req
   * @param {Response} res
   * @param {NextFunction} next
   */
-  private async latestExchangeRate(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
+  async exchangeRates(req: Request, res: Response, next: NextFunction) {
    const { tenantId } = req;
-    const exchangeRateQuery = this.matchedQueryData(req);
+    const filter = {
+      page: 1,
+      pageSize: 12,
+      filterRoles: [],
+      columnSortBy: 'created_at',
+      sortOrder: 'asc',
+      ...this.matchedQueryData(req),
+    };
+    if (filter.stringifiedFilterRoles) {
+      filter.filterRoles = JSON.parse(filter.stringifiedFilterRoles);
+    }
+    try {
+      const exchangeRates = await this.exchangeRatesService.listExchangeRates(
+        tenantId,
+        filter
+      );
+      return res.status(200).send({ exchange_rates: exchangeRates });
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  /**
+   * Adds a new exchange rate on the given date.
+   * @param {Request} req
+   * @param {Response} res
+   * @param {NextFunction} next
+   */
+  async addExchangeRate(req: Request, res: Response, next: NextFunction) {
+    const { tenantId } = req;
+    const exchangeRateDTO = this.matchedBodyData(req);

    try {
-      const exchangeRate = await this.exchangeRatesApp.latest(
+      const exchangeRate = await this.exchangeRatesService.newExchangeRate(
        tenantId,
-        exchangeRateQuery
+        exchangeRateDTO
      );
-      return res.status(200).send(exchangeRate);
+      return res.status(200).send({ id: exchangeRate.id });
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  /**
+   * Edit the given exchange rate.
+   * @param {Request} req
+   * @param {Response} res
+   * @param {NextFunction} next
+   */
+  async editExchangeRate(req: Request, res: Response, next: NextFunction) {
+    const { tenantId } = req;
+    const { id: exchangeRateId } = req.params;
+    const exchangeRateDTO = this.matchedBodyData(req);
+
+    try {
+      const exchangeRate = await this.exchangeRatesService.editExchangeRate(
+        tenantId,
+        exchangeRateId,
+        exchangeRateDTO
+      );
+
+      return res.status(200).send({
+        id: exchangeRateId,
+        message: 'The exchange rate has been edited successfully.',
+      });
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  /**
+   * Delete the given exchange rate from the storage.
+   * @param {Request} req
+   * @param {Response} res
+   * @param {NextFunction} next
+   */
+  async deleteExchangeRate(req: Request, res: Response, next: NextFunction) {
+    const { tenantId } = req;
+    const { id: exchangeRateId } = req.params;
+
+    try {
+      await this.exchangeRatesService.deleteExchangeRate(
+        tenantId,
+        exchangeRateId
+      );
+      return res.status(200).send({ id: exchangeRateId });
    } catch (error) {
      next(error);
    }
@@ -65,56 +192,26 @@ export default class ExchangeRatesController extends BaseController {
   * @param {Response} res
   * @param {NextFunction} next
   */
-  private handleServiceError(
+  handleServiceError(
    error: Error,
    req: Request,
    res: Response,
    next: NextFunction
  ) {
    if (error instanceof ServiceError) {
-      if (EchangeRateErrors.EX_RATE_INVALID_BASE_CURRENCY === error.errorType) {
-        return res.status(400).send({
-          errors: [
-            {
-              type: EchangeRateErrors.EX_RATE_INVALID_BASE_CURRENCY,
-              code: 100,
-              message: 'The given base currency is invalid.',
-            },
-          ],
+      if (error.errorType === 'EXCHANGE_RATE_NOT_FOUND') {
+        return res.status(404).send({
+          errors: [{ type: 'EXCHANGE.RATE.NOT.FOUND', code: 200 }],
        });
-      } else if (
-        EchangeRateErrors.EX_RATE_SERVICE_NOT_ALLOWED === error.errorType
-      ) {
+      }
+      if (error.errorType === 'NOT_FOUND_EXCHANGE_RATES') {
        return res.status(400).send({
-          errors: [
-            {
-              type: EchangeRateErrors.EX_RATE_SERVICE_NOT_ALLOWED,
-              code: 200,
-              message: 'The service is not allowed',
-            },
-          ],
+          errors: [{ type: 'EXCHANGE.RATES.IS.NOT.FOUND', code: 100 }],
        });
-      } else if (
-        EchangeRateErrors.EX_RATE_SERVICE_API_KEY_REQUIRED === error.errorType
-      ) {
+      }
+      if (error.errorType === 'EXCHANGE_RATE_PERIOD_EXISTS') {
        return res.status(400).send({
-          errors: [
-            {
-              type: EchangeRateErrors.EX_RATE_SERVICE_API_KEY_REQUIRED,
-              code: 300,
-              message: 'The API key is required',
-            },
-          ],
-        });
-      } else if (EchangeRateErrors.EX_RATE_LIMIT_EXCEEDED === error.errorType) {
-        return res.status(400).send({
-          errors: [
-            {
-              type: EchangeRateErrors.EX_RATE_LIMIT_EXCEEDED,
-              code: 400,
-              message: 'The API rate limit has been exceeded',
-            },
-          ],
+          errors: [{ type: 'EXCHANGE.RATE.PERIOD.EXISTS', code: 300 }],
        });
      }
    }
--- a/packages/server/src/api/controllers/Expenses/Expenses.ts
+++ b/packages/server/src/api/controllers/Expenses/Expenses.ts
@@ -84,7 +84,7 @@ export class ExpensesController extends BaseController {
  /**
   * Expense DTO schema.
   */
-  private get expenseDTOSchema() {
+  get expenseDTOSchema() {
    return [
      check('reference_no')
        .optional({ nullable: true })
@@ -130,9 +130,6 @@ export class ExpensesController extends BaseController {
        .optional({ nullable: true })
        .isInt({ max: DATATYPES_LENGTH.INT_10 })
        .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
    ];
  }

@@ -186,9 +183,6 @@ export class ExpensesController extends BaseController {
        .optional({ nullable: true })
        .isInt({ max: DATATYPES_LENGTH.INT_10 })
        .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
    ];
  }

@@ -275,7 +269,7 @@ export class ExpensesController extends BaseController {
   * @param {Response} res
   * @param {NextFunction} next
   */
-  private async deleteExpense(req: Request, res: Response, next: NextFunction) {
+  async deleteExpense(req: Request, res: Response, next: NextFunction) {
    const { tenantId, user } = req;
    const { id: expenseId } = req.params;

@@ -297,11 +291,7 @@ export class ExpensesController extends BaseController {
   * @param {Response} res
   * @param {NextFunction} next
   */
-  private async publishExpense(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
+  async publishExpense(req: Request, res: Response, next: NextFunction) {
    const { tenantId, user } = req;
    const { id: expenseId } = req.params;

@@ -323,11 +313,7 @@ export class ExpensesController extends BaseController {
   * @param {Response} res
   * @param {NextFunction} next
   */
-  private async getExpensesList(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
+  async getExpensesList(req: Request, res: Response, next: NextFunction) {
    const { tenantId } = req;
    const filter = {
      sortOrder: 'desc',
@@ -357,7 +343,7 @@ export class ExpensesController extends BaseController {
   * @param {Response} res
   * @param {NextFunction} next
   */
-  private async getExpense(req: Request, res: Response, next: NextFunction) {
+  async getExpense(req: Request, res: Response, next: NextFunction) {
    const { tenantId } = req;
    const { id: expenseId } = req.params;

--- a/packages/server/src/api/controllers/Export/ExportController.ts
+++ b/packages/server/src/api/controllers/Export/ExportController.ts
@@ -1,87 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { Router, Request, Response, NextFunction } from 'express';
-import { query } from 'express-validator';
-import BaseController from '@/api/controllers/BaseController';
-import { ServiceError } from '@/exceptions';
-import { ExportApplication } from '@/services/Export/ExportApplication';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
-import { convertAcceptFormatToFormat } from './_utils';
-
-@Service()
-export class ExportController extends BaseController {
-  @Inject()
-  private exportResourceApp: ExportApplication;
-
-  /**
-   * Router constructor method.
-   */
-  public router() {
-    const router = Router();
-
-    router.get(
-      '/',
-      [
-        query('resource').exists(),
-        query('format').isIn(['csv', 'xlsx']).optional(),
-      ],
-      this.validationResult,
-      this.export.bind(this),
-    );
-    return router;
-  }
-
-  /**
-   * Imports xlsx/csv to the given resource type.
-   * @param {Request} req -
-   * @param {Response} res -
-   * @param {NextFunction} next -
-   */
-  private async export(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
-    const query = this.matchedQueryData(req);
-
-    try {
-      const accept = this.accepts(req);
-
-      const acceptType = accept.types([
-        ACCEPT_TYPE.APPLICATION_XLSX,
-        ACCEPT_TYPE.APPLICATION_CSV,
-        ACCEPT_TYPE.APPLICATION_PDF,
-      ]);
-      const applicationFormat = convertAcceptFormatToFormat(acceptType);
-
-      const data = await this.exportResourceApp.export(
-        tenantId,
-        query.resource,
-        applicationFormat
-      );
-      // Retrieves the csv format.
-      if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-        res.setHeader('Content-Type', 'text/csv');
-
-        return res.send(data);
-        // Retrieves the xlsx format.
-      } else if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-        res.setHeader(
-          'Content-Disposition',
-          'attachment; filename=output.xlsx'
-        );
-        res.setHeader(
-          'Content-Type',
-          'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-        );
-        return res.send(data);
-        //
-      } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': data.length,
-        });
-        res.send(data);
-      }
-    } catch (error) {
-      next(error);
-    }
-  }
-}
--- a/packages/server/src/api/controllers/Export/_utils.ts
+++ b/packages/server/src/api/controllers/Export/_utils.ts
@@ -1,13 +0,0 @@
-import { ACCEPT_TYPE } from '@/interfaces/Http';
-import { ExportFormat } from '@/services/Export/common';
-
-export const convertAcceptFormatToFormat = (accept: string): ExportFormat => {
-  switch (accept) {
-    case ACCEPT_TYPE.APPLICATION_CSV:
-      return ExportFormat.Csv;
-    case ACCEPT_TYPE.APPLICATION_PDF:
-      return ExportFormat.Pdf;
-    case ACCEPT_TYPE.APPLICATION_XLSX:
-      return ExportFormat.Xlsx;
-  }
-};
--- a/packages/server/src/api/controllers/FinancialStatements/APAgingSummary.ts
+++ b/packages/server/src/api/controllers/FinancialStatements/APAgingSummary.ts
@@ -2,20 +2,19 @@ import { Router, Request, Response, NextFunction } from 'express';
 import { query } from 'express-validator';
 import { Inject } from 'typedi';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
+import APAgingSummaryReportService from '@/services/FinancialStatements/AgingSummary/APAgingSummaryService';
 import BaseFinancialReportController from './BaseFinancialReportController';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
-import { APAgingSummaryApplication } from '@/services/FinancialStatements/AgingSummary/APAgingSummaryApplication';

 export default class APAgingSummaryReportController extends BaseFinancialReportController {
  @Inject()
-  private APAgingSummaryApp: APAgingSummaryApplication;
+  APAgingSummaryService: APAgingSummaryReportService;

  /**
   * Router constructor.
   */
-  public router() {
+  router() {
    const router = Router();

    router.get(
@@ -29,9 +28,8 @@ export default class APAgingSummaryReportController extends BaseFinancialReportC

  /**
   * Validation schema.
-   * @returns {ValidationChain[]}
   */
-  private get validationSchema() {
+  get validationSchema() {
    return [
      ...this.sheetNumberFormatValidationSchema,
      query('as_date').optional().isISO8601(),
@@ -51,68 +49,42 @@ export default class APAgingSummaryReportController extends BaseFinancialReportC
  }

  /**
-   * Retrieves payable aging summary report.
-   * @param {Request} req -
-   * @param {Response} res -
-   * @param {NextFunction} next -
+   * Retrieve payable aging summary report.
   */
-  private async payableAgingSummary(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
+  async payableAgingSummary(req: Request, res: Response, next: NextFunction) {
+    const { tenantId, settings } = req;
    const filter = this.matchedQueryData(req);

    try {
      const accept = this.accepts(req);
-      const acceptType = accept.types([
-        ACCEPT_TYPE.APPLICATION_JSON,
-        ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-        ACCEPT_TYPE.APPLICATION_CSV,
-        ACCEPT_TYPE.APPLICATION_XLSX,
-        ACCEPT_TYPE.APPLICATION_PDF
-      ]);
-      // Retrieves the json table format.
-      if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
-        const table = await this.APAgingSummaryApp.table(tenantId, filter);
+      const acceptType = accept.types(['json', 'application/json+table']);

-        return res.status(200).send(table);
-        // Retrieves the csv format.
-      } else if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-        const csv = await this.APAgingSummaryApp.csv(tenantId, filter);
+      switch (acceptType) {
+        case 'application/json+table':
+          const table = await this.APAgingSummaryService.APAgingSummaryTable(
+            tenantId,
+            filter
+          );
+          return res.status(200).send({
+            table: {
+              rows: table.rows,
+              columns: table.columns,
+            },
+            meta: table.meta,
+            query: table.query,
+          });
+          break;
+        default:
+          const { data, columns, query, meta } =
+            await this.APAgingSummaryService.APAgingSummary(tenantId, filter);

-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-        res.setHeader('Content-Type', 'text/csv');
-
-        return res.send(csv);
-        // Retrieves the xlsx format.
-      } else if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-        const buffer = await this.APAgingSummaryApp.xlsx(tenantId, filter);
-
-        res.setHeader(
-          'Content-Disposition',
-          'attachment; filename=output.xlsx'
-        );
-        res.setHeader(
-          'Content-Type',
-          'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-        );
-        return res.send(buffer);
-        // Retrieves the pdf format.
-      } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-        const pdfContent = await this.APAgingSummaryApp.pdf(tenantId, filter);
-
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': pdfContent.length,
-        });
-        return res.send(pdfContent);
-        // Retrieves the json format.
-      } else {
-        const sheet = await this.APAgingSummaryApp.sheet(tenantId, filter);
-
-        return res.status(200).send(sheet);
+          return res.status(200).send({
+            data: this.transfromToResponse(data),
+            columns: this.transfromToResponse(columns),
+            query: this.transfromToResponse(query),
+            meta: this.transfromToResponse(meta),
+          });
+          break;
      }
    } catch (error) {
      next(error);
--- a/packages/server/src/api/controllers/FinancialStatements/ARAgingSummary.ts
+++ b/packages/server/src/api/controllers/FinancialStatements/ARAgingSummary.ts
@@ -5,18 +5,16 @@ import ARAgingSummaryService from '@/services/FinancialStatements/AgingSummary/A
 import BaseFinancialReportController from './BaseFinancialReportController';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { ARAgingSummaryApplication } from '@/services/FinancialStatements/AgingSummary/ARAgingSummaryApplication';
-import { ACCEPT_TYPE } from '@/interfaces/Http';

@Service()
 export default class ARAgingSummaryReportController extends BaseFinancialReportController {
  @Inject()
-  private ARAgingSummaryApp: ARAgingSummaryApplication;
+  ARAgingSummaryService: ARAgingSummaryService;

  /**
   * Router constructor.
   */
-  public router() {
+  router() {
    const router = Router();

    router.get(
@@ -32,7 +30,7 @@ export default class ARAgingSummaryReportController extends BaseFinancialReportC
  /**
   * AR aging summary validation roles.
   */
-  private get validationSchema() {
+  get validationSchema() {
    return [
      ...this.sheetNumberFormatValidationSchema,

@@ -54,63 +52,41 @@ export default class ARAgingSummaryReportController extends BaseFinancialReportC

  /**
   * Retrieve AR aging summary report.
-   * @param {Request} req
-   * @param {Response} res
   */
-  private async receivableAgingSummary(req: Request, res: Response) {
-    const { tenantId } = req;
+  async receivableAgingSummary(req: Request, res: Response) {
+    const { tenantId, settings } = req;
    const filter = this.matchedQueryData(req);

    try {
      const accept = this.accepts(req);
+      const acceptType = accept.types(['json', 'application/json+table']);

-      const acceptType = accept.types([
-        ACCEPT_TYPE.APPLICATION_JSON,
-        ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-        ACCEPT_TYPE.APPLICATION_CSV,
-        ACCEPT_TYPE.APPLICATION_XLSX,
-        ACCEPT_TYPE.APPLICATION_PDF
-      ]);
-      // Retrieves the xlsx format.
-      if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-        const buffer = await this.ARAgingSummaryApp.xlsx(tenantId, filter);
+      switch (acceptType) {
+        case 'application/json+table':
+          const table = await this.ARAgingSummaryService.ARAgingSummaryTable(
+            tenantId,
+            filter
+          );
+          return res.status(200).send({
+            table: {
+              rows: table.rows,
+              columns: table.columns,
+            },
+            meta: table.meta,
+            query: table.query,
+          });
+          break;
+        default:
+          const { data, columns, query, meta } =
+            await this.ARAgingSummaryService.ARAgingSummary(tenantId, filter);

-        res.setHeader(
-          'Content-Disposition',
-          'attachment; filename=output.xlsx'
-        );
-        res.setHeader(
-          'Content-Type',
-          'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-        );
-        return res.send(buffer);
-        // Retrieves the table format.
-      } else if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
-        const table = await this.ARAgingSummaryApp.table(tenantId, filter);
-
-        return res.status(200).send(table);
-        // Retrieves the csv format.
-      } else if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-        const buffer = await this.ARAgingSummaryApp.csv(tenantId, filter);
-
-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-        res.setHeader('Content-Type', 'text/csv');
-
-        return res.send(buffer);
-        // Retrieves the pdf format.
-      } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-        const pdfContent = await this.ARAgingSummaryApp.pdf(tenantId, filter);
-
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': pdfContent.length,
-        });
-        return res.send(pdfContent);
-        // Retrieves the json format.
-      } else {
-        const sheet = await this.ARAgingSummaryApp.sheet(tenantId, filter);
-
-        return res.status(200).send(sheet);
+          return res.status(200).send({
+            data: this.transfromToResponse(data),
+            columns: this.transfromToResponse(columns),
+            query: this.transfromToResponse(query),
+            meta: this.transfromToResponse(meta),
+          });
+          break;
      }
    } catch (error) {
      console.log(error);
--- a/packages/server/src/api/controllers/FinancialStatements/BalanceSheet.ts
+++ b/packages/server/src/api/controllers/FinancialStatements/BalanceSheet.ts
@@ -3,21 +3,25 @@ import { Router, Request, Response, NextFunction } from 'express';
 import { query, ValidationChain } from 'express-validator';
 import { castArray } from 'lodash';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
+import BalanceSheetStatementService from '@/services/FinancialStatements/BalanceSheet/BalanceSheetService';
 import BaseFinancialReportController from './BaseFinancialReportController';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { BalanceSheetApplication } from '@/services/FinancialStatements/BalanceSheet/BalanceSheetApplication';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
+import BalanceSheetTable from '@/services/FinancialStatements/BalanceSheet/BalanceSheetTable';
+import HasTenancyService from '@/services/Tenancy/TenancyService';

@Service()
 export default class BalanceSheetStatementController extends BaseFinancialReportController {
  @Inject()
-  private balanceSheetApp: BalanceSheetApplication;
+  balanceSheetService: BalanceSheetStatementService;
+
+  @Inject()
+  tenancy: HasTenancyService;

  /**
   * Router constructor.
   */
-  public router() {
+  router() {
    const router = Router();

    router.get(
@@ -34,7 +38,7 @@ export default class BalanceSheetStatementController extends BaseFinancialReport
   * Balance sheet validation schecma.
   * @returns {ValidationChain[]}
   */
-  private get balanceSheetValidationSchema(): ValidationChain[] {
+  get balanceSheetValidationSchema(): ValidationChain[] {
    return [
      ...this.sheetNumberFormatValidationSchema,
      query('accounting_method').optional().isIn(['cash', 'accrual']),
@@ -80,12 +84,10 @@ export default class BalanceSheetStatementController extends BaseFinancialReport

  /**
   * Retrieve the balance sheet.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
   */
-  private async balanceSheet(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
+  async balanceSheet(req: Request, res: Response, next: NextFunction) {
+    const { tenantId, settings } = req;
+    const i18n = this.tenancy.i18n(tenantId);

    let filter = this.matchedQueryData(req);

@@ -93,55 +95,29 @@ export default class BalanceSheetStatementController extends BaseFinancialReport
      ...filter,
      accountsIds: castArray(filter.accountsIds),
    };
+
    try {
+      const { data, columns, query, meta } =
+        await this.balanceSheetService.balanceSheet(tenantId, filter);
+
      const accept = this.accepts(req);
+      const acceptType = accept.types(['json', 'application/json+table']);

-      const acceptType = accept.types([
-        ACCEPT_TYPE.APPLICATION_JSON,
-        ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-        ACCEPT_TYPE.APPLICATION_XLSX,
-        ACCEPT_TYPE.APPLICATION_CSV,
-        ACCEPT_TYPE.APPLICATION_PDF,
-      ]);
-      // Retrieves the json table format.
-      if (ACCEPT_TYPE.APPLICATION_JSON_TABLE == acceptType) {
-        const table = await this.balanceSheetApp.table(tenantId, filter);
+      const table = new BalanceSheetTable(data, query, i18n);

-        return res.status(200).send(table);
-        // Retrieves the csv format.
-      } else if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-        const buffer = await this.balanceSheetApp.csv(tenantId, filter);
-
-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-        res.setHeader('Content-Type', 'text/csv');
-
-        return res.send(buffer);
-        // Retrieves the xlsx format.
-      } else if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-        const buffer = await this.balanceSheetApp.xlsx(tenantId, filter);
-
-        res.setHeader(
-          'Content-Disposition',
-          'attachment; filename=output.xlsx'
-        );
-        res.setHeader(
-          'Content-Type',
-          'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-        );
-        return res.send(buffer);
-        // Retrieves the pdf format.
-      } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-        const pdfContent = await this.balanceSheetApp.pdf(tenantId, filter);
-
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': pdfContent.length,
-        });
-        res.send(pdfContent);
-      } else {
-        const sheet = await this.balanceSheetApp.sheet(tenantId, filter);
-
-        return res.status(200).send(sheet);
+      switch (acceptType) {
+        case 'application/json+table':
+          return res.status(200).send({
+            table: {
+              rows: table.tableRows(),
+              columns: table.tableColumns(),
+            },
+            query,
+            meta,
+          });
+        case 'json':
+        default:
+          return res.status(200).send({ data, columns, query, meta });
      }
    } catch (error) {
      next(error);
--- a/packages/server/src/api/controllers/FinancialStatements/CashFlow/CashFlow.ts
+++ b/packages/server/src/api/controllers/FinancialStatements/CashFlow/CashFlow.ts
@@ -8,20 +8,29 @@ import {
  ValidationChain,
 } from 'express';
 import BaseFinancialReportController from '../BaseFinancialReportController';
-import { AbilitySubject, ReportsAction } from '@/interfaces';
+import CashFlowStatementService from '@/services/FinancialStatements/CashFlow/CashFlowService';
+import {
+  ICashFlowStatementDOO,
+  ICashFlowStatement,
+  AbilitySubject,
+  ReportsAction,
+} from '@/interfaces';
+import CashFlowTable from '@/services/FinancialStatements/CashFlow/CashFlowTable';
+import HasTenancyService from '@/services/Tenancy/TenancyService';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
-import { CashflowSheetApplication } from '@/services/FinancialStatements/CashFlow/CashflowSheetApplication';

@Service()
 export default class CashFlowController extends BaseFinancialReportController {
  @Inject()
-  private cashflowSheetApp: CashflowSheetApplication;
+  cashFlowService: CashFlowStatementService;
+
+  @Inject()
+  tenancy: HasTenancyService;

  /**
   * Router constructor.
   */
-  public router() {
+  router() {
    const router = Router();

    router.get(
@@ -38,7 +47,7 @@ export default class CashFlowController extends BaseFinancialReportController {
   * Balance sheet validation schecma.
   * @returns {ValidationChain[]}
   */
-  private get cashflowValidationSchema(): ValidationChain[] {
+  get cashflowValidationSchema(): ValidationChain[] {
    return [
      ...this.sheetNumberFormatValidationSchema,
      query('from_date').optional(),
@@ -58,6 +67,41 @@ export default class CashFlowController extends BaseFinancialReportController {
    ];
  }

+  /**
+   * Retrieve the cashflow statment to json response.
+   * @param {ICashFlowStatement} cashFlow -
+   */
+  private transformJsonResponse(cashFlowDOO: ICashFlowStatementDOO) {
+    const { data, query, meta } = cashFlowDOO;
+
+    return {
+      data: this.transfromToResponse(data),
+      query: this.transfromToResponse(query),
+      meta: this.transfromToResponse(meta),
+    };
+  }
+
+  /**
+   * Transformes the report statement to table rows.
+   * @param {ITransactionsByVendorsStatement} statement -
+   */
+  private transformToTableRows(
+    cashFlowDOO: ICashFlowStatementDOO,
+    tenantId: number
+  ) {
+    const i18n = this.tenancy.i18n(tenantId);
+    const cashFlowTable = new CashFlowTable(cashFlowDOO, i18n);
+
+    return {
+      table: {
+        data: cashFlowTable.tableRows(),
+        columns: cashFlowTable.tableColumns(),
+      },
+      query: this.transfromToResponse(cashFlowDOO.query),
+      meta: this.transfromToResponse(cashFlowDOO.meta),
+    };
+  }
+
  /**
   * Retrieve the cash flow statment.
   * @param {Request} req
@@ -65,62 +109,26 @@ export default class CashFlowController extends BaseFinancialReportController {
   * @param {NextFunction} next
   * @returns {Response}
   */
-  public async cashFlow(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
+  async cashFlow(req: Request, res: Response, next: NextFunction) {
+    const { tenantId, settings } = req;
    const filter = {
      ...this.matchedQueryData(req),
    };

    try {
+      const cashFlow = await this.cashFlowService.cashFlow(tenantId, filter);
+
      const accept = this.accepts(req);
+      const acceptType = accept.types(['json', 'application/json+table']);

-      const acceptType = accept.types([
-        ACCEPT_TYPE.APPLICATION_JSON,
-        ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-        ACCEPT_TYPE.APPLICATION_CSV,
-        ACCEPT_TYPE.APPLICATION_XLSX,
-        ACCEPT_TYPE.APPLICATION_PDF
-      ]);
-      // Retrieves the json table format.
-      if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
-        const table = await this.cashflowSheetApp.table(tenantId, filter);
-
-        return res.status(200).send(table);
-        // Retrieves the csv format.
-      } else if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-        const buffer = await this.cashflowSheetApp.csv(tenantId, filter);
-
-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-        res.setHeader('Content-Type', 'text/csv');
-
-        return res.status(200).send(buffer);
-        // Retrieves the pdf format.
-      } else if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-        const buffer = await this.cashflowSheetApp.xlsx(tenantId, filter);
-
-        res.setHeader(
-          'Content-Disposition',
-          'attachment; filename=output.xlsx'
-        );
-        res.setHeader(
-          'Content-Type',
-          'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-        );
-        return res.send(buffer);
-        // Retrieves the pdf format.
-      } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-        const pdfContent = await this.cashflowSheetApp.pdf(tenantId, filter);
-
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': pdfContent.length,
-        });
-        return res.send(pdfContent);
-        // Retrieves the json format.
-      } else {
-        const cashflow = await this.cashflowSheetApp.sheet(tenantId, filter);
-
-        return res.status(200).send(cashflow);
+      switch (acceptType) {
+        case 'application/json+table':
+          return res
+            .status(200)
+            .send(this.transformToTableRows(cashFlow, tenantId));
+        case 'json':
+        default:
+          return res.status(200).send(this.transformJsonResponse(cashFlow));
      }
    } catch (error) {
      next(error);
--- a/packages/server/src/api/controllers/FinancialStatements/CustomerBalanceSummary/index.ts
+++ b/packages/server/src/api/controllers/FinancialStatements/CustomerBalanceSummary/index.ts
@@ -1,21 +1,29 @@
 import { Router, Request, Response, NextFunction } from 'express';
 import { query } from 'express-validator';
 import { Inject } from 'typedi';
-import { AbilitySubject, ReportsAction } from '@/interfaces';
+import {
+  AbilitySubject,
+  ICustomerBalanceSummaryStatement,
+  ReportsAction,
+} from '@/interfaces';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
+import CustomerBalanceSummary from '@/services/FinancialStatements/CustomerBalanceSummary/CustomerBalanceSummaryService';
 import BaseFinancialReportController from '../BaseFinancialReportController';
+import CustomerBalanceSummaryTableRows from '@/services/FinancialStatements/CustomerBalanceSummary/CustomerBalanceSummaryTableRows';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
-import { CustomerBalanceSummaryApplication } from '@/services/FinancialStatements/CustomerBalanceSummary/CustomerBalanceSummaryApplication';
+import HasTenancyService from '@/services/Tenancy/TenancyService';

 export default class CustomerBalanceSummaryReportController extends BaseFinancialReportController {
  @Inject()
-  private customerBalanceSummaryApp: CustomerBalanceSummaryApplication;
+  customerBalanceSummaryService: CustomerBalanceSummary;
+
+  @Inject()
+  tenancy: HasTenancyService;

  /**
   * Router constructor.
   */
-  public router() {
+  router() {
    const router = Router();

    router.get(
@@ -34,7 +42,7 @@ export default class CustomerBalanceSummaryReportController extends BaseFinancia
  /**
   * Validation schema.
   */
-  private get validationSchema() {
+  get validationSchema() {
    return [
      ...this.sheetNumberFormatValidationSchema,

@@ -54,81 +62,75 @@ export default class CustomerBalanceSummaryReportController extends BaseFinancia
    ];
  }

+  /**
+   * Transformes the balance summary statement to table rows.
+   * @param {ICustomerBalanceSummaryStatement} statement -
+   */
+  private transformToTableRows(
+    tenantId,
+    { data, query }: ICustomerBalanceSummaryStatement
+  ) {
+    const i18n = this.tenancy.i18n(tenantId);
+    const tableRows = new CustomerBalanceSummaryTableRows(data, query, i18n);
+
+    return {
+      table: {
+        columns: tableRows.tableColumns(),
+        data: tableRows.tableRows(),
+      },
+      query: this.transfromToResponse(query),
+    };
+  }
+
+  /**
+   * Transformes the balance summary statement to raw json.
+   * @param {ICustomerBalanceSummaryStatement} customerBalance -
+   */
+  private transformToJsonResponse({
+    data,
+    columns,
+    query,
+  }: ICustomerBalanceSummaryStatement) {
+    return {
+      data: this.transfromToResponse(data),
+      columns: this.transfromToResponse(columns),
+      query: this.transfromToResponse(query),
+    };
+  }
+
  /**
   * Retrieve payable aging summary report.
   * @param {Request} req -
   * @param {Response} res -
   * @param {NextFunction} next -
   */
-  private async customerBalanceSummary(
+  async customerBalanceSummary(
    req: Request,
    res: Response,
    next: NextFunction
  ) {
-    const { tenantId } = req;
+    const { tenantId, settings } = req;
    const filter = this.matchedQueryData(req);

    try {
+      const customerBalanceSummary =
+        await this.customerBalanceSummaryService.customerBalanceSummary(
+          tenantId,
+          filter
+        );
      const accept = this.accepts(req);
-      const acceptType = accept.types([
-        ACCEPT_TYPE.APPLICATION_JSON,
-        ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-        ACCEPT_TYPE.APPLICATION_CSV,
-        ACCEPT_TYPE.APPLICATION_XLSX,
-        ACCEPT_TYPE.APPLICATION_PDF,
-      ]);
+      const acceptType = accept.types(['json', 'application/json+table']);

-      // Retrieves the xlsx format.
-      if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-        const buffer = await this.customerBalanceSummaryApp.xlsx(
-          tenantId,
-          filter
-        );
-        res.setHeader(
-          'Content-Disposition',
-          'attachment; filename=output.xlsx'
-        );
-        res.setHeader(
-          'Content-Type',
-          'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-        );
-        return res.send(buffer);
-        // Retrieves the csv format.
-      } else if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-        const buffer = await this.customerBalanceSummaryApp.csv(
-          tenantId,
-          filter
-        );
-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-        res.setHeader('Content-Type', 'text/csv');
-
-        return res.send(buffer);
-        // Retrieves the json table format.
-      } else if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
-        const table = await this.customerBalanceSummaryApp.table(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(table);
-        // Retrieves the pdf format.
-      } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-        const buffer = await this.customerBalanceSummaryApp.pdf(
-          tenantId,
-          filter
-        );
-
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': buffer.length,
-        });
-        return res.send(buffer);
-        // Retrieves the json format.
-      } else {
-        const sheet = await this.customerBalanceSummaryApp.sheet(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(sheet);
+      switch (acceptType) {
+        case 'application/json+table':
+          return res
+            .status(200)
+            .send(this.transformToTableRows(tenantId, customerBalanceSummary));
+        case 'application/json':
+        default:
+          return res
+            .status(200)
+            .send(this.transformToJsonResponse(customerBalanceSummary));
      }
    } catch (error) {
      next(error);
--- a/packages/server/src/api/controllers/FinancialStatements/GeneralLedger.ts
+++ b/packages/server/src/api/controllers/FinancialStatements/GeneralLedger.ts
@@ -2,21 +2,20 @@ import { Router, Request, Response, NextFunction } from 'express';
 import { query, ValidationChain } from 'express-validator';
 import { Inject, Service } from 'typedi';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
+import GeneralLedgerService from '@/services/FinancialStatements/GeneralLedger/GeneralLedgerService';
 import BaseFinancialReportController from './BaseFinancialReportController';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
-import { GeneralLedgerApplication } from '@/services/FinancialStatements/GeneralLedger/GeneralLedgerApplication';

@Service()
 export default class GeneralLedgerReportController extends BaseFinancialReportController {
  @Inject()
-  private generalLedgerApplication: GeneralLedgerApplication;
+  generalLedgetService: GeneralLedgerService;

  /**
   * Router constructor.
   */
-  public router() {
+  router() {
    const router = Router();

    router.get(
@@ -32,7 +31,7 @@ export default class GeneralLedgerReportController extends BaseFinancialReportCo
  /**
   * Validation schema.
   */
-  private get validationSchema(): ValidationChain[] {
+  get validationSchema(): ValidationChain[] {
    return [
      query('from_date').optional().isISO8601(),
      query('to_date').optional().isISO8601(),
@@ -61,56 +60,21 @@ export default class GeneralLedgerReportController extends BaseFinancialReportCo
   * @param {Request} req -
   * @param {Response} res -
   */
-  private async generalLedger(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
+  async generalLedger(req: Request, res: Response, next: NextFunction) {
+    const { tenantId, settings } = req;
    const filter = this.matchedQueryData(req);
-    const accept = this.accepts(req);

-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-      ACCEPT_TYPE.APPLICATION_XLSX,
-      ACCEPT_TYPE.APPLICATION_CSV,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
-    // Retrieves the table format.
-    if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
-      const table = await this.generalLedgerApplication.table(tenantId, filter);
+    try {
+      const { data, query, meta } =
+        await this.generalLedgetService.generalLedger(tenantId, filter);

-      return res.status(200).send(table);
-      // Retrieves the csv format.
-    } else if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-      const buffer = await this.generalLedgerApplication.csv(tenantId, filter);
-
-      res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-      res.setHeader('Content-Type', 'text/csv');
-
-      return res.send(buffer);
-      // Retrieves the xlsx format.
-    } else if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-      const buffer = await this.generalLedgerApplication.xlsx(tenantId, filter);
-
-      res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
-      res.setHeader(
-        'Content-Type',
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-      );
-      return res.send(buffer);
-      // Retrieves the pdf format.
-    } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-      const pdfContent = await this.generalLedgerApplication.pdf(
-        tenantId,
-        filter
-      );
-      res.set({
-        'Content-Type': 'application/pdf',
-        'Content-Length': pdfContent.length,
+      return res.status(200).send({
+        meta: this.transfromToResponse(meta),
+        data: this.transfromToResponse(data),
+        query: this.transfromToResponse(query),
      });
-      return res.send(pdfContent);
-      // Retrieves the json format.
-    } else {
-      const sheet = await this.generalLedgerApplication.sheet(tenantId, filter);
-      return res.status(200).send(sheet);
+    } catch (error) {
+      next(error);
    }
  }
 }
--- a/packages/server/src/api/controllers/FinancialStatements/InventoryDetails/index.ts
+++ b/packages/server/src/api/controllers/FinancialStatements/InventoryDetails/index.ts
@@ -8,20 +8,24 @@ import {
  ValidationChain,
 } from 'express';
 import BaseController from '@/api/controllers/BaseController';
+import InventoryDetailsService from '@/services/FinancialStatements/InventoryDetails/InventoryDetailsService';
+import InventoryDetailsTable from '@/services/FinancialStatements/InventoryDetails/InventoryDetailsTable';
+import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
-import { InventortyDetailsApplication } from '@/services/FinancialStatements/InventoryDetails/InventoryDetailsApplication';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { ACCEPT_TYPE } from '@/interfaces/Http';

@Service()
 export default class InventoryDetailsController extends BaseController {
  @Inject()
-  private inventoryItemDetailsApp: InventortyDetailsApplication;
+  inventoryDetailsService: InventoryDetailsService;
+
+  @Inject()
+  tenancy: HasTenancyService;

  /**
   * Router constructor.
   */
-  public router() {
+  router() {
    const router = Router();

    router.get(
@@ -41,7 +45,7 @@ export default class InventoryDetailsController extends BaseController {
   * Balance sheet validation schecma.
   * @returns {ValidationChain[]}
   */
-  private get validationSchema(): ValidationChain[] {
+  get validationSchema(): ValidationChain[] {
    return [
      query('number_format.precision')
        .optional()
@@ -73,76 +77,69 @@ export default class InventoryDetailsController extends BaseController {
  }

  /**
-   * Retrieve the inventory item details sheet.
+   * Retrieve the cashflow statment to json response.
+   * @param {ICashFlowStatement} cashFlow -
+   */
+  private transformJsonResponse(inventoryDetails) {
+    const { data, query, meta } = inventoryDetails;
+
+    return {
+      data: this.transfromToResponse(data),
+      query: this.transfromToResponse(query),
+      meta: this.transfromToResponse(meta),
+    };
+  }
+
+  /**
+   * Transformes the report statement to table rows.
+   */
+  private transformToTableRows(inventoryDetails, tenantId: number) {
+    const i18n = this.tenancy.i18n(tenantId);
+    const inventoryDetailsTable = new InventoryDetailsTable(
+      inventoryDetails,
+      i18n
+    );
+
+    return {
+      table: {
+        data: inventoryDetailsTable.tableData(),
+        columns: inventoryDetailsTable.tableColumns(),
+      },
+      query: this.transfromToResponse(inventoryDetails.query),
+      meta: this.transfromToResponse(inventoryDetails.meta),
+    };
+  }
+
+  /**
+   * Retrieve the cash flow statment.
   * @param {Request} req
   * @param {Response} res
   * @param {NextFunction} next
   * @returns {Response}
   */
-  private async inventoryDetails(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
+  async inventoryDetails(req: Request, res: Response, next: NextFunction) {
+    const { tenantId, settings } = req;
    const filter = {
      ...this.matchedQueryData(req),
    };

    try {
+      const inventoryDetails =
+        await this.inventoryDetailsService.inventoryDetails(tenantId, filter);
+
      const accept = this.accepts(req);
-      const acceptType = accept.types([
-        ACCEPT_TYPE.APPLICATION_JSON,
-        ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-        ACCEPT_TYPE.APPLICATION_CSV,
-        ACCEPT_TYPE.APPLICATION_XLSX,
-        ACCEPT_TYPE.APPLICATION_PDF,
-      ]);
-      // Retrieves the csv format.
-      if (acceptType === ACCEPT_TYPE.APPLICATION_CSV) {
-        const buffer = await this.inventoryItemDetailsApp.csv(tenantId, filter);
+      const acceptType = accept.types(['json', 'application/json+table']);

-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-        res.setHeader('Content-Type', 'text/csv');
-
-        return res.send(buffer);
-        // Retrieves the xlsx format.
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_XLSX) {
-        const buffer = await this.inventoryItemDetailsApp.xlsx(
-          tenantId,
-          filter
-        );
-        res.setHeader(
-          'Content-Disposition',
-          'attachment; filename=output.xlsx'
-        );
-        res.setHeader(
-          'Content-Type',
-          'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-        );
-        return res.send(buffer);
-        // Retrieves the json table format.
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_JSON_TABLE) {
-        const table = await this.inventoryItemDetailsApp.table(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(table);
-        // Retrieves the pdf format.
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_PDF) {
-        const buffer = await this.inventoryItemDetailsApp.pdf(tenantId, filter);
-
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': buffer.length,
-        });
-        return res.send(buffer);
-      } else {
-        const sheet = await this.inventoryItemDetailsApp.sheet(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(sheet);
+      switch (acceptType) {
+        case 'application/json+table':
+          return res
+            .status(200)
+            .send(this.transformToTableRows(inventoryDetails, tenantId));
+        case 'json':
+        default:
+          return res
+            .status(200)
+            .send(this.transformJsonResponse(inventoryDetails));
      }
    } catch (error) {
      next(error);
--- a/packages/server/src/api/controllers/FinancialStatements/InventoryValuationSheet.ts
+++ b/packages/server/src/api/controllers/FinancialStatements/InventoryValuationSheet.ts
@@ -3,15 +3,14 @@ import { query, ValidationChain } from 'express-validator';
 import { Inject, Service } from 'typedi';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import BaseFinancialReportController from './BaseFinancialReportController';
+import InventoryValuationService from '@/services/FinancialStatements/InventoryValuationSheet/InventoryValuationSheetService';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { InventoryValuationSheetApplication } from '@/services/FinancialStatements/InventoryValuationSheet/InventoryValuationSheetApplication';
-import { ACCEPT_TYPE } from '@/interfaces/Http';

@Service()
 export default class InventoryValuationReportController extends BaseFinancialReportController {
  @Inject()
-  private inventoryValuationApp: InventoryValuationSheetApplication;
+  inventoryValuationService: InventoryValuationService;

  /**
   * Router constructor.
@@ -72,55 +71,19 @@ export default class InventoryValuationReportController extends BaseFinancialRep
    const { tenantId } = req;
    const filter = this.matchedQueryData(req);

-    const accept = this.accepts(req);
-
-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-      ACCEPT_TYPE.APPLICATION_XLSX,
-      ACCEPT_TYPE.APPLICATION_CSV,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
-
-    // Retrieves the json table format.
-    if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
-      const table = await this.inventoryValuationApp.table(tenantId, filter);
-
-      return res.status(200).send(table);
-      // Retrieves the csv format.
-    } else if (ACCEPT_TYPE.APPLICATION_CSV == acceptType) {
-      const buffer = await this.inventoryValuationApp.csv(tenantId, filter);
-
-      res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-      res.setHeader('Content-Type', 'text/csv');
-
-      return res.send(buffer);
-      // Retrieves the xslx buffer format.
-    } else if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-      const buffer = await this.inventoryValuationApp.xlsx(tenantId, filter);
-
-      res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
-      res.setHeader(
-        'Content-Type',
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-      );
-      return res.send(buffer);
-      // Retrieves the pdf format.
-    } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-      const pdfContent = await this.inventoryValuationApp.pdf(tenantId, filter);
-
-      res.set({
-        'Content-Type': 'application/pdf',
-        'Content-Length': pdfContent.length,
+    try {
+      const { data, query, meta } =
+        await this.inventoryValuationService.inventoryValuationSheet(
+          tenantId,
+          filter
+        );
+      return res.status(200).send({
+        meta: this.transfromToResponse(meta),
+        data: this.transfromToResponse(data),
+        query: this.transfromToResponse(query),
      });
-      return res.status(200).send(pdfContent);
-      // Retrieves the json format.
-    } else {
-      const { data, query, meta } = await this.inventoryValuationApp.sheet(
-        tenantId,
-        filter
-      );
-      return res.status(200).send({ meta, data, query });
+    } catch (error) {
+      next(error);
    }
  }
 }
--- a/packages/server/src/api/controllers/FinancialStatements/JournalSheet.ts
+++ b/packages/server/src/api/controllers/FinancialStatements/JournalSheet.ts
@@ -3,15 +3,14 @@ import { Request, Response, Router, NextFunction } from 'express';
 import { castArray } from 'lodash';
 import { query, oneOf } from 'express-validator';
 import BaseFinancialReportController from './BaseFinancialReportController';
+import JournalSheetService from '@/services/FinancialStatements/JournalSheet/JournalSheetService';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
-import { JournalSheetApplication } from '@/services/FinancialStatements/JournalSheet/JournalSheetApplication';

@Service()
 export default class JournalSheetController extends BaseFinancialReportController {
  @Inject()
-  private journalSheetApp: JournalSheetApplication;
+  journalService: JournalSheetService;

  /**
   * Router constructor.
@@ -58,58 +57,28 @@ export default class JournalSheetController extends BaseFinancialReportControlle
   * @param {Request} req -
   * @param {Response} res -
   */
-  private async journal(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
+  async journal(req: Request, res: Response, next: NextFunction) {
+    const { tenantId, settings } = req;
    let filter = this.matchedQueryData(req);

    filter = {
      ...filter,
      accountsIds: castArray(filter.accountsIds),
    };
-    const accept = this.accepts(req);
-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-      ACCEPT_TYPE.APPLICATION_XLSX,
-      ACCEPT_TYPE.APPLICATION_CSV,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);

-    // Retrieves the json table format.
-    if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
-      const table = await this.journalSheetApp.table(tenantId, filter);
-      return res.status(200).send(table);
-      // Retrieves the csv format.
-    } else if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-      const buffer = await this.journalSheetApp.csv(tenantId, filter);
-  
-      res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-      res.setHeader('Content-Type', 'text/csv');
-
-      return res.send(buffer);
-      // Retrieves the xlsx format.
-    } else if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-      const buffer = await this.journalSheetApp.xlsx(tenantId, filter);
-
-      res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
-      res.setHeader(
-        'Content-Type',
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+    try {
+      const { data, query, meta } = await this.journalService.journalSheet(
+        tenantId,
+        filter
      );
-      return res.send(buffer);
-      // Retrieves the json format.
-    } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-      const pdfContent = await this.journalSheetApp.pdf(tenantId, filter);

-      res.set({
-        'Content-Type': 'application/pdf',
-        'Content-Length': pdfContent.length,
+      return res.status(200).send({
+        data: this.transfromToResponse(data),
+        query: this.transfromToResponse(query),
+        meta: this.transfromToResponse(meta),
      });
-      res.send(pdfContent);
-    } else {
-      const sheet = await this.journalSheetApp.sheet(tenantId, filter);
-
-      return res.status(200).send(sheet);
+    } catch (error) {
+      next(error);
    }
  }
 }
--- a/packages/server/src/api/controllers/FinancialStatements/ProfitLossSheet.ts
+++ b/packages/server/src/api/controllers/FinancialStatements/ProfitLossSheet.ts
@@ -1,20 +1,24 @@
 import { Service, Inject } from 'typedi';
 import { Router, Request, Response, NextFunction } from 'express';
 import { query, ValidationChain } from 'express-validator';
+import ProfitLossSheetService from '@/services/FinancialStatements/ProfitLossSheet/ProfitLossSheetService';
 import BaseFinancialReportController from './BaseFinancialReportController';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
-import { ProfitLossSheetApplication } from '@/services/FinancialStatements/ProfitLossSheet/ProfitLossSheetApplication';
+import { ProfitLossSheetTable } from '@/services/FinancialStatements/ProfitLossSheet/ProfitLossSheetTable';
+import HasTenancyService from '@/services/Tenancy/TenancyService';
@Service()
 export default class ProfitLossSheetController extends BaseFinancialReportController {
  @Inject()
-  private profitLossSheetApp: ProfitLossSheetApplication;
+  profitLossSheetService: ProfitLossSheetService;
+
+  @Inject()
+  tenancy: HasTenancyService;

  /**
   * Router constructor.
   */
-  public router() {
+  router() {
    const router = Router();

    router.get(
@@ -30,7 +34,7 @@ export default class ProfitLossSheetController extends BaseFinancialReportContro
  /**
   * Validation schema.
   */
-  private get validationSchema(): ValidationChain[] {
+  get validationSchema(): ValidationChain[] {
    return [
      ...this.sheetNumberFormatValidationSchema,
      query('basis').optional(),
@@ -81,63 +85,37 @@ export default class ProfitLossSheetController extends BaseFinancialReportContro
   * @param {Request} req -
   * @param {Response} res -
   */
-  private async profitLossSheet(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
+  async profitLossSheet(req: Request, res: Response, next: NextFunction) {
+    const { tenantId, settings } = req;
+    const i18n = this.tenancy.i18n(tenantId);
    const filter = this.matchedQueryData(req);

-    const accept = this.accepts(req);
-
-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-      ACCEPT_TYPE.APPLICATION_CSV,
-      ACCEPT_TYPE.APPLICATION_XLSX,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
    try {
-      // Retrieves the csv format.
-      if (acceptType === ACCEPT_TYPE.APPLICATION_CSV) {
-        const sheet = await this.profitLossSheetApp.csv(tenantId, filter);
+      const { data, query, meta } =
+        await this.profitLossSheetService.profitLossSheet(tenantId, filter);

-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-        res.setHeader('Content-Type', 'text/csv');
+      const accept = this.accepts(req);
+      const acceptType = accept.types(['json', 'application/json+table']);

-        return res.send(sheet);
-        // Retrieves the json table format.
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_JSON_TABLE) {
-        const table = await this.profitLossSheetApp.table(tenantId, filter);
+      switch (acceptType) {
+        case 'application/json+table':
+          const table = new ProfitLossSheetTable(data, query, i18n);

-        return res.status(200).send(table);
-        // Retrieves the xlsx format.
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_XLSX) {
-        const sheet = await this.profitLossSheetApp.xlsx(tenantId, filter);
-
-        res.setHeader(
-          'Content-Disposition',
-          'attachment; filename=output.xlsx'
-        );
-        res.setHeader(
-          'Content-Type',
-          'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-        );
-        return res.send(sheet);
-        // Retrieves the json format.
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_PDF) {
-        const pdfContent = await this.profitLossSheetApp.pdf(tenantId, filter);
-
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': pdfContent.length,
-        });
-        return res.send(pdfContent);
-      } else {
-        const sheet = await this.profitLossSheetApp.sheet(tenantId, filter);
-
-        return res.status(200).send(sheet);
+          return res.status(200).send({
+            table: {
+              rows: table.tableRows(),
+              columns: table.tableColumns(),
+            },
+            query,
+            meta,
+          });
+        case 'json':
+        default:
+          return res.status(200).send({
+            data,
+            query,
+            meta,
+          });
      }
    } catch (error) {
      next(error);
--- a/packages/server/src/api/controllers/FinancialStatements/PurchasesByItem.ts
+++ b/packages/server/src/api/controllers/FinancialStatements/PurchasesByItem.ts
@@ -1,18 +1,17 @@
 import { Router, Request, Response, NextFunction } from 'express';
 import { query, ValidationChain } from 'express-validator';
+import moment from 'moment';
 import { Inject, Service } from 'typedi';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import BaseFinancialReportController from './BaseFinancialReportController';
-import { PurchasesByItemsService } from '@/services/FinancialStatements/PurchasesByItems/PurchasesByItemsService';
+import PurchasesByItemsService from '@/services/FinancialStatements/PurchasesByItems/PurchasesByItemsService';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
-import { PurcahsesByItemsApplication } from '@/services/FinancialStatements/PurchasesByItems/PurchasesByItemsApplication';

@Service()
 export default class PurchasesByItemReportController extends BaseFinancialReportController {
  @Inject()
-  private purchasesByItemsApp: PurcahsesByItemsApplication;
+  purchasesByItemsService: PurchasesByItemsService;

  /**
   * Router constructor.
@@ -64,56 +63,20 @@ export default class PurchasesByItemReportController extends BaseFinancialReport
   * @param {Request} req -
   * @param {Response} res -
   */
-  public async purchasesByItems(req: Request, res: Response) {
+  async purchasesByItems(req: Request, res: Response, next: NextFunction) {
    const { tenantId } = req;
    const filter = this.matchedQueryData(req);

-    const accept = this.accepts(req);
-
-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-      ACCEPT_TYPE.APPLICATION_XLSX,
-      ACCEPT_TYPE.APPLICATION_CSV,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
-    // JSON table response format.
-    if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
-      const table = await this.purchasesByItemsApp.table(tenantId, filter);
-
-      return res.status(200).send(table);
-      // CSV response format.
-    } else if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-      const buffer = await this.purchasesByItemsApp.csv(tenantId, filter);
-
-      res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-      res.setHeader('Content-Type', 'text/csv');
-
-      return res.send(buffer);
-      // Xlsx response format.
-    } else if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-      const buffer = await this.purchasesByItemsApp.xlsx(tenantId, filter);
-
-      res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
-      res.setHeader(
-        'Content-Type',
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-      );
-      return res.send(buffer);
-      // PDF response format.
-    } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-      const pdfContent = await this.purchasesByItemsApp.pdf(tenantId, filter);
-
-      res.set({
-        'Content-Type': 'application/pdf',
-        'Content-Length': pdfContent.length,
+    try {
+      const { data, query, meta } =
+        await this.purchasesByItemsService.purchasesByItems(tenantId, filter);
+      return res.status(200).send({
+        meta: this.transfromToResponse(meta),
+        data: this.transfromToResponse(data),
+        query: this.transfromToResponse(query),
      });
-      return res.send(pdfContent);
-      // Json response format.
-    } else {
-      const sheet = await this.purchasesByItemsApp.sheet(tenantId, filter);
-
-      return res.status(200).send(sheet);
+    } catch (error) {
+      next(error);
    }
  }
 }
--- a/packages/server/src/api/controllers/FinancialStatements/SalesByItems.ts
+++ b/packages/server/src/api/controllers/FinancialStatements/SalesByItems.ts
@@ -1,39 +1,41 @@
 import { Router, Request, Response, NextFunction } from 'express';
-import { query, ValidationChain, ValidationSchema } from 'express-validator';
+import { query, ValidationChain } from 'express-validator';
+import moment from 'moment';
 import { Inject, Service } from 'typedi';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import BaseFinancialReportController from './BaseFinancialReportController';
+import SalesByItemsReportService from '@/services/FinancialStatements/SalesByItems/SalesByItemsService';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
-import { SalesByItemsApplication } from '@/services/FinancialStatements/SalesByItems/SalesByItemsApplication';

@Service()
 export default class SalesByItemsReportController extends BaseFinancialReportController {
  @Inject()
-  private salesByItemsApp: SalesByItemsApplication;
+  salesByItemsService: SalesByItemsReportService;

  /**
   * Router constructor.
   */
-  public router() {
+  router() {
    const router = Router();

    router.get(
      '/',
-      CheckPolicies(ReportsAction.READ_SALES_BY_ITEMS, AbilitySubject.Report),
+      CheckPolicies(
+        ReportsAction.READ_SALES_BY_ITEMS,
+        AbilitySubject.Report
+      ),
      this.validationSchema,
      this.validationResult,
-      asyncMiddleware(this.salesByItems.bind(this))
+      asyncMiddleware(this.purchasesByItems.bind(this))
    );
    return router;
  }

  /**
   * Validation schema.
-   * @returns {ValidationChain[]}
   */
-  private get validationSchema(): ValidationChain[] {
+  get validationSchema(): ValidationChain[] {
    return [
      query('from_date').optional().isISO8601(),
      query('to_date').optional().isISO8601(),
@@ -61,53 +63,22 @@ export default class SalesByItemsReportController extends BaseFinancialReportCon
   * @param {Request} req -
   * @param {Response} res -
   */
-  private async salesByItems(req: Request, res: Response, next: NextFunction) {
+  async purchasesByItems(req: Request, res: Response, next: NextFunction) {
    const { tenantId } = req;
    const filter = this.matchedQueryData(req);
-    const accept = this.accepts(req);

-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-      ACCEPT_TYPE.APPLICATION_CSV,
-      ACCEPT_TYPE.APPLICATION_XLSX,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
-    // Retrieves the csv format.
-    if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-      const buffer = await this.salesByItemsApp.csv(tenantId, filter);
-
-      res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-      res.setHeader('Content-Type', 'text/csv');
-
-      return res.send(buffer);
-      // Retrieves the json table format.
-    } else if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
-      const table = await this.salesByItemsApp.table(tenantId, filter);
-
-      return res.status(200).send(table);
-      // Retrieves the xlsx format.
-    } else if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-      const buffer = this.salesByItemsApp.xlsx(tenantId, filter);
-
-      res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
-      res.setHeader(
-        'Content-Type',
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+    try {
+      const { data, query, meta } = await this.salesByItemsService.salesByItems(
+        tenantId,
+        filter
      );
-      return res.send(buffer);
-      // Retrieves the json format.
-    } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-      const pdfContent = await this.salesByItemsApp.pdf(tenantId, filter);
-
-      res.set({
-        'Content-Type': 'application/pdf',
-        'Content-Length': pdfContent.length,
+      return res.status(200).send({
+        meta: this.transfromToResponse(meta),
+        data: this.transfromToResponse(data),
+        query: this.transfromToResponse(query),
      });
-      return res.send(pdfContent);
-    } else {
-      const sheet = await this.salesByItemsApp.sheet(tenantId, filter);
-      return res.status(200).send(sheet);
+    } catch (error) {
+      next(error);
    }
  }
 }
--- a/packages/server/src/api/controllers/FinancialStatements/SalesTaxLiabilitySummary/index.ts
+++ b/packages/server/src/api/controllers/FinancialStatements/SalesTaxLiabilitySummary/index.ts
@@ -1,21 +1,20 @@
-import { Inject } from 'typedi';
 import { Router, Request, Response, NextFunction } from 'express';
 import { query } from 'express-validator';
+import { Inject } from 'typedi';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import BaseFinancialReportController from '../BaseFinancialReportController';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { SalesTaxLiabilitySummaryApplication } from '@/services/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryApplication';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
+import { SalesTaxLiabilitySummaryService } from '@/services/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryService';

 export default class SalesTaxLiabilitySummary extends BaseFinancialReportController {
  @Inject()
-  private salesTaxLiabilitySummaryApp: SalesTaxLiabilitySummaryApplication;
+  private salesTaxLiabilitySummaryService: SalesTaxLiabilitySummaryService;

  /**
   * Router constructor.
   */
-  public router() {
+  router() {
    const router = Router();

    router.get(
@@ -32,9 +31,8 @@ export default class SalesTaxLiabilitySummary extends BaseFinancialReportControl

  /**
   * Validation schema.
-   * @returns {ValidationChain[]}
   */
-  private get validationSchema() {
+  get validationSchema() {
    return [
      query('from_date').optional().isISO8601(),
      query('to_date').optional().isISO8601(),
@@ -47,7 +45,7 @@ export default class SalesTaxLiabilitySummary extends BaseFinancialReportControl
   * @param {Response} res -
   * @param {NextFunction} next -
   */
-  private async salesTaxLiabilitySummary(
+  async salesTaxLiabilitySummary(
    req: Request,
    res: Response,
    next: NextFunction
@@ -57,63 +55,33 @@ export default class SalesTaxLiabilitySummary extends BaseFinancialReportControl

    try {
      const accept = this.accepts(req);
-      const acceptType = accept.types([
-        ACCEPT_TYPE.APPLICATION_JSON,
-        ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-        ACCEPT_TYPE.APPLICATION_CSV,
-        ACCEPT_TYPE.APPLICATION_XLSX,
-        ACCEPT_TYPE.APPLICATION_PDF,
-      ]);
+      const acceptType = accept.types(['json', 'application/json+table']);

-      // Retrieves the json table format.
-      if (acceptType === ACCEPT_TYPE.APPLICATION_JSON_TABLE) {
-        const table = await this.salesTaxLiabilitySummaryApp.table(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(table);
-        // Retrieves the xlsx format.
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_XLSX) {
-        const buffer = await this.salesTaxLiabilitySummaryApp.xlsx(
-          tenantId,
-          filter
-        );
-        res.setHeader(
-          'Content-Disposition',
-          'attachment; filename=output.xlsx'
-        );
-        res.setHeader(
-          'Content-Type',
-          'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-        );
-        return res.send(buffer);
-        // Retrieves the csv format.
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_CSV) {
-        const buffer = await this.salesTaxLiabilitySummaryApp.csv(
-          tenantId,
-          filter
-        );
-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-        res.setHeader('Content-Type', 'text/csv');
+      switch (acceptType) {
+        case 'application/json+table':
+          const salesTaxLiabilityTable =
+            await this.salesTaxLiabilitySummaryService.salesTaxLiabilitySummaryTable(
+              tenantId,
+              filter
+            );

-        return res.send(buffer);
-        // Retrieves the json format.
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_PDF) {
-        const pdfContent = await this.salesTaxLiabilitySummaryApp.pdf(
-          tenantId,
-          filter
-        );
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': pdfContent.length,
-        });
-        return res.status(200).send(pdfContent);
-      } else {
-        const sheet = await this.salesTaxLiabilitySummaryApp.sheet(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(sheet);
+          return res.status(200).send({
+            table: salesTaxLiabilityTable.table,
+            query: salesTaxLiabilityTable.query,
+            meta: salesTaxLiabilityTable.meta,
+          });
+        case 'json':
+        default:
+          const salesTaxLiability =
+            await this.salesTaxLiabilitySummaryService.salesTaxLiability(
+              tenantId,
+              filter
+            );
+          return res.status(200).send({
+            data: salesTaxLiability.data,
+            query: salesTaxLiability.query,
+            meta: salesTaxLiability.meta,
+          });
      }
    } catch (error) {
      next(error);
--- a/packages/server/src/api/controllers/FinancialStatements/TransactionsByCustomers/index.ts
+++ b/packages/server/src/api/controllers/FinancialStatements/TransactionsByCustomers/index.ts
@@ -1,22 +1,30 @@
 import { Router, Request, Response, NextFunction } from 'express';
 import { query } from 'express-validator';
 import { Inject, Service } from 'typedi';
-import { AbilitySubject, ReportsAction } from '@/interfaces';
+import {
+  AbilitySubject,
+  ITransactionsByCustomersStatement,
+  ReportsAction,
+} from '@/interfaces';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import BaseFinancialReportController from '../BaseFinancialReportController';
+import TransactionsByCustomersService from '@/services/FinancialStatements/TransactionsByCustomer/TransactionsByCustomersService';
+import TransactionsByCustomersTableRows from '@/services/FinancialStatements/TransactionsByCustomer/TransactionsByCustomersTableRows';
+import HasTenancyService from '@/services/Tenancy/TenancyService';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { TransactionsByCustomerApplication } from '@/services/FinancialStatements/TransactionsByCustomer/TransactionsByCustomersApplication';
-import { ACCEPT_TYPE } from '@/interfaces/Http';

@Service()
 export default class TransactionsByCustomersReportController extends BaseFinancialReportController {
  @Inject()
-  private transactionsByCustomersApp: TransactionsByCustomerApplication;
+  transactionsByCustomersService: TransactionsByCustomersService;
+
+  @Inject()
+  tenancy: HasTenancyService;

  /**
   * Router constructor.
   */
-  public router() {
+  router() {
    const router = Router();

    router.get(
@@ -50,13 +58,45 @@ export default class TransactionsByCustomersReportController extends BaseFinanci
    ];
  }

+  /**
+   * Transformes the statement to table rows response.
+   * @param {ITransactionsByCustomersStatement} statement -
+   */
+  private transformToTableResponse(customersTransactions, tenantId) {
+    const i18n = this.tenancy.i18n(tenantId);
+    const table = new TransactionsByCustomersTableRows(
+      customersTransactions,
+      i18n
+    );
+    return {
+      table: {
+        rows: table.tableRows(),
+      },
+    };
+  }
+
+  /**
+   * Transformes the statement to json response.
+   * @param {ITransactionsByCustomersStatement} statement -
+   */
+  private transfromToJsonResponse(
+    data,
+    columns
+  ): ITransactionsByCustomersStatement {
+    return {
+      data: this.transfromToResponse(data),
+      columns: this.transfromToResponse(columns),
+      query: this.transfromToResponse(query),
+    };
+  }
+
  /**
   * Retrieve payable aging summary report.
   * @param {Request} req -
   * @param {Response} res -
   * @param {NextFunction} next -
   */
-  private async transactionsByCustomers(
+  async transactionsByCustomers(
    req: Request,
    res: Response,
    next: NextFunction
@@ -64,62 +104,25 @@ export default class TransactionsByCustomersReportController extends BaseFinanci
    const { tenantId } = req;
    const filter = this.matchedQueryData(req);

-    const accept = this.accepts(req);
-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-      ACCEPT_TYPE.APPLICATION_CSV,
-      ACCEPT_TYPE.APPLICATION_XLSX,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
    try {
-      // Retrieves the json table format.
-      if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
-        const table = await this.transactionsByCustomersApp.table(
+      const report =
+        await this.transactionsByCustomersService.transactionsByCustomers(
          tenantId,
          filter
        );
-        return res.status(200).send(table);
-        // Retrieve the csv format.
-      } else if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-        const csv = await this.transactionsByCustomersApp.csv(tenantId, filter);
+      const accept = this.accepts(req);
+      const acceptType = accept.types(['json', 'application/json+table']);

-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-        res.setHeader('Content-Type', 'text/csv');
-
-        return res.send(csv);
-        // Retrieve the xlsx format.
-      } else if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-        const buffer = await this.transactionsByCustomersApp.xlsx(
-          tenantId,
-          filter
-        );
-        res.setHeader(
-          'Content-Disposition',
-          'attachment; filename=output.xlsx'
-        );
-        res.setHeader(
-          'Content-Type',
-          'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-        );
-        return res.send(buffer);
-        // Retrieve the json format.
-      } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-        const pdfContent = await this.transactionsByCustomersApp.pdf(
-          tenantId,
-          filter
-        );
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': pdfContent.length,
-        });
-        return res.send(pdfContent);
-      } else {
-        const sheet = await this.transactionsByCustomersApp.sheet(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(sheet);
+      switch (acceptType) {
+        case 'json':
+          return res
+            .status(200)
+            .send(this.transfromToJsonResponse(report.data, report.columns));
+        case 'application/json+table':
+        default:
+          return res
+            .status(200)
+            .send(this.transformToTableResponse(report.data, tenantId));
      }
    } catch (error) {
      next(error);
--- a/packages/server/src/api/controllers/FinancialStatements/TransactionsByVendors/index.ts
+++ b/packages/server/src/api/controllers/FinancialStatements/TransactionsByVendors/index.ts
@@ -3,19 +3,27 @@ import { query, ValidationChain } from 'express-validator';
 import { Inject } from 'typedi';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import BaseFinancialReportController from '../BaseFinancialReportController';
-import { AbilitySubject, ReportsAction } from '@/interfaces';
+import TransactionsByVendorsTableRows from '@/services/FinancialStatements/TransactionsByVendor/TransactionsByVendorTableRows';
+import TransactionsByVendorsService from '@/services/FinancialStatements/TransactionsByVendor/TransactionsByVendorService';
+import {
+  AbilitySubject,
+  ITransactionsByVendorsStatement,
+  ReportsAction,
+} from '@/interfaces';
+import HasTenancyService from '@/services/Tenancy/TenancyService';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
-import { TransactionsByVendorApplication } from '@/services/FinancialStatements/TransactionsByVendor/TransactionsByVendorApplication';

 export default class TransactionsByVendorsReportController extends BaseFinancialReportController {
  @Inject()
-  private transactionsByVendorsApp: TransactionsByVendorApplication;
+  transactionsByVendorsService: TransactionsByVendorsService;
+
+  @Inject()
+  tenancy: HasTenancyService;

  /**
   * Router constructor.
   */
-  public router() {
+  router() {
    const router = Router();

    router.get(
@@ -34,7 +42,7 @@ export default class TransactionsByVendorsReportController extends BaseFinancial
  /**
   * Validation schema.
   */
-  private get validationSchema(): ValidationChain[] {
+  get validationSchema(): ValidationChain[] {
    return [
      ...this.sheetNumberFormatValidationSchema,

@@ -50,76 +58,64 @@ export default class TransactionsByVendorsReportController extends BaseFinancial
    ];
  }

+  /**
+   * Transformes the report statement to table rows.
+   * @param {ITransactionsByVendorsStatement} statement -
+   */
+  private transformToTableRows(tenantId: number, transactions: any[]) {
+    const i18n = this.tenancy.i18n(tenantId);
+    const table = new TransactionsByVendorsTableRows(transactions, i18n);
+
+    return {
+      table: {
+        data: table.tableRows(),
+      },
+    };
+  }
+
+  /**
+   * Transformes the report statement to json response.
+   * @param {ITransactionsByVendorsStatement} statement -
+   */
+  private transformToJsonResponse({
+    data,
+    columns,
+    query,
+  }: ITransactionsByVendorsStatement) {
+    return {
+      data: this.transfromToResponse(data),
+      columns: this.transfromToResponse(columns),
+      query: this.transfromToResponse(query),
+    };
+  }
+
  /**
   * Retrieve payable aging summary report.
   * @param {Request} req -
   * @param {Response} res -
   * @param {NextFunction} next -
   */
-  private async transactionsByVendors(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
+  async transactionsByVendors(req: Request, res: Response, next: NextFunction) {
    const { tenantId } = req;
    const filter = this.matchedQueryData(req);

    try {
+      const report =
+        await this.transactionsByVendorsService.transactionsByVendors(
+          tenantId,
+          filter
+        );
      const accept = this.accepts(req);
-      const acceptType = accept.types([
-        ACCEPT_TYPE.APPLICATION_JSON,
-        ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-        ACCEPT_TYPE.APPLICATION_CSV,
-        ACCEPT_TYPE.APPLICATION_XLSX,
-        ACCEPT_TYPE.APPLICATION_PDF,
-      ]);
+      const acceptType = accept.types(['json', 'application/json+table']);

-      // Retrieves the xlsx format.
-      if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-        const buffer = await this.transactionsByVendorsApp.xlsx(
-          tenantId,
-          filter
-        );
-        res.setHeader('Content-Type', 'application/vnd.openxmlformats');
-        res.setHeader(
-          'Content-Disposition',
-          'attachment; filename=report.xlsx'
-        );
-        return res.send(buffer);
-        // Retrieves the csv format.
-      } else if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-        const buffer = await this.transactionsByVendorsApp.csv(
-          tenantId,
-          filter
-        );
-        res.setHeader('Content-Type', 'text/csv');
-        res.setHeader('Content-Disposition', 'attachment; filename=report.csv');
-        return res.send(buffer);
-        // Retrieves the json table format.
-      } else if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
-        const table = await this.transactionsByVendorsApp.table(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(table);
-        // Retrieves the pdf format.
-      } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-        const pdfContent = await this.transactionsByVendorsApp.pdf(
-          tenantId,
-          filter
-        );
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': pdfContent.length,
-        });
-        return res.send(pdfContent);
-        // Retrieves the json format.
-      } else {
-        const sheet = await this.transactionsByVendorsApp.sheet(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(sheet);
+      switch (acceptType) {
+        case 'application/json+table':
+          return res
+            .status(200)
+            .send(this.transformToTableRows(tenantId, report.data));
+        case 'json':
+        default:
+          return res.status(200).send(this.transformToJsonResponse(report));
      }
    } catch (error) {
      next(error);
--- a/packages/server/src/api/controllers/FinancialStatements/TrialBalanceSheet.ts
+++ b/packages/server/src/api/controllers/FinancialStatements/TrialBalanceSheet.ts
@@ -3,21 +3,20 @@ import { Request, Response, Router, NextFunction } from 'express';
 import { query, ValidationChain } from 'express-validator';
 import { castArray } from 'lodash';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
+import TrialBalanceSheetService from '@/services/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetService';
 import BaseFinancialReportController from './BaseFinancialReportController';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { TrialBalanceSheetApplication } from '@/services/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetApplication';
-import { ACCEPT_TYPE } from '@/interfaces/Http';

@Service()
 export default class TrialBalanceSheetController extends BaseFinancialReportController {
  @Inject()
-  private trialBalanceSheetApp: TrialBalanceSheetApplication;
+  trialBalanceSheetService: TrialBalanceSheetService;

  /**
   * Router constructor.
   */
-  public router() {
+  router() {
    const router = Router();

    router.get(
@@ -37,7 +36,7 @@ export default class TrialBalanceSheetController extends BaseFinancialReportCont
   * Validation schema.
   * @return {ValidationChain[]}
   */
-  private get trialBalanceSheetValidationSchema(): ValidationChain[] {
+  get trialBalanceSheetValidationSchema(): ValidationChain[] {
    return [
      ...this.sheetNumberFormatValidationSchema,
      query('basis').optional(),
@@ -60,74 +59,28 @@ export default class TrialBalanceSheetController extends BaseFinancialReportCont
  /**
   * Retrieve the trial balance sheet.
   */
-  private async trialBalanceSheet(
+  public async trialBalanceSheet(
    req: Request,
    res: Response,
    next: NextFunction
  ) {
-    const { tenantId } = req;
+    const { tenantId, settings } = req;
    let filter = this.matchedQueryData(req);

    filter = {
      ...filter,
      accountsIds: castArray(filter.accountsIds),
    };
+
    try {
-      const accept = this.accepts(req);
+      const { data, query, meta } =
+        await this.trialBalanceSheetService.trialBalanceSheet(tenantId, filter);

-      const acceptType = accept.types([
-        ACCEPT_TYPE.APPLICATION_JSON,
-        ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-        ACCEPT_TYPE.APPLICATION_CSV,
-        ACCEPT_TYPE.APPLICATION_XLSX,
-        ACCEPT_TYPE.APPLICATION_PDF,
-      ]);
-      // Retrieves in json table format.
-      if (acceptType === ACCEPT_TYPE.APPLICATION_JSON_TABLE) {
-        const { table, meta, query } = await this.trialBalanceSheetApp.table(
-          tenantId,
-          filter
-        );
-        return res.status(200).send({ table, meta, query });
-        // Retrieves in xlsx format
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_XLSX) {
-        const buffer = await this.trialBalanceSheetApp.xlsx(tenantId, filter);
-        res.setHeader(
-          'Content-Disposition',
-          'attachment; filename=output.xlsx'
-        );
-        res.setHeader(
-          'Content-Type',
-          'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-        );
-        return res.send(buffer);
-        // Retrieves in csv format.
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_CSV) {
-        const buffer = await this.trialBalanceSheetApp.csv(tenantId, filter);
-
-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-        res.setHeader('Content-Type', 'text/csv');
-
-        return res.send(buffer);
-        // Retrieves in pdf format.
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_PDF) {
-        const pdfContent = await this.trialBalanceSheetApp.pdf(
-          tenantId,
-          filter
-        );
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': pdfContent.length,
-        });
-        res.send(pdfContent);
-        // Retrieves in json format.
-      } else {
-        const { data, query, meta } = await this.trialBalanceSheetApp.sheet(
-          tenantId,
-          filter
-        );
-        return res.status(200).send({ data, query, meta });
-      }
+      return res.status(200).send({
+        data: this.transfromToResponse(data),
+        query: this.transfromToResponse(query),
+        meta: this.transfromToResponse(meta),
+      });
    } catch (error) {
      next(error);
    }
--- a/packages/server/src/api/controllers/FinancialStatements/VendorBalanceSummary/index.ts
+++ b/packages/server/src/api/controllers/FinancialStatements/VendorBalanceSummary/index.ts
@@ -3,19 +3,27 @@ import { query } from 'express-validator';
 import { Inject } from 'typedi';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import BaseFinancialReportController from '../BaseFinancialReportController';
-import { AbilitySubject, ReportsAction } from '@/interfaces';
+import VendorBalanceSummaryTableRows from '@/services/FinancialStatements/VendorBalanceSummary/VendorBalanceSummaryTableRows';
+import VendorBalanceSummaryService from '@/services/FinancialStatements/VendorBalanceSummary/VendorBalanceSummaryService';
+import {
+  AbilitySubject,
+  IVendorBalanceSummaryStatement,
+  ReportsAction,
+} from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
-import { VendorBalanceSummaryApplication } from '@/services/FinancialStatements/VendorBalanceSummary/VendorBalanceSummaryApplication';
+import HasTenancyService from '@/services/Tenancy/TenancyService';

 export default class VendorBalanceSummaryReportController extends BaseFinancialReportController {
  @Inject()
-  private vendorBalanceSummaryApp: VendorBalanceSummaryApplication;
+  vendorBalanceSummaryService: VendorBalanceSummaryService;
+
+  @Inject()
+  tenancy: HasTenancyService;

  /**
   * Router constructor.
   */
-  public router() {
+  router() {
    const router = Router();

    router.get(
@@ -33,7 +41,7 @@ export default class VendorBalanceSummaryReportController extends BaseFinancialR
  /**
   * Validation schema.
   */
-  private get validationSchema() {
+  get validationSchema() {
    return [
      ...this.sheetNumberFormatValidationSchema,
      query('as_date').optional().isISO8601(),
@@ -51,74 +59,73 @@ export default class VendorBalanceSummaryReportController extends BaseFinancialR
    ];
  }

+  /**
+   * Transformes the report statement to table rows.
+   * @param {IVendorBalanceSummaryStatement} statement -
+   */
+  private transformToTableRows(
+    tenantId: number,
+    { data, query }: IVendorBalanceSummaryStatement
+  ) {
+    const i18n = this.tenancy.i18n(tenantId);
+    const tableData = new VendorBalanceSummaryTableRows(
+      data,
+      query,
+      i18n
+    );
+    return {
+      table: {
+        columns: tableData.tableColumns(),
+        data: tableData.tableRows(),
+      },
+      query,
+    };
+  }
+
+  /**
+   * Transformes the report statement to raw json.
+   * @param {IVendorBalanceSummaryStatement} statement -
+   */
+  private transformToJsonResponse({
+    data,
+    columns,
+  }: IVendorBalanceSummaryStatement) {
+    return {
+      data: this.transfromToResponse(data),
+      columns: this.transfromToResponse(columns),
+      query: this.transfromToResponse(query),
+    };
+  }
+
  /**
   * Retrieve vendors balance summary.
   * @param {Request} req -
   * @param {Response} res -
   * @param {NextFunction} next -
   */
-  public async vendorBalanceSummary(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
+  async vendorBalanceSummary(req: Request, res: Response, next: NextFunction) {
+    const { tenantId, settings } = req;
    const filter = this.matchedQueryData(req);

    try {
+      const vendorBalanceSummary =
+        await this.vendorBalanceSummaryService.vendorBalanceSummary(
+          tenantId,
+          filter
+        );
      const accept = this.accepts(req);
-      const acceptType = accept.types([
-        ACCEPT_TYPE.APPLICATION_JSON,
-        ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-        ACCEPT_TYPE.APPLICATION_CSV,
-        ACCEPT_TYPE.APPLICATION_XLSX,
-        ACCEPT_TYPE.APPLICATION_PDF,
-      ]);
+      const acceptType = accept.types(['json', 'application/json+table']);

-      // Retrieves the csv format.
-      if (acceptType === ACCEPT_TYPE.APPLICATION_CSV) {
-        const buffer = await this.vendorBalanceSummaryApp.csv(tenantId, filter);
-
-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-        res.setHeader('Content-Type', 'text/csv');
-
-        return res.send(buffer);
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_XLSX) {
-        const buffer = await this.vendorBalanceSummaryApp.xlsx(
-          tenantId,
-          filter
-        );
-        res.setHeader(
-          'Content-Disposition',
-          'attachment; filename=output.xlsx'
-        );
-        res.setHeader('Content-Type', 'application/vnd.openxmlformats');
-        return res.send(buffer);
-        // Retrieves the json table format.
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_JSON_TABLE) {
-        const table = await this.vendorBalanceSummaryApp.table(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(table);
-        // Retrieves the pdf format.
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_PDF) {
-        const pdfContent = await this.vendorBalanceSummaryApp.pdf(
-          tenantId,
-          filter
-        );
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': pdfContent.length,
-        });
-        return res.send(pdfContent);
-        // Retrieves the json format.
-      } else {
-        const sheet = await this.vendorBalanceSummaryApp.sheet(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(sheet);
+      switch (acceptType) {
+        case 'application/json+table':
+          return res
+            .status(200)
+            .send(this.transformToTableRows(tenantId, vendorBalanceSummary));
+        case 'json':
+        default:
+          return res
+            .status(200)
+            .send(this.transformToJsonResponse(vendorBalanceSummary));
      }
    } catch (error) {
      next(error);
--- a/packages/server/src/api/controllers/Import/ImportController.ts
+++ b/packages/server/src/api/controllers/Import/ImportController.ts
@@ -1,246 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { Router, Request, Response, NextFunction } from 'express';
-import { body, param, query } from 'express-validator';
-import { defaultTo } from 'lodash';
-import BaseController from '@/api/controllers/BaseController';
-import { ServiceError } from '@/exceptions';
-import { ImportResourceApplication } from '@/services/Import/ImportResourceApplication';
-import { uploadImportFile } from './_utils';
-import { parseJsonSafe } from '@/utils/parse-json-safe';
-
-@Service()
-export class ImportController extends BaseController {
-  @Inject()
-  private importResourceApp: ImportResourceApplication;
-
-  /**
-   * Router constructor method.
-   */
-  public router() {
-    const router = Router();
-
-    router.post(
-      '/file',
-      uploadImportFile.single('file'),
-      this.importValidationSchema,
-      this.validationResult,
-      this.asyncMiddleware(this.fileUpload.bind(this)),
-      this.catchServiceErrors
-    );
-    router.post(
-      '/:import_id/import',
-      this.asyncMiddleware(this.import.bind(this)),
-      this.catchServiceErrors
-    );
-    router.post(
-      '/:import_id/mapping',
-      [
-        param('import_id').exists().isString(),
-        body('mapping').exists().isArray({ min: 1 }),
-        body('mapping.*.group').optional(),
-        body('mapping.*.from').exists(),
-        body('mapping.*.to').exists(),
-      ],
-      this.validationResult,
-      this.asyncMiddleware(this.mapping.bind(this)),
-      this.catchServiceErrors
-    );
-    router.get(
-      '/sample',
-      [query('resource').exists(), query('format').optional()],
-      this.validationResult,
-      this.downloadImportSample.bind(this),
-      this.catchServiceErrors
-    );
-    router.get(
-      '/:import_id',
-      this.asyncMiddleware(this.getImportFileMeta.bind(this)),
-      this.catchServiceErrors
-    );
-    router.get(
-      '/:import_id/preview',
-      this.asyncMiddleware(this.preview.bind(this)),
-      this.catchServiceErrors
-    );
-    return router;
-  }
-
-  /**
-   * Import validation schema.
-   * @returns {ValidationSchema[]}
-   */
-  private get importValidationSchema() {
-    return [body('resource').exists(), body('params').optional()];
-  }
-
-  /**
-   * Imports xlsx/csv to the given resource type.
-   * @param {Request} req -
-   * @param {Response} res -
-   * @param {NextFunction} next -
-   */
-  private async fileUpload(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
-    const body = this.matchedBodyData(req);
-    const params = defaultTo(parseJsonSafe(body.params), {});
-
-    try {
-      const data = await this.importResourceApp.import(
-        tenantId,
-        body.resource,
-        req.file.filename,
-        params
-      );
-      return res.status(200).send(data);
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Maps the columns of the imported file.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async mapping(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
-    const { import_id: importId } = req.params;
-    const body = this.matchedBodyData(req);
-
-    try {
-      const mapping = await this.importResourceApp.mapping(
-        tenantId,
-        importId,
-        body?.mapping
-      );
-      return res.status(200).send(mapping);
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Preview the imported file before actual importing.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async preview(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
-    const { import_id: importId } = req.params;
-
-    try {
-      const preview = await this.importResourceApp.preview(tenantId, importId);
-
-      return res.status(200).send(preview);
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Importing the imported file to the application storage.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async import(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
-    const { import_id: importId } = req.params;
-
-    try {
-      const result = await this.importResourceApp.process(tenantId, importId);
-
-      return res.status(200).send(result);
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Retrieves the csv/xlsx sample sheet of the given resource name.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async downloadImportSample(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const { format, resource } = this.matchedQueryData(req);
-
-    try {
-      const result = this.importResourceApp.sample(tenantId, resource, format);
-
-      return res.status(200).send(result);
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Retrieves the import file meta.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async getImportFileMeta(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const { import_id: importId } = req.params;
-
-    try {
-      const result = await this.importResourceApp.importMeta(
-        tenantId,
-        importId
-      );
-      return res.status(200).send(result);
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Transforms service errors to response.
-   * @param {Error}
-   * @param {Request} req
-   * @param {Response} res
-   * @param {ServiceError} error
-   */
-  private catchServiceErrors(
-    error,
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    if (error instanceof ServiceError) {
-      if (error.errorType === 'INVALID_MAP_ATTRS') {
-        return res.status(400).send({
-          errors: [{ type: 'INVALID_MAP_ATTRS' }],
-        });
-      }
-      if (error.errorType === 'DUPLICATED_FROM_MAP_ATTR') {
-        return res.status(400).send({
-          errors: [{ type: 'DUPLICATED_FROM_MAP_ATTR' }],
-        });
-      }
-      if (error.errorType === 'DUPLICATED_TO_MAP_ATTR') {
-        return res.status(400).send({
-          errors: [{ type: 'DUPLICATED_TO_MAP_ATTR' }],
-        });
-      }
-      if (error.errorType === 'IMPORTED_FILE_EXTENSION_INVALID') {
-        return res.status(400).send({
-          errors: [{ type: 'IMPORTED_FILE_EXTENSION_INVALID' }],
-        });
-      }
-    }
-    next(error);
-  }
-}
--- a/packages/server/src/api/controllers/Import/_utils.ts
+++ b/packages/server/src/api/controllers/Import/_utils.ts
@@ -1,34 +0,0 @@
-import Multer from 'multer';
-import { ServiceError } from '@/exceptions';
-import { getImportsStoragePath } from '@/services/Import/_utils';
-
-export function allowSheetExtensions(req, file, cb) {
-  if (
-    file.mimetype !== 'text/csv' &&
-    file.mimetype !== 'application/vnd.ms-excel' &&
-    file.mimetype !==
-      'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-  ) {
-    cb(new ServiceError('IMPORTED_FILE_EXTENSION_INVALID'));
-    return;
-  }
-  cb(null, true);
-}
-
-const storage = Multer.diskStorage({
-  destination: function (req, file, cb) {
-    const path = getImportsStoragePath();
-    cb(null, path);
-  },
-  filename: function (req, file, cb) {
-    // Add the creation timestamp to clean up temp files later.
-    const uniqueSuffix = Date.now() + '-' + Math.round(Math.random() * 1e9);
-    cb(null, uniqueSuffix);
-  },
-});
-
-export const uploadImportFile = Multer({
-  storage,
-  limits: { fileSize: 5 * 1024 * 1024 },
-  fileFilter: allowSheetExtensions,
-});
--- a/packages/server/src/api/controllers/Items/Items.ts
+++ b/packages/server/src/api/controllers/Items/Items.ts
@@ -149,11 +149,6 @@ export default class ItemsController extends BaseController {
        .trim()
        .escape()
        .isLength({ max: DATATYPES_LENGTH.TEXT }),
-      check('sell_tax_rate_id').optional({ nullable: true }).isInt().toInt(),
-      check('purchase_tax_rate_id')
-        .optional({ nullable: true })
-        .isInt()
-        .toInt(),
      check('category_id')
        .optional({ nullable: true })
        .isInt({ min: 0, max: DATATYPES_LENGTH.INT_10 })
@@ -513,28 +508,6 @@ export default class ItemsController extends BaseController {
          ],
        });
      }
-      if (error.errorType === 'PURCHASE_TAX_RATE_NOT_FOUND') {
-        return res.status(400).send({
-          errors: [
-            {
-              type: 'PURCHASE_TAX_RATE_NOT_FOUND',
-              message: 'Purchase tax rate has not found.',
-              code: 410,
-            },
-          ],
-        });
-      }
-      if (error.errorType === 'SELL_TAX_RATE_NOT_FOUND') {
-        return res.status(400).send({
-          errors: [
-            {
-              type: 'SELL_TAX_RATE_NOT_FOUND',
-              message: 'Sell tax rate is not found.',
-              code: 420,
-            },
-          ],
-        });
-      }
    }
    next(error);
  }
--- a/packages/server/src/api/controllers/Items/index.ts
+++ b/packages/server/src/api/controllers/Items/index.ts
@@ -6,7 +6,7 @@ import ItemTransactionsController from './ItemsTransactions';

@Service()
 export default class ItemsBaseController {
-  public router() {
+  router() {
    const router = Router();

    router.use('/', Container.get(ItemsController).router());
--- a/packages/server/src/api/controllers/ManualJournals.ts
+++ b/packages/server/src/api/controllers/ManualJournals.ts
@@ -77,14 +77,14 @@ export default class ManualJournalsController extends BaseController {
  /**
   * Specific manual journal id param validation schema.
   */
-  private get manualJournalParamSchema() {
+  get manualJournalParamSchema() {
    return [param('id').exists().isNumeric().toInt()];
  }

  /**
   * Manual journal DTO schema.
   */
-  private get manualJournalValidationSchema() {
+  get manualJournalValidationSchema() {
    return [
      check('date').exists().isISO8601(),
      check('currency_code').optional(),
@@ -148,16 +148,13 @@ export default class ManualJournalsController extends BaseController {
        .optional({ nullable: true })
        .isNumeric()
        .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
    ];
  }

  /**
   * Manual journals list validation schema.
   */
-  private get manualJournalsListSchema() {
+  get manualJournalsListSchema() {
    return [
      query('page').optional().isNumeric().toInt(),
      query('page_size').optional().isNumeric().toInt(),
@@ -323,7 +320,7 @@ export default class ManualJournalsController extends BaseController {
   * @param {Response} res
   * @param {NextFunction} next
   */
-  private getManualJournalsList = async (
+  getManualJournalsList = async (
    req: Request,
    res: Response,
    next: NextFunction
--- a/packages/server/src/api/controllers/Organization.ts
+++ b/packages/server/src/api/controllers/Organization.ts
@@ -6,7 +6,6 @@ import { check, ValidationChain } from 'express-validator';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import JWTAuth from '@/api/middleware/jwtAuth';
 import TenancyMiddleware from '@/api/middleware/TenancyMiddleware';
-import SubscriptionMiddleware from '@/api/middleware/SubscriptionMiddleware';
 import AttachCurrentTenantUser from '@/api/middleware/AttachCurrentTenantUser';
 import OrganizationService from '@/services/Organization/OrganizationService';
 import { MONTHS, ACCEPTED_LOCALES } from '@/services/Organization/constants';
@@ -18,7 +17,7 @@ import BaseController from '@/api/controllers/BaseController';
@Service()
 export default class OrganizationController extends BaseController {
  @Inject()
-  organizationService: OrganizationService;
+  private organizationService: OrganizationService;

  /**
   * Router constructor.
@@ -26,23 +25,20 @@ export default class OrganizationController extends BaseController {
  router() {
    const router = Router();

-    // Should before build tenant database the user be authorized and
-    // most important than that, should be subscribed to any plan.
    router.use(JWTAuth);
    router.use(AttachCurrentTenantUser);
    router.use(TenancyMiddleware);

-    router.use('/build', SubscriptionMiddleware('main'));
    router.post(
      '/build',
-      this.buildOrganizationValidationSchema,
+      this.organizationValidationSchema,
      this.validationResult,
      asyncMiddleware(this.build.bind(this)),
      this.handleServiceErrors.bind(this)
    );
    router.put(
      '/',
-      this.updateOrganizationValidationSchema,
+      this.organizationValidationSchema,
      this.validationResult,
      this.asyncMiddleware(this.updateOrganization.bind(this)),
      this.handleServiceErrors.bind(this)
@@ -59,7 +55,7 @@ export default class OrganizationController extends BaseController {
   * Organization setup schema.
   * @return {ValidationChain[]}
   */
-  private get commonOrganizationValidationSchema(): ValidationChain[] {
+  private get organizationValidationSchema(): ValidationChain[] {
    return [
      check('name').exists().trim(),
      check('industry').optional({ nullable: true }).isString().trim().escape(),
@@ -72,29 +68,6 @@ export default class OrganizationController extends BaseController {
    ];
  }

-  /**
-   * Build organization validation schema.
-   * @returns {ValidationChain[]}
-   */
-  private get buildOrganizationValidationSchema(): ValidationChain[] {
-    return [...this.commonOrganizationValidationSchema];
-  }
-
-  /**
-   * Update organization validation schema.
-   * @returns {ValidationChain[]}
-   */
-  private get updateOrganizationValidationSchema(): ValidationChain[] {
-    return [
-      ...this.commonOrganizationValidationSchema,
-      check('tax_number')
-        .optional({ nullable: true })
-        .isString()
-        .trim()
-        .escape(),
-    ];
-  }
-
  /**
   * Builds tenant database and migrate database schema.
   * @param {Request} req - Express request.
--- a/packages/server/src/api/controllers/OrganizationDashboard.ts
+++ b/packages/server/src/api/controllers/OrganizationDashboard.ts
@@ -33,17 +33,17 @@ export default class OrganizationDashboardController extends BaseController {
  }

  /**
-   * Detarmines whether the current authed organization to able to change its currency/.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Response|void}
+   *
+   * @param req
+   * @param res
+   * @param next
+   * @returns
   */
  private async baseCurrencyMutateAbility(
    req: Request,
    res: Response,
    next: Function
-  ): Promise<Response|void> {
+  ) {
    const { tenantId } = req;

    try {
--- a/packages/server/src/api/controllers/Projects/Projects.ts
+++ b/packages/server/src/api/controllers/Projects/Projects.ts
@@ -29,7 +29,8 @@ export class ProjectsController extends BaseController {
        check('cost_estimate').exists().isDecimal(),
      ],
      this.validationResult,
-      asyncMiddleware(this.createProject.bind(this))
+      asyncMiddleware(this.createProject.bind(this)),
+      this.catchServiceErrors
    );
    router.post(
      '/:id',
@@ -42,7 +43,8 @@ export class ProjectsController extends BaseController {
        check('cost_estimate').exists().isDecimal(),
      ],
      this.validationResult,
-      asyncMiddleware(this.editProject.bind(this))
+      asyncMiddleware(this.editProject.bind(this)),
+      this.catchServiceErrors
    );
    router.patch(
      '/:projectId/status',
@@ -54,14 +56,16 @@ export class ProjectsController extends BaseController {
          .isIn([IProjectStatus.InProgress, IProjectStatus.Closed]),
      ],
      this.validationResult,
-      asyncMiddleware(this.editProject.bind(this))
+      asyncMiddleware(this.editProject.bind(this)),
+      this.catchServiceErrors
    );
    router.get(
      '/:id',
      CheckPolicies(ProjectAction.VIEW, AbilitySubject.Project),
      [param('id').exists().isInt().toInt()],
      this.validationResult,
-      asyncMiddleware(this.getProject.bind(this))
+      asyncMiddleware(this.getProject.bind(this)),
+      this.catchServiceErrors
    );
    router.get(
      '/:projectId/billable/entries',
@@ -72,21 +76,24 @@ export class ProjectsController extends BaseController {
        query('to_date').optional().isISO8601(),
      ],
      this.validationResult,
-      asyncMiddleware(this.projectBillableEntries.bind(this))
+      asyncMiddleware(this.projectBillableEntries.bind(this)),
+      this.catchServiceErrors
    );
    router.get(
      '/',
      CheckPolicies(ProjectAction.VIEW, AbilitySubject.Project),
      [],
      this.validationResult,
-      asyncMiddleware(this.getProjects.bind(this))
+      asyncMiddleware(this.getProjects.bind(this)),
+      this.catchServiceErrors
    );
    router.delete(
      '/:id',
      CheckPolicies(ProjectAction.DELETE, AbilitySubject.Project),
      [param('id').exists().isInt().toInt()],
      this.validationResult,
-      asyncMiddleware(this.deleteProject.bind(this))
+      asyncMiddleware(this.deleteProject.bind(this)),
+      this.catchServiceErrors
    );
    return router;
  }
@@ -245,4 +252,22 @@ export class ProjectsController extends BaseController {
      next(error);
    }
  };
+
+  /**
+   * Transforms service errors to response.
+   * @param {Error}
+   * @param {Request} req
+   * @param {Response} res
+   * @param {ServiceError} error
+   */
+  private catchServiceErrors(
+    error,
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
+    if (error instanceof ServiceError) {
+    }
+    next(error);
+  }
 }
--- a/packages/server/src/api/controllers/Purchases/Bills.ts
+++ b/packages/server/src/api/controllers/Purchases/Bills.ts
@@ -115,13 +115,12 @@ export default class BillsController extends BaseController {
      check('note').optional().trim().escape(),
      check('open').default(false).isBoolean().toBoolean(),

-      check('is_inclusive_tax').default(false).isBoolean().toBoolean(),
-
      check('entries').isArray({ min: 1 }),
+
      check('entries.*.index').exists().isNumeric().toInt(),
      check('entries.*.item_id').exists().isNumeric().toInt(),
      check('entries.*.rate').exists().isNumeric().toFloat(),
-      check('entries.*.quantity').exists().isNumeric().toInt(),
+      check('entries.*.quantity').exists().isNumeric().toFloat(),
      check('entries.*.discount')
        .optional({ nullable: true })
        .isNumeric()
@@ -138,18 +137,6 @@ export default class BillsController extends BaseController {
        .optional({ nullable: true })
        .isNumeric()
        .toInt(),
-      check('entries.*.tax_code')
-        .optional({ nullable: true })
-        .trim()
-        .escape()
-        .isString(),
-      check('entries.*.tax_rate_id')
-        .optional({ nullable: true })
-        .isNumeric()
-        .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
    ];
  }

@@ -192,9 +179,6 @@ export default class BillsController extends BaseController {
        .optional({ nullable: true })
        .isBoolean()
        .toBoolean(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
    ];
  }

@@ -308,7 +292,7 @@ export default class BillsController extends BaseController {
    try {
      const bill = await this.billsApplication.getBill(tenantId, billId);

-      return res.status(200).send({ bill });
+      return res.status(200).send(this.transfromToResponse({ bill }));
    } catch (error) {
      next(error);
    }
@@ -353,11 +337,14 @@ export default class BillsController extends BaseController {
    };

    try {
-      const billsWithPagination = await this.billsApplication.getBills(
-        tenantId,
-        filter
-      );
-      return res.status(200).send(billsWithPagination);
+      const { bills, pagination, filterMeta } =
+        await this.billsApplication.getBills(tenantId, filter);
+
+      return res.status(200).send({
+        bills: this.transfromToResponse(bills),
+        pagination: this.transfromToResponse(pagination),
+        filter_meta: this.transfromToResponse(filterMeta),
+      });
    } catch (error) {
      next(error);
    }
@@ -555,26 +542,6 @@ export default class BillsController extends BaseController {
          ],
        });
      }
-      if (error.errorType === 'ITEM_ENTRY_TAX_RATE_CODE_NOT_FOUND') {
-        return res.boom.badRequest(null, {
-          errors: [{ type: 'ITEM_ENTRY_TAX_RATE_CODE_NOT_FOUND', code: 1800 }],
-        });
-      }
-      if (error.errorType === 'ITEM_ENTRY_TAX_RATE_ID_NOT_FOUND') {
-        return res.boom.badRequest(null, {
-          errors: [{ type: 'ITEM_ENTRY_TAX_RATE_ID_NOT_FOUND', code: 1900 }],
-        });
-      }
-      if (error.errorType === 'BILL_AMOUNT_SMALLER_THAN_PAID_AMOUNT') {
-        return res.boom.badRequest(null, {
-          errors: [
-            {
-              type: 'BILL_AMOUNT_SMALLER_THAN_PAID_AMOUNT',
-              code: 2000,
-            },
-          ],
-        });
-      }
    }
    next(error);
  }
--- a/packages/server/src/api/controllers/Purchases/BillsPayments.ts
+++ b/packages/server/src/api/controllers/Purchases/BillsPayments.ts
@@ -121,10 +121,7 @@ export default class BillsPayments extends BaseController {
      check('entries').exists().isArray({ min: 1 }),
      check('entries.*.index').optional().isNumeric().toInt(),
      check('entries.*.bill_id').exists().isNumeric().toInt(),
-      check('entries.*.payment_amount').exists().isNumeric().toFloat(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
+      check('entries.*.payment_amount').exists().isNumeric().toInt(),
    ];
  }

@@ -161,11 +158,15 @@ export default class BillsPayments extends BaseController {
    const { tenantId } = req;
    const { vendorId } = this.matchedQueryData(req);

-    const entries = await this.billPaymentsPages.getNewPageEntries(
-      tenantId,
-      vendorId
-    );
-    return res.status(200).send({ entries });
+    try {
+      const entries = await this.billPaymentsPages.getNewPageEntries(
+        tenantId,
+        vendorId
+      );
+      return res.status(200).send({
+        entries: this.transfromToResponse(entries),
+      });
+    } catch (error) {}
  }

  /**
@@ -182,12 +183,16 @@ export default class BillsPayments extends BaseController {
    const { id: paymentReceiveId } = req.params;

    try {
-      const billPaymentsWithEditEntries =
+      const { billPayment, entries } =
        await this.billPaymentsPages.getBillPaymentEditPage(
          tenantId,
          paymentReceiveId
        );
-      return res.status(200).send(billPaymentsWithEditEntries);
+
+      return res.status(200).send({
+        bill_payment: this.transfromToResponse(billPayment),
+        entries: this.transfromToResponse(entries),
+      });
    } catch (error) {
      next(error);
    }
@@ -299,7 +304,9 @@ export default class BillsPayments extends BaseController {
        tenantId,
        billPaymentId
      );
-      return res.status(200).send({ billPayment });
+      return res.status(200).send({
+        bill_payment: this.transfromToResponse(billPayment),
+      });
    } catch (error) {
      next(error);
    }
@@ -352,12 +359,17 @@ export default class BillsPayments extends BaseController {
    };

    try {
-      const billPaymentsWithPagination =
+      const { billPayments, pagination, filterMeta } =
        await this.billPaymentsApplication.getBillPayments(
          tenantId,
          billPaymentsFilter
        );
-      return res.status(200).send(billPaymentsWithPagination);
+
+      return res.status(200).send({
+        bill_payments: this.transfromToResponse(billPayments),
+        pagination: this.transfromToResponse(pagination),
+        filter_meta: this.transfromToResponse(filterMeta),
+      });
    } catch (error) {
      next(error);
    }
--- a/packages/server/src/api/controllers/Purchases/VendorCredit.ts
+++ b/packages/server/src/api/controllers/Purchases/VendorCredit.ts
@@ -173,7 +173,7 @@ export default class VendorCreditController extends BaseController {
      check('entries.*.index').exists().isNumeric().toInt(),
      check('entries.*.item_id').exists().isNumeric().toInt(),
      check('entries.*.rate').exists().isNumeric().toFloat(),
-      check('entries.*.quantity').exists().isNumeric().toInt(),
+      check('entries.*.quantity').exists().isNumeric().toFloat(),
      check('entries.*.discount')
        .optional({ nullable: true })
        .isNumeric()
@@ -186,9 +186,6 @@ export default class VendorCreditController extends BaseController {
        .optional({ nullable: true })
        .isNumeric()
        .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
    ];
  }

@@ -214,11 +211,12 @@ export default class VendorCreditController extends BaseController {
      check('branch_id').optional({ nullable: true }).isNumeric().toInt(),

      check('entries').isArray({ min: 1 }),
+
      check('entries.*.id').optional().isNumeric().toInt(),
      check('entries.*.index').exists().isNumeric().toInt(),
      check('entries.*.item_id').exists().isNumeric().toInt(),
      check('entries.*.rate').exists().isNumeric().toFloat(),
-      check('entries.*.quantity').exists().isNumeric().toInt(),
+      check('entries.*.quantity').exists().isNumeric().toFloat(),
      check('entries.*.discount')
        .optional({ nullable: true })
        .isNumeric()
@@ -231,9 +229,6 @@ export default class VendorCreditController extends BaseController {
        .optional({ nullable: true })
        .isNumeric()
        .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
    ];
  }

@@ -303,7 +298,8 @@ export default class VendorCreditController extends BaseController {
    try {
      const vendorCredit = await this.createVendorCreditService.newVendorCredit(
        tenantId,
-        vendorCreditCreateDTO
+        vendorCreditCreateDTO,
+        user
      );

      return res.status(200).send({
@@ -325,19 +321,20 @@ export default class VendorCreditController extends BaseController {
    res: Response,
    next: NextFunction
  ) => {
-    const { id: vendorCreditId } = req.params;
+    const { id: billId } = req.params;
    const { tenantId, user } = req;
    const vendorCreditEditDTO: IVendorCreditEditDTO = this.matchedBodyData(req);

    try {
      await this.editVendorCreditService.editVendorCredit(
        tenantId,
-        vendorCreditId,
-        vendorCreditEditDTO
+        billId,
+        vendorCreditEditDTO,
+        user
      );

      return res.status(200).send({
-        id: vendorCreditId,
+        id: billId,
        message: 'The vendor credit has been edited successfully.',
      });
    } catch (error) {
--- a/packages/server/src/api/controllers/Sales/CreditNotes.ts
+++ b/packages/server/src/api/controllers/Sales/CreditNotes.ts
@@ -26,7 +26,6 @@ import GetCreditNoteAssociatedInvoicesToApply from '@/services/CreditNotes/GetCr
 import GetCreditNoteAssociatedAppliedInvoices from '@/services/CreditNotes/GetCreditNoteAssociatedAppliedInvoices';
 import GetRefundCreditTransaction from '@/services/CreditNotes/GetRefundCreditNoteTransaction';
 import GetCreditNotePdf from '../../../services/CreditNotes/GetCreditNotePdf';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
 /**
 * Credit notes controller.
 * @service
@@ -223,7 +222,7 @@ export default class PaymentReceivesController extends BaseController {
      check('entries.*.index').exists().isNumeric().toInt(),
      check('entries.*.item_id').exists().isNumeric().toInt(),
      check('entries.*.rate').exists().isNumeric().toFloat(),
-      check('entries.*.quantity').exists().isNumeric().toInt(),
+      check('entries.*.quantity').exists().isNumeric().toFloat(),
      check('entries.*.discount')
        .optional({ nullable: true })
        .isNumeric()
@@ -236,9 +235,6 @@ export default class PaymentReceivesController extends BaseController {
        .optional({ nullable: true })
        .isNumeric()
        .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
    ];
  }

@@ -297,7 +293,7 @@ export default class PaymentReceivesController extends BaseController {
    return [
      check('from_account_id').exists().isNumeric().toInt(),
      check('description').optional(),
-
+      
      check('amount').exists().isNumeric().toFloat(),
      check('exchange_rate').optional().isFloat({ gt: 0 }).toFloat(),

@@ -341,7 +337,8 @@ export default class PaymentReceivesController extends BaseController {
    try {
      const creditNote = await this.createCreditNoteService.newCreditNote(
        tenantId,
-        creditNoteDTO
+        creditNoteDTO,
+        user
      );
      return res.status(200).send({
        id: creditNote.id,
@@ -441,7 +438,7 @@ export default class PaymentReceivesController extends BaseController {
  };

  /**
-   * Retrieve the credit note details.
+   * Retrieve the payment receive details.
   * @param {Request} req
   * @param {Response} res
   * @param {NextFunction} next
@@ -454,28 +451,38 @@ export default class PaymentReceivesController extends BaseController {
    const { tenantId } = req;
    const { id: creditNoteId } = req.params;

-    const accept = this.accepts(req);
-
-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
-    if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-      const pdfContent = await this.creditNotePdf.getCreditNotePdf(
-        tenantId,
-        creditNoteId
-      );
-      res.set({
-        'Content-Type': 'application/pdf',
-        'Content-Length': pdfContent.length,
-      });
-      res.send(pdfContent);
-    } else {
+    try {
      const creditNote = await this.getCreditNoteService.getCreditNote(
        tenantId,
        creditNoteId
      );
-      return res.status(200).send({ creditNote });
+      const ACCEPT_TYPE = {
+        APPLICATION_PDF: 'application/pdf',
+        APPLICATION_JSON: 'application/json',
+      };
+      // Response formatter.
+      res.format({
+        // Json content type.
+        [ACCEPT_TYPE.APPLICATION_JSON]: () => {
+          return res
+            .status(200)
+            .send({ credit_note: this.transfromToResponse(creditNote) });
+        },
+        // Pdf content type.
+        [ACCEPT_TYPE.APPLICATION_PDF]: async () => {
+          const pdfContent = await this.creditNotePdf.getCreditNotePdf(
+            tenantId,
+            creditNote
+          );
+          res.set({
+            'Content-Type': 'application/pdf',
+            'Content-Length': pdfContent.length,
+          });
+          res.send(pdfContent);
+        },
+      });
+    } catch (error) {
+      next(error);
    }
  };

--- a/packages/server/src/api/controllers/Sales/PaymentReceives.ts
+++ b/packages/server/src/api/controllers/Sales/PaymentReceives.ts
@@ -1,11 +1,10 @@
 import { Inject, Service } from 'typedi';
 import { Router, Request, Response, NextFunction } from 'express';
-import { body, check, param, query, ValidationChain } from 'express-validator';
+import { check, param, query, ValidationChain } from 'express-validator';
 import {
  AbilitySubject,
  IPaymentReceiveDTO,
  PaymentReceiveAction,
-  PaymentReceiveMailOptsDTO,
 } from '@/interfaces';
 import BaseController from '@/api/controllers/BaseController';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
@@ -14,7 +13,6 @@ import DynamicListingService from '@/services/DynamicListing/DynamicListService'
 import { PaymentReceivesApplication } from '@/services/Sales/PaymentReceives/PaymentReceivesApplication';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
 import { ServiceError } from '@/exceptions';
-import { ACCEPT_TYPE } from '@/interfaces/Http';

@Service()
 export default class PaymentReceivesController extends BaseController {
@@ -119,25 +117,6 @@ export default class PaymentReceivesController extends BaseController {
      asyncMiddleware(this.deletePaymentReceive.bind(this)),
      this.handleServiceErrors
    );
-    router.post(
-      '/:id/mail',
-      [
-        ...this.paymentReceiveValidation,
-        body('subject').isString().optional(),
-        body('from').isString().optional(),
-        body('to').isString().optional(),
-        body('body').isString().optional(),
-        body('attach_invoice').optional().isBoolean().toBoolean(),
-      ],
-      this.sendPaymentReceiveByMail.bind(this),
-      this.handleServiceErrors
-    );
-    router.get(
-      '/:id/mail',
-      [...this.paymentReceiveValidation],
-      asyncMiddleware(this.getPaymentDefaultMail.bind(this)),
-      this.handleServiceErrors
-    );
    return router;
  }

@@ -163,10 +142,7 @@ export default class PaymentReceivesController extends BaseController {
      check('entries.*.id').optional({ nullable: true }).isNumeric().toInt(),
      check('entries.*.index').optional().isNumeric().toInt(),
      check('entries.*.invoice_id').exists().isNumeric().toInt(),
-      check('entries.*.payment_amount').exists().isNumeric().toFloat(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
+      check('entries.*.payment_amount').exists().isNumeric().toInt(),
    ];
  }

@@ -352,12 +328,17 @@ export default class PaymentReceivesController extends BaseController {
    };

    try {
-      const paymentsReceivedWithPagination =
+      const { paymentReceives, pagination, filterMeta } =
        await this.paymentReceiveApplication.getPaymentReceives(
          tenantId,
          filter
        );
-      return res.status(200).send(paymentsReceivedWithPagination);
+
+      return res.status(200).send({
+        payment_receives: this.transfromToResponse(paymentReceives),
+        pagination: this.transfromToResponse(pagination),
+        filter_meta: this.transfromToResponse(filterMeta),
+      });
    } catch (error) {
      next(error);
    }
@@ -434,34 +415,38 @@ export default class PaymentReceivesController extends BaseController {
    const { tenantId } = req;
    const { id: paymentReceiveId } = req.params;

-    const accept = this.accepts(req);
-
-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
-    // Response in pdf format.
-    if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-      const pdfContent =
-        await this.paymentReceiveApplication.getPaymentReceivePdf(
-          tenantId,
-          paymentReceiveId
-        );
-      res.set({
-        'Content-Type': 'application/pdf',
-        'Content-Length': pdfContent.length,
-      });
-      res.send(pdfContent);
-      // Response in json format.
-    } else {
+    try {
      const paymentReceive =
        await this.paymentReceiveApplication.getPaymentReceive(
          tenantId,
          paymentReceiveId
        );
-      return res.status(200).send({
-        payment_receive: paymentReceive,
+
+      const ACCEPT_TYPE = {
+        APPLICATION_PDF: 'application/pdf',
+        APPLICATION_JSON: 'application/json',
+      };
+      res.format({
+        [ACCEPT_TYPE.APPLICATION_JSON]: () => {
+          return res.status(200).send({
+            payment_receive: this.transfromToResponse(paymentReceive),
+          });
+        },
+        [ACCEPT_TYPE.APPLICATION_PDF]: async () => {
+          const pdfContent =
+            await this.paymentReceiveApplication.getPaymentReceivePdf(
+              tenantId,
+              paymentReceive
+            );
+          res.set({
+            'Content-Type': 'application/pdf',
+            'Content-Length': pdfContent.length,
+          });
+          res.send(pdfContent);
+        },
      });
+    } catch (error) {
+      next(error);
    }
  }

@@ -495,7 +480,7 @@ export default class PaymentReceivesController extends BaseController {
  };

  /**
-   * Retrieves the sms details of the given payment receive.
+   *
   * @param {Request} req
   * @param {Response} res
   * @param {NextFunction} next
@@ -522,74 +507,14 @@ export default class PaymentReceivesController extends BaseController {
    }
  };

-  /**
-   * Sends mail invoice of the given sale invoice.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  public sendPaymentReceiveByMail = async (
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) => {
-    const { tenantId } = req;
-    const { id: paymentReceiveId } = req.params;
-    const paymentMailDTO: PaymentReceiveMailOptsDTO = this.matchedBodyData(
-      req,
-      {
-        includeOptionals: false,
-      }
-    );
-
-    try {
-      await this.paymentReceiveApplication.notifyPaymentByMail(
-        tenantId,
-        paymentReceiveId,
-        paymentMailDTO
-      );
-      return res.status(200).send({
-        code: 200,
-        message: 'The payment notification has been sent successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  };
-
-  /**
-   * Retrieves the default mail options of the given payment transaction.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  public getPaymentDefaultMail = async (
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) => {
-    const { tenantId } = req;
-    const { id: paymentReceiveId } = req.params;
-
-    try {
-      const data = await this.paymentReceiveApplication.getPaymentMailOptions(
-        tenantId,
-        paymentReceiveId
-      );
-      return res.status(200).send({ data });
-    } catch (error) {
-      next(error);
-    }
-  };
-
  /**
   * Handles service errors.
-   * @param {Error} error
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
+   * @param error
+   * @param req
+   * @param res
+   * @param next
   */
-  private handleServiceErrors(
+  handleServiceErrors(
    error: Error,
    req: Request,
    res: Response,
--- a/packages/server/src/api/controllers/Sales/SalesEstimates.ts
+++ b/packages/server/src/api/controllers/Sales/SalesEstimates.ts
@@ -1,11 +1,10 @@
 import { Router, Request, Response, NextFunction } from 'express';
-import { body, check, param, query } from 'express-validator';
+import { check, param, query } from 'express-validator';
 import { Inject, Service } from 'typedi';
 import {
  AbilitySubject,
  ISaleEstimateDTO,
  SaleEstimateAction,
-  SaleEstimateMailOptionsDTO,
 } from '@/interfaces';
 import BaseController from '@/api/controllers/BaseController';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
@@ -122,27 +121,6 @@ export default class SalesEstimatesController extends BaseController {
      this.handleServiceErrors,
      this.dynamicListService.handlerErrorsToResponse
    );
-    router.post(
-      '/:id/mail',
-      [
-        ...this.validateSpecificEstimateSchema,
-        body('subject').isString().optional(),
-        body('from').isString().optional(),
-        body('to').isString().optional(),
-        body('body').isString().optional(),
-        body('attach_invoice').optional().isBoolean().toBoolean(),
-      ],
-      this.validationResult,
-      asyncMiddleware(this.sendSaleEstimateMail.bind(this)),
-      this.handleServiceErrors
-    );
-    router.get(
-      '/:id/mail',
-      [...this.validateSpecificEstimateSchema],
-      this.validationResult,
-      asyncMiddleware(this.getSaleEstimateMail.bind(this)),
-      this.handleServiceErrors
-    );
    return router;
  }

@@ -184,9 +162,6 @@ export default class SalesEstimatesController extends BaseController {
      check('note').optional().trim().escape(),
      check('terms_conditions').optional().trim().escape(),
      check('send_to_email').optional().trim().escape(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
    ];
  }

@@ -337,6 +312,7 @@ export default class SalesEstimatesController extends BaseController {
        tenantId,
        estimateId
      );
+
      return res.status(200).send({
        id: estimateId,
        message: 'The sale estimate has been approved successfully.',
@@ -365,6 +341,7 @@ export default class SalesEstimatesController extends BaseController {
        tenantId,
        estimateId
      );
+
      return res.status(200).send({
        id: estimateId,
        message: 'The sale estimate has been rejected successfully.',
@@ -384,30 +361,33 @@ export default class SalesEstimatesController extends BaseController {
    const { id: estimateId } = req.params;
    const { tenantId } = req;

-    const accept = this.accepts(req);
-
-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
-    // Retrieves estimate in pdf format.
-    if (ACCEPT_TYPE.APPLICATION_PDF == acceptType) {
-      const pdfContent = await this.saleEstimatesApplication.getSaleEstimatePdf(
-        tenantId,
-        estimateId
-      );
-      res.set({
-        'Content-Type': 'application/pdf',
-        'Content-Length': pdfContent.length,
-      });
-      res.send(pdfContent);
-      // Retrieves estimates in json format.
-    } else {
+    try {
      const estimate = await this.saleEstimatesApplication.getSaleEstimate(
        tenantId,
        estimateId
      );
-      return res.status(200).send({ estimate });
+      // Response formatter.
+      res.format({
+        // JSON content type.
+        [ACCEPT_TYPE.APPLICATION_JSON]: () => {
+          return res.status(200).send(this.transfromToResponse({ estimate }));
+        },
+        // PDF content type.
+        [ACCEPT_TYPE.APPLICATION_PDF]: async () => {
+          const pdfContent =
+            await this.saleEstimatesApplication.getSaleEstimatePdf(
+              tenantId,
+              estimate
+            );
+          res.set({
+            'Content-Type': 'application/pdf',
+            'Content-Length': pdfContent.length,
+          });
+          res.send(pdfContent);
+        },
+      });
+    } catch (error) {
+      next(error);
    }
  }

@@ -425,11 +405,22 @@ export default class SalesEstimatesController extends BaseController {
      pageSize: 12,
      ...this.matchedQueryData(req),
    };
+
    try {
-      const salesEstimatesWithPagination =
+      const { salesEstimates, pagination, filterMeta } =
        await this.saleEstimatesApplication.getSaleEstimates(tenantId, filter);

-      return res.status(200).send(salesEstimatesWithPagination);
+      res.format({
+        [ACCEPT_TYPE.APPLICATION_JSON]: () => {
+          return res.status(200).send(
+            this.transfromToResponse({
+              salesEstimates,
+              pagination,
+              filterMeta,
+            })
+          );
+        },
+      });
    } catch (error) {
      next(error);
    }
@@ -487,65 +478,6 @@ export default class SalesEstimatesController extends BaseController {
    }
  };

-  /**
-   * Send the sale estimate mail.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private sendSaleEstimateMail = async (
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) => {
-    const { tenantId } = req;
-    const { id: invoiceId } = req.params;
-    const saleEstimateDTO: SaleEstimateMailOptionsDTO = this.matchedBodyData(
-      req,
-      {
-        includeOptionals: false,
-      }
-    );
-    try {
-      await this.saleEstimatesApplication.sendSaleEstimateMail(
-        tenantId,
-        invoiceId,
-        saleEstimateDTO
-      );
-      return res.status(200).send({
-        code: 200,
-        message: 'The sale estimate mail has been sent successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  };
-
-  /**
-   * Retrieves the default mail options of the given sale estimate.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private getSaleEstimateMail = async (
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) => {
-    const { tenantId } = req;
-    const { id: invoiceId } = req.params;
-
-    try {
-      const data = await this.saleEstimatesApplication.getSaleEstimateMail(
-        tenantId,
-        invoiceId
-      );
-      return res.status(200).send({ data });
-    } catch (error) {
-      next(error);
-    }
-  };
-
  /**
   * Handles service errors.
   * @param {Error} error
--- a/packages/server/src/api/controllers/Sales/SalesInvoices.ts
+++ b/packages/server/src/api/controllers/Sales/SalesInvoices.ts
@@ -1,5 +1,5 @@
 import { Router, Request, Response, NextFunction } from 'express';
-import { body, check, param, query } from 'express-validator';
+import { check, param, query } from 'express-validator';
 import { Service, Inject } from 'typedi';
 import BaseController from '../BaseController';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
@@ -10,12 +10,14 @@ import {
  ISaleInvoiceCreateDTO,
  SaleInvoiceAction,
  AbilitySubject,
-  SendInvoiceMailDTO,
 } from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
 import { SaleInvoiceApplication } from '@/services/Sales/Invoices/SaleInvoicesApplication';
-import { ACCEPT_TYPE } from '@/interfaces/Http';

+const ACCEPT_TYPE = {
+  APPLICATION_PDF: 'application/pdf',
+  APPLICATION_JSON: 'application/json',
+};
@Service()
 export default class SaleInvoicesController extends BaseController {
  @Inject()
@@ -36,8 +38,6 @@ export default class SaleInvoicesController extends BaseController {
      [
        ...this.saleInvoiceValidationSchema,
        check('from_estimate_id').optional().isNumeric().toInt(),
-        check('attachments').isArray().optional(),
-        check('attachments.*.key').exists().isString(),
      ],
      this.validationResult,
      asyncMiddleware(this.newSaleInvoice.bind(this)),
@@ -100,8 +100,6 @@ export default class SaleInvoicesController extends BaseController {
      [
        ...this.saleInvoiceValidationSchema,
        ...this.specificSaleInvoiceValidation,
-        check('attachments').isArray().optional(),
-        check('attachments.*.key').exists().isString(),
      ],
      this.validationResult,
      asyncMiddleware(this.editSaleInvoice.bind(this)),
@@ -147,48 +145,6 @@ export default class SaleInvoicesController extends BaseController {
      this.handleServiceErrors,
      this.dynamicListService.handlerErrorsToResponse
    );
-    router.get(
-      '/:id/mail-reminder',
-      this.specificSaleInvoiceValidation,
-      this.validationResult,
-      asyncMiddleware(this.getSaleInvoiceMailReminder.bind(this)),
-      this.handleServiceErrors
-    );
-    router.post(
-      '/:id/mail-reminder',
-      [
-        ...this.specificSaleInvoiceValidation,
-        body('subject').isString().optional(),
-        body('from').isString().optional(),
-        body('to').isString().optional(),
-        body('body').isString().optional(),
-        body('attach_invoice').optional().isBoolean().toBoolean(),
-      ],
-      this.validationResult,
-      asyncMiddleware(this.sendSaleInvoiceMailReminder.bind(this)),
-      this.handleServiceErrors
-    );
-    router.post(
-      '/:id/mail',
-      [
-        ...this.specificSaleInvoiceValidation,
-        body('subject').isString().optional(),
-        body('from').isString().optional(),
-        body('to').isString().optional(),
-        body('body').isString().optional(),
-        body('attach_invoice').optional().isBoolean().toBoolean(),
-      ],
-      this.validationResult,
-      asyncMiddleware(this.sendSaleInvoiceMail.bind(this)),
-      this.handleServiceErrors
-    );
-    router.get(
-      '/:id/mail',
-      [...this.specificSaleInvoiceValidation],
-      this.validationResult,
-      asyncMiddleware(this.getSaleInvoiceMail.bind(this)),
-      this.handleServiceErrors
-    );
    return router;
  }

@@ -404,6 +360,7 @@ export default class SaleInvoicesController extends BaseController {
        saleInvoiceId,
        user
      );
+
      return res.status(200).send({
        id: saleInvoiceId,
        message: 'The sale invoice has been deleted successfully.',
@@ -418,35 +375,43 @@ export default class SaleInvoicesController extends BaseController {
   * @param {Request} req - Request object.
   * @param {Response} res - Response object.
   */
-  private async getSaleInvoice(req: Request, res: Response) {
+  private async getSaleInvoice(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
    const { id: saleInvoiceId } = req.params;
    const { tenantId, user } = req;

-    const accept = this.accepts(req);
-
-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
-    // Retrieves invoice in pdf format.
-    if (ACCEPT_TYPE.APPLICATION_PDF == acceptType) {
-      const pdfContent = await this.saleInvoiceApplication.saleInvoicePdf(
-        tenantId,
-        saleInvoiceId
-      );
-      res.set({
-        'Content-Type': 'application/pdf',
-        'Content-Length': pdfContent.length,
-      });
-      res.send(pdfContent);
-      // Retrieves invoice in json format.
-    } else {
+    try {
      const saleInvoice = await this.saleInvoiceApplication.getSaleInvoice(
        tenantId,
        saleInvoiceId,
        user
      );
-      return res.status(200).send({ saleInvoice });
+      // Response formatter.
+      res.format({
+        // JSON content type.
+        [ACCEPT_TYPE.APPLICATION_JSON]: () => {
+          return res
+            .status(200)
+            .send(this.transfromToResponse({ saleInvoice }));
+        },
+        // PDF content type.
+        [ACCEPT_TYPE.APPLICATION_PDF]: async () => {
+          const pdfContent = await this.saleInvoiceApplication.saleInvoicePdf(
+            tenantId,
+            saleInvoice
+          );
+          res.set({
+            'Content-Type': 'application/pdf',
+            'Content-Length': pdfContent.length,
+          });
+          res.send(pdfContent);
+        },
+      });
+    } catch (error) {
+      next(error);
    }
  }
  /**
@@ -469,10 +434,14 @@ export default class SaleInvoicesController extends BaseController {
      ...this.matchedQueryData(req),
    };
    try {
-      const salesInvoicesWithPagination =
+      const { salesInvoices, filterMeta, pagination } =
        await this.saleInvoiceApplication.getSaleInvoices(tenantId, filter);

-      return res.status(200).send(salesInvoicesWithPagination);
+      return res.status(200).send({
+        sales_invoices: this.transfromToResponse(salesInvoices),
+        pagination: this.transfromToResponse(pagination),
+        filter_meta: this.transfromToResponse(filterMeta),
+      });
    } catch (error) {
      next(error);
    }
@@ -499,7 +468,9 @@ export default class SaleInvoicesController extends BaseController {
          tenantId,
          customerId
        );
-      return res.status(200).send({ salesInvoices });
+      return res.status(200).send({
+        sales_invoices: this.transfromToResponse(salesInvoices),
+      });
    } catch (error) {
      next(error);
    }
@@ -527,6 +498,7 @@ export default class SaleInvoicesController extends BaseController {
        invoiceId,
        writeoffDTO
      );
+
      return res.status(200).send({
        id: saleInvoice.id,
        message: 'The given sale invoice has been written-off successfully.',
@@ -658,119 +630,6 @@ export default class SaleInvoicesController extends BaseController {
    }
  };

-  /**
-   * Sends mail invoice of the given sale invoice.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  public async sendSaleInvoiceMail(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const { id: invoiceId } = req.params;
-    const invoiceMailDTO: SendInvoiceMailDTO = this.matchedBodyData(req, {
-      includeOptionals: false,
-    });
-
-    try {
-      await this.saleInvoiceApplication.sendSaleInvoiceMail(
-        tenantId,
-        invoiceId,
-        invoiceMailDTO
-      );
-      return res.status(200).send({
-        code: 200,
-        message: 'The sale invoice mail has been sent successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Retreivers the sale invoice reminder options.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  public async getSaleInvoiceMailReminder(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const { id: invoiceId } = req.params;
-
-    try {
-      const data = await this.saleInvoiceApplication.getSaleInvoiceMailReminder(
-        tenantId,
-        invoiceId
-      );
-      return res.status(200).send(data);
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Sends mail invoice of the given sale invoice.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  public async sendSaleInvoiceMailReminder(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const { id: invoiceId } = req.params;
-    const invoiceMailDTO: SendInvoiceMailDTO = this.matchedBodyData(req, {
-      includeOptionals: false,
-    });
-    try {
-      await this.saleInvoiceApplication.sendSaleInvoiceMailReminder(
-        tenantId,
-        invoiceId,
-        invoiceMailDTO
-      );
-      return res.status(200).send({
-        code: 200,
-        message: 'The sale invoice mail reminder has been sent successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Retrieves the default mail options of the given sale invoice.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  public async getSaleInvoiceMail(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const { id: invoiceId } = req.params;
-
-    try {
-      const data = await this.saleInvoiceApplication.getSaleInvoiceMail(
-        tenantId,
-        invoiceId
-      );
-      return res.status(200).send({ data });
-    } catch (error) {
-      next(error);
-    }
-  }
-
  /**
   * Handles service errors.
   * @param {Error} error
--- a/packages/server/src/api/controllers/Sales/SalesReceipts.ts
+++ b/packages/server/src/api/controllers/Sales/SalesReceipts.ts
@@ -1,19 +1,14 @@
 import { Router, Request, Response, NextFunction } from 'express';
-import { body, check, param, query } from 'express-validator';
+import { check, param, query } from 'express-validator';
 import { Inject, Service } from 'typedi';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import BaseController from '../BaseController';
-import {
-  ISaleReceiptDTO,
-  SaleReceiptMailOpts,
-  SaleReceiptMailOptsDTO,
-} from '@/interfaces/SaleReceipt';
+import { ISaleReceiptDTO } from '@/interfaces/SaleReceipt';
 import { ServiceError } from '@/exceptions';
 import DynamicListingService from '@/services/DynamicListing/DynamicListService';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
 import { AbilitySubject, SaleReceiptAction } from '@/interfaces';
 import { SaleReceiptApplication } from '@/services/Sales/Receipts/SaleReceiptApplication';
-import { ACCEPT_TYPE } from '@/interfaces/Http';

@Service()
 export default class SalesReceiptsController extends BaseController {
@@ -51,27 +46,6 @@ export default class SalesReceiptsController extends BaseController {
      this.saleReceiptSmsDetails,
      this.handleServiceErrors
    );
-    router.post(
-      '/:id/mail',
-      [
-        ...this.specificReceiptValidationSchema,
-        body('subject').isString().optional(),
-        body('from').isString().optional(),
-        body('to').isString().optional(),
-        body('body').isString().optional(),
-        body('attach_receipt').optional().isBoolean().toBoolean(),
-      ],
-      this.validationResult,
-      asyncMiddleware(this.sendSaleReceiptMail.bind(this)),
-      this.handleServiceErrors
-    );
-    router.get(
-      '/:id/mail',
-      [...this.specificReceiptValidationSchema],
-      this.validationResult,
-      asyncMiddleware(this.getSaleReceiptMail.bind(this)),
-      this.handleServiceErrors
-    );
    router.post(
      '/:id',
      CheckPolicies(SaleReceiptAction.Edit, AbilitySubject.SaleReceipt),
@@ -143,7 +117,7 @@ export default class SalesReceiptsController extends BaseController {
      check('entries.*.index').exists().isNumeric().toInt(),
      check('entries.*.item_id').exists().isNumeric().toInt(),
      check('entries.*.quantity').exists().isNumeric().toInt(),
-      check('entries.*.rate').exists().isNumeric().toFloat(),
+      check('entries.*.rate').exists().isNumeric().toInt(),
      check('entries.*.discount')
        .optional({ nullable: true })
        .isNumeric()
@@ -158,8 +132,6 @@ export default class SalesReceiptsController extends BaseController {
        .toInt(),
      check('receipt_message').optional().trim().escape(),
      check('statement').optional().trim().escape(),
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
    ];
  }

@@ -233,6 +205,7 @@ export default class SalesReceiptsController extends BaseController {
        tenantId,
        saleReceiptId
      );
+
      return res.status(200).send({
        id: saleReceiptId,
        message: 'Sale receipt has been deleted successfully.',
@@ -321,10 +294,15 @@ export default class SalesReceiptsController extends BaseController {
      ...this.matchedQueryData(req),
    };
    try {
-      const salesReceiptsWithPagination =
+      const { data, pagination, filterMeta } =
        await this.saleReceiptsApplication.getSaleReceipts(tenantId, filter);

-      return res.status(200).send(salesReceiptsWithPagination);
+      const response = this.transfromToResponse({
+        data,
+        pagination,
+        filterMeta,
+      });
+      return res.status(200).send(response);
    } catch (error) {
      next(error);
    }
@@ -336,34 +314,36 @@ export default class SalesReceiptsController extends BaseController {
   * @param {Response} res
   * @param {NextFunction} next
   */
-  public async getSaleReceipt(req: Request, res: Response) {
+  async getSaleReceipt(req: Request, res: Response, next: NextFunction) {
    const { id: saleReceiptId } = req.params;
    const { tenantId } = req;

-    const accept = this.accepts(req);
-
-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
-    // Retrieves receipt in pdf format.
-    if (ACCEPT_TYPE.APPLICATION_PDF == acceptType) {
-      const pdfContent = await this.saleReceiptsApplication.getSaleReceiptPdf(
-        tenantId,
-        saleReceiptId
-      );
-      res.set({
-        'Content-Type': 'application/pdf',
-        'Content-Length': pdfContent.length,
-      });
-      res.send(pdfContent);
-      // Retrieves receipt in json format.
-    } else {
+    try {
      const saleReceipt = await this.saleReceiptsApplication.getSaleReceipt(
        tenantId,
        saleReceiptId
      );
-      return res.status(200).send({ saleReceipt });
+      res.format({
+        'application/json': () => {
+          return res
+            .status(200)
+            .send(this.transfromToResponse({ saleReceipt }));
+        },
+        'application/pdf': async () => {
+          const pdfContent =
+            await this.saleReceiptsApplication.getSaleReceiptPdf(
+              tenantId,
+              saleReceipt
+            );
+          res.set({
+            'Content-Type': 'application/pdf',
+            'Content-Length': pdfContent.length,
+          });
+          res.send(pdfContent);
+        },
+      });
+    } catch (error) {
+      next(error);
    }
  }

@@ -425,64 +405,6 @@ export default class SalesReceiptsController extends BaseController {
    }
  };

-  /**
-   * Sends mail notification of the given sale receipt.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  public sendSaleReceiptMail = async (
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) => {
-    const { tenantId } = req;
-    const { id: receiptId } = req.params;
-    const receiptMailDTO: SaleReceiptMailOptsDTO = this.matchedBodyData(req, {
-      includeOptionals: false,
-    });
-
-    try {
-      await this.saleReceiptsApplication.sendSaleReceiptMail(
-        tenantId,
-        receiptId,
-        receiptMailDTO
-      );
-      return res.status(200).send({
-        code: 200,
-        message:
-          'The sale receipt notification via sms has been sent successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  };
-
-  /**
-   * Retrieves the default mail options of the given sale receipt.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  public getSaleReceiptMail = async (
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) => {
-    const { tenantId } = req;
-    const { id: receiptId } = req.params;
-
-    try {
-      const data = await this.saleReceiptsApplication.getSaleReceiptMail(
-        tenantId,
-        receiptId
-      );
-      return res.status(200).send({ data });
-    } catch (error) {
-      next(error);
-    }
-  };
-
  /**
   * Handles service errors.
   * @param {Error} error
--- a/packages/server/src/api/controllers/Subscription/SubscriptionController.ts
+++ b/packages/server/src/api/controllers/Subscription/SubscriptionController.ts
@@ -1,88 +0,0 @@
-import { Router, Request, Response, NextFunction } from 'express';
-import { Service, Inject } from 'typedi';
-import { body } from 'express-validator';
-import JWTAuth from '@/api/middleware/jwtAuth';
-import TenancyMiddleware from '@/api/middleware/TenancyMiddleware';
-import AttachCurrentTenantUser from '@/api/middleware/AttachCurrentTenantUser';
-import SubscriptionService from '@/services/Subscription/SubscriptionService';
-import asyncMiddleware from '@/api/middleware/asyncMiddleware';
-import BaseController from '../BaseController';
-import { LemonSqueezyService } from '@/services/Subscription/LemonSqueezyService';
-
-@Service()
-export class SubscriptionController extends BaseController {
-  @Inject()
-  private subscriptionService: SubscriptionService;
-
-  @Inject()
-  private lemonSqueezyService: LemonSqueezyService;
-
-  /**
-   * Router constructor.
-   */
-  router() {
-    const router = Router();
-
-    router.use(JWTAuth);
-    router.use(AttachCurrentTenantUser);
-    router.use(TenancyMiddleware);
-
-    router.post(
-      '/lemon/checkout_url',
-      [body('variantId').exists().trim()],
-      this.validationResult,
-      this.getCheckoutUrl.bind(this)
-    );
-    router.get('/', asyncMiddleware(this.getSubscriptions.bind(this)));
-
-    return router;
-  }
-
-  /**
-   * Retrieve all subscriptions of the authenticated user's tenant.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async getSubscriptions(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-
-    try {
-      const subscriptions = await this.subscriptionService.getSubscriptions(
-        tenantId
-      );
-      return res.status(200).send({ subscriptions });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Retrieves the LemonSqueezy checkout url.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async getCheckoutUrl(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { variantId } = this.matchedBodyData(req);
-    const { user } = req;
-
-    try {
-      const checkout = await this.lemonSqueezyService.getCheckout(
-        variantId,
-        user
-      );
-      return res.status(200).send(checkout);
-    } catch (error) {
-      next(error);
-    }
-  }
-}
--- a/packages/server/src/api/controllers/Subscription/index.ts
+++ b/packages/server/src/api/controllers/Subscription/index.ts
@@ -1 +0,0 @@
-export * from './SubscriptionController';
--- a/packages/server/src/api/controllers/Users.ts
+++ b/packages/server/src/api/controllers/Users.ts
@@ -155,7 +155,6 @@ export default class UsersController extends BaseController {

    try {
      const user = await this.usersService.getUser(tenantId, userId);
-
      return res.status(200).send({ user });
    } catch (error) {
      next(error);
@@ -230,7 +229,7 @@ export default class UsersController extends BaseController {
   * @param {Response} res
   * @param {NextFunction} next
   */
-  private catchServiceErrors(
+  catchServiceErrors(
    error: Error,
    req: Request,
    res: Response,
--- a/packages/server/src/api/controllers/Warehouses/index.ts
+++ b/packages/server/src/api/controllers/Warehouses/index.ts
@@ -17,7 +17,7 @@ export class WarehousesController extends BaseController {
   *
   * @returns
   */
-  public router() {
+  router() {
    const router = Router();

    router.post(
--- a/packages/server/src/api/controllers/Webhooks/Webhooks.ts
+++ b/packages/server/src/api/controllers/Webhooks/Webhooks.ts
@@ -1,76 +0,0 @@
-import { Router } from 'express';
-import { PlaidApplication } from '@/services/Banking/Plaid/PlaidApplication';
-import { Request, Response } from 'express';
-import { Inject, Service } from 'typedi';
-import BaseController from '../BaseController';
-import { LemonSqueezyWebhooks } from '@/services/Subscription/LemonSqueezyWebhooks';
-import { PlaidWebhookTenantBootMiddleware } from '@/services/Banking/Plaid/PlaidWebhookTenantBootMiddleware';
-
-@Service()
-export class Webhooks extends BaseController {
-  @Inject()
-  private plaidApp: PlaidApplication;
-
-  @Inject()
-  private lemonWebhooksService: LemonSqueezyWebhooks;
-
-  /**
-   * Router constructor.
-   */
-  router() {
-    const router = Router();
-
-    router.use('/plaid', PlaidWebhookTenantBootMiddleware);
-    router.post('/plaid', this.plaidWebhooks.bind(this));
-
-    router.post('/lemon', this.lemonWebhooks.bind(this));
-
-    return router;
-  }
-
-  /**
-   * Listens to Lemon Squeezy webhooks events.
-   * @param {Request} req
-   * @param {Response} res
-   * @returns {Response}
-   */
-  public async lemonWebhooks(req: Request, res: Response, next: any) {
-    const data = req.body;
-    const signature = req.headers['x-signature'] ?? '';
-    const rawBody = req.rawBody;
-
-    try {
-      await this.lemonWebhooksService.handlePostWebhook(
-        rawBody,
-        data,
-        signature
-      );
-      return res.status(200).send();
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Listens to Plaid webhooks.
-   * @param {Request} req
-   * @param {Response} res
-   * @returns {Response}
-   */
-  public async plaidWebhooks(req: Request, res: Response) {
-    const { tenantId } = req;
-    const {
-      webhook_type: webhookType,
-      webhook_code: webhookCode,
-      item_id: plaidItemId,
-    } = req.body;
-
-    await this.plaidApp.webhooks(
-      tenantId,
-      plaidItemId,
-      webhookType,
-      webhookCode
-    );
-    return res.status(200).send({ code: 200, message: 'ok' });
-  }
-}
--- a/packages/server/src/api/exceptions/GlobalErrorException.ts
+++ b/packages/server/src/api/exceptions/GlobalErrorException.ts
@@ -1,20 +0,0 @@
-import { Request, Response, NextFunction } from 'express';
-
-/**
- * Global error handler.
- * @param {Error} err
- * @param {Request} req
- * @param {Response} res
- * @param {NextFunction} next
- */
-export function GlobalErrorException(
-  err: Error,
-  req: Request,
-  res: Response,
-  next: NextFunction
-) {
-  console.error(err.stack);
-
-  res.status(500);
-  res.boom.badImplementation('', { stack: err.stack });
-}
--- a/packages/server/src/api/exceptions/ServiceErrorException.ts
+++ b/packages/server/src/api/exceptions/ServiceErrorException.ts
@@ -1,25 +0,0 @@
-import { NextFunction, Request, Response } from 'express';
-import { ServiceError } from '@/exceptions';
-
-/**
- * Handles service error exception.
- * @param {Error | ServiceError} err
- * @param {Request} req
- * @param {Response} res
- * @param {NextFunction} next
- */
-export function ServiceErrorException(
-  err: Error | ServiceError,
-  req: Request,
-  res: Response,
-  next: NextFunction
-) {
-  if (err instanceof ServiceError) {
-    res.boom.badRequest('', {
-      errors: [{ type: err.errorType, message: err.message }],
-      type: 'ServiceError',
-    });
-  } else {
-    next(err);
-  }
-}
--- a/packages/server/src/api/index.ts
+++ b/packages/server/src/api/index.ts
@@ -4,7 +4,6 @@ import { Container } from 'typedi';
 // Middlewares
 import JWTAuth from '@/api/middleware/jwtAuth';
 import AttachCurrentTenantUser from '@/api/middleware/AttachCurrentTenantUser';
-import SubscriptionMiddleware from '@/api/middleware/SubscriptionMiddleware';
 import TenancyMiddleware from '@/api/middleware/TenancyMiddleware';
 import EnsureTenantIsInitialized from '@/api/middleware/EnsureTenantIsInitialized';
 import SettingsMiddleware from '@/api/middleware/SettingsMiddleware';
@@ -37,7 +36,6 @@ import Resources from './controllers/Resources';
 import ExchangeRates from '@/api/controllers/ExchangeRates';
 import Media from '@/api/controllers/Media';
 import Ping from '@/api/controllers/Ping';
-import { SubscriptionController } from '@/api/controllers/Subscription';
 import InventoryAdjustments from '@/api/controllers/Inventory/InventoryAdjustments';
 import asyncRenderMiddleware from './middleware/AsyncRenderMiddleware';
 import Jobs from './controllers/Jobs';
@@ -58,11 +56,6 @@ import { ProjectsController } from './controllers/Projects/Projects';
 import { ProjectTasksController } from './controllers/Projects/Tasks';
 import { ProjectTimesController } from './controllers/Projects/Times';
 import { TaxRatesController } from './controllers/TaxRates/TaxRates';
-import { ImportController } from './controllers/Import/ImportController';
-import { BankingController } from './controllers/Banking/BankingController';
-import { Webhooks } from './controllers/Webhooks/Webhooks';
-import { ExportController } from './controllers/Export/ExportController';
-import { AttachmentsController } from './controllers/Attachments/AttachmentsController';

 export default () => {
  const app = Router();
@@ -74,12 +67,10 @@ export default () => {

  app.use('/auth', Container.get(Authentication).router());
  app.use('/invite', Container.get(InviteUsers).nonAuthRouter());
-  app.use('/subscription', Container.get(SubscriptionController).router());
  app.use('/organization', Container.get(Organization).router());
  app.use('/ping', Container.get(Ping).router());
  app.use('/jobs', Container.get(Jobs).router());
  app.use('/account', Container.get(Account).router());
-  app.use('/webhooks', Container.get(Webhooks).router());

  // - Dashboard routes.
  // ---------------------------
@@ -88,7 +79,6 @@ export default () => {
  dashboard.use(JWTAuth);
  dashboard.use(AttachCurrentTenantUser);
  dashboard.use(TenancyMiddleware);
-  dashboard.use(SubscriptionMiddleware('main'));
  dashboard.use(EnsureTenantIsInitialized);
  dashboard.use(SettingsMiddleware);
  dashboard.use(I18nAuthenticatedMiddlware);
@@ -128,7 +118,6 @@ export default () => {
    Container.get(InventoryItemsCostController).router()
  );
  dashboard.use('/cashflow', Container.get(CashflowController).router());
-  dashboard.use('/banking', Container.get(BankingController).router());
  dashboard.use('/roles', Container.get(RolesController).router());
  dashboard.use(
    '/transactions-locking',
@@ -142,12 +131,9 @@ export default () => {
  dashboard.use('/warehouses', Container.get(WarehousesController).router());
  dashboard.use('/projects', Container.get(ProjectsController).router());
  dashboard.use('/tax-rates', Container.get(TaxRatesController).router());
-  dashboard.use('/import', Container.get(ImportController).router());
-  dashboard.use('/export', Container.get(ExportController).router());
-  dashboard.use('/attachments', Container.get(AttachmentsController).router());
-
  dashboard.use('/', Container.get(ProjectTasksController).router());
  dashboard.use('/', Container.get(ProjectTimesController).router());
+
  dashboard.use('/', Container.get(WarehousesItemController).router());

  dashboard.use('/dashboard', Container.get(DashboardController).router());
--- a/packages/server/src/api/middleware/ObjectionErrorHandlerMiddleware.ts
+++ b/packages/server/src/api/middleware/ObjectionErrorHandlerMiddleware.ts
@@ -10,14 +10,8 @@ import {
  DataError,
 } from 'objection';

-/**
- * Handles the Objection error exception.
- * @param {Error} err
- * @param {Request} req
- * @param {Response} res
- * @param {NextFunction} next
- */
-export function ObjectionErrorException(
+// In this example `res` is an express response object.
+export default function ObjectionErrorHandlerMiddleware(
  err: Error,
  req: Request,
  res: Response,
@@ -114,7 +108,6 @@ export function ObjectionErrorException(
      type: 'UnknownDatabaseError',
      data: {},
    });
-  } else {
-    next(err);
  }
+  next(err);
 }
--- a/packages/server/src/api/middleware/SubscriptionMiddleware.ts
+++ b/packages/server/src/api/middleware/SubscriptionMiddleware.ts
@@ -1,29 +0,0 @@
-import { Container } from 'typedi';
-import { Request, Response, NextFunction } from 'express';
-
-export default (subscriptionSlug = 'main') =>
-  async (req: Request, res: Response, next: NextFunction) => {
-    const { tenant, tenantId } = req;
-    const { subscriptionRepository } = Container.get('repositories');
-
-    if (!tenant) {
-      throw new Error('Should load `TenancyMiddlware` before this middleware.');
-    }
-    const subscription = await subscriptionRepository.getBySlugInTenant(
-      subscriptionSlug,
-      tenantId
-    );
-    // Validate in case there is no any already subscription.
-    if (!subscription) {
-      return res.boom.badRequest('Tenant has no subscription.', {
-        errors: [{ type: 'TENANT.HAS.NO.SUBSCRIPTION' }],
-      });
-    }
-    // Validate in case the subscription is inactive.
-    else if (subscription.inactive()) {
-      return res.boom.badRequest(null, {
-        errors: [{ type: 'ORGANIZATION.SUBSCRIPTION.INACTIVE' }],
-      });
-    }
-    next();
-  };
--- a/packages/server/src/before.ts
+++ b/packages/server/src/before.ts
@@ -5,7 +5,6 @@ global.__root_dir = path.join(__dirname, '..');
 global.__resources_dir = path.join(global.__root_dir, 'resources');
 global.__locales_dir = path.join(global.__resources_dir, 'locales');
 global.__views_dir = path.join(global.__root_dir, 'views');
-global.__storage_dir = path.join(global.__root_dir, 'storage');

 moment.prototype.toMySqlDateTime = function () {
  return this.format('YYYY-MM-DD HH:mm:ss');
--- a/packages/server/src/config/index.ts
+++ b/packages/server/src/config/index.ts
@@ -1,6 +1,6 @@
 import dotenv from 'dotenv';
 import path from 'path';
-import { defaultTo, toInteger } from 'lodash';
+import { toInteger } from 'lodash';
 import { castCommaListEnvVarToArray, parseBoolean } from '@/utils';

 dotenv.config();
@@ -55,10 +55,9 @@ module.exports = {
  mail: {
    host: process.env.MAIL_HOST,
    port: process.env.MAIL_PORT,
-    secure: parseBoolean(defaultTo(process.env.MAIL_SECURE, false), false),
+    secure: !!parseInt(process.env.MAIL_SECURE, 10),
    username: process.env.MAIL_USERNAME,
    password: process.env.MAIL_PASSWORD,
-    from: process.env.MAIL_FROM_ADDRESS,
  },

  /**
@@ -153,16 +152,6 @@ module.exports = {
    ),
  },

-  /**
-   * Sign-up email confirmation
-   */
-  signupConfirmation: {
-    enabled: parseBoolean<boolean>(
-      process.env.SIGNUP_EMAIL_CONFIRMATION,
-      false
-    ),
-  },
-
  /**
   * Puppeteer remote browserless connection.
   */
@@ -179,62 +168,4 @@ module.exports = {
   * to application detarmines to upgrade.
   */
  databaseBatch: 4,
-
-  /**
-   * Exchange rate.
-   */
-  exchangeRate: {
-    service: 'open-exchange-rate',
-    openExchangeRate: {
-      appId: process.env.OPEN_EXCHANGE_RATE_APP_ID,
-    },
-  },
-
-  /**
-   * Bank Synchronization.
-   */
-  bankSync: {
-    enabled: parseBoolean(defaultTo(process.env.BANKING_CONNECT, false), false),
-    provider: 'plaid',
-  },
-
-  /**
-   * Plaid.
-   */
-  plaid: {
-    env: process.env.PLAID_ENV || 'sandbox',
-    clientId: process.env.PLAID_CLIENT_ID,
-    secret: process.env.PLAID_SECRET,
-    linkWebhook: process.env.PLAID_LINK_WEBHOOK,
-  },
-
-  /**
-   * Lemon Squeezy.
-   */
-  lemonSqueezy: {
-    key: process.env.LEMONSQUEEZY_API_KEY,
-    storeId: process.env.LEMONSQUEEZY_STORE_ID,
-    webhookSecret: process.env.LEMONSQUEEZY_WEBHOOK_SECRET,
-    redirectTo: `${process.env.BASE_URL}/setup`,
-  },
-
-  /**
-   * Bigcapital (Cloud).
-   * NOTE: DO NOT CHANGE THIS OPTION OR ADD THIS ENV VAR.
-   */
-  hostedOnBigcapitalCloud: parseBoolean(
-    defaultTo(process.env.HOSTED_ON_BIGCAPITAL_CLOUD, false),
-    false
-  ),
-
-  /**
-   * S3 for documents.
-   */
-  s3: {
-    region: process.env.S3_REGION,
-    accessKeyId: process.env.S3_ACCESS_KEY_ID,
-    secretAccessKey: process.env.S3_SECRET_ACCESS_KEY,
-    endpoint: process.env.S3_ENDPOINT,
-    bucket: process.env.S3_BUCKET,
-  },
 };
--- a/packages/server/src/data/options.ts
+++ b/packages/server/src/data/options.ts
@@ -59,12 +59,6 @@ export default {
    auto_increment: {
      type: 'boolean',
    },
-    customer_notes: {
-      type: 'string',
-    },
-    terms_conditions: {
-      type: 'string',
-    },
  },
  sales_receipts: {
    next_number: {
@@ -79,12 +73,6 @@ export default {
    preferred_deposit_account: {
      type: 'number',
    },
-    receipt_message: {
-      type: 'string',
-    },
-    terms_conditions: {
-      type: 'string',
-    },
  },
  sales_invoices: {
    next_number: {
@@ -96,12 +84,6 @@ export default {
    auto_increment: {
      type: 'boolean',
    },
-    customer_notes: {
-      type: 'string',
-    },
-    terms_conditions: {
-      type: 'string',
-    },
  },
  payment_receives: {
    next_number: {
@@ -136,11 +118,6 @@ export default {
      type: 'number',
    },
  },
-  inventory: {
-    cost_compute_running: {
-      type: 'boolean',
-    },
-  },
  accounts: {
    account_code_required: {
      type: 'boolean',
@@ -170,12 +147,6 @@ export default {
    auto_increment: {
      type: 'boolean',
    },
-    customer_notes: {
-      type: 'string',
-    },
-    terms_conditions: {
-      type: 'string',
-    },
  },
  vendor_credit: {
    next_number: {
--- a/packages/server/src/database/migrations/20231004012644_add_tax_amount_withheld_to_bills_table.js
+++ b/packages/server/src/database/migrations/20231004012644_add_tax_amount_withheld_to_bills_table.js
@@ -1,10 +0,0 @@
-exports.up = (knex) => {
-  return knex.schema.table('bills', (table) => {
-    table.boolean('is_inclusive_tax').defaultTo(false);
-    table.decimal('tax_amount_withheld');
-  });
-};
-
-exports.down = (knex) => {
-  return knex.schema.table('bills', () => {});
-};
--- a/packages/server/src/database/migrations/20231004020636_add_sell_purchase_tax_to_items_table.js
+++ b/packages/server/src/database/migrations/20231004020636_add_sell_purchase_tax_to_items_table.js
@@ -1,18 +0,0 @@
-exports.up = (knex) => {
-  return knex.schema.table('items', (table) => {
-    table
-      .integer('sell_tax_rate_id')
-      .unsigned()
-      .references('id')
-      .inTable('tax_rates');
-    table
-      .integer('purchase_tax_rate_id')
-      .unsigned()
-      .references('id')
-      .inTable('tax_rates');
-  });
-};
-
-exports.down = (knex) => {
-  return knex.schema.dropTableIfExists('tax_rates');
-};
--- a/packages/server/src/database/migrations/20231108170207_create_documents_links.ts
+++ b/packages/server/src/database/migrations/20231108170207_create_documents_links.ts
@@ -1,14 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.createTable('document_links', (table) => {
-    table.increments('id').primary();
-    table.string('model_ref').notNullable();
-    table.string('model_id').notNullable();
-    table.integer('document_id').unsigned();
-    table.datetime('expires_at').nullable();
-    table.timestamps();
-  });
-};
-
-exports.down = function (knex) {
-  return knex.schema.dropTableIfExists('document_links');
-};
--- a/packages/server/src/database/migrations/20231108170207_create_documents_table.js
+++ b/packages/server/src/database/migrations/20231108170207_create_documents_table.js
@@ -1,14 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.createTable('documents', (table) => {
-    table.increments('id').primary();
-    table.string('key').notNullable();
-    table.string('mime_type').notNullable();
-    table.integer('size').unsigned();
-    table.string('origin_name');
-    table.timestamps();
-  });
-};
-
-exports.down = function (knex) {
-  return knex.schema.dropTableIfExists('documents');
-};
--- a/packages/server/src/database/migrations/20231202124014_change_item_entries_rate_to_float.js
+++ b/packages/server/src/database/migrations/20231202124014_change_item_entries_rate_to_float.js
@@ -1,9 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.alterTable('items_entries', (table) => {
-    table.decimal('rate', 15, 5).alter();
-  });
-};
-
-exports.down = function (knex) {
-  return knex.table('items_entries', (table) => {});
-};
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ahmed Bouhuolia	04b16a7d2f	Publish - @bigcapital/server@0.10.1 - @bigcapital/webapp@0.10.2	2023-10-03 22:07:42 +02:00
Ahmed Bouhuolia	fd27136274	tst	2023-10-03 22:06:33 +02:00
Ahmed Bouhuolia	951e360405	chore(webapp): add missing packages	2023-10-03 22:05:57 +02:00
Ahmed Bouhuolia	d2242b7744	WIP	2023-10-03 12:11:55 +02:00
Ahmed Bouhuolia	4e9b0ae24f	fix: migrate from `npm` to `pnpm`	2023-09-29 15:54:47 +02:00
Ahmed Bouhuolia	e5ffb5661a	feat: migrate to pnpm	2023-09-27 22:44:54 +02:00