From d6e2f01d70d2730f7d9e42d1f0f68aae7299f6c4 Mon Sep 17 00:00:00 2001
From: "a.bouhuolia" <a.bouhuolia@live.com>
Date: Thu, 11 May 2023 21:07:01 +0200
Subject: [PATCH] fix(server): accrual typo

---
 .../src/api/controllers/FinancialStatements/BalanceSheet.ts     | 2 +-
 packages/server/src/api/controllers/Organization.ts             | 2 +-
 .../src/database/seeds/core/20200810121809_seed_settings.ts     | 2 +-
 packages/server/src/interfaces/BalanceSheet.ts                  | 2 +-
 packages/server/src/interfaces/TrialBalanceSheet.ts             | 2 +-
 .../src/services/FinancialStatements/ProfitLossSheet/utils.ts   | 2 +-
 .../TrialBalanceSheet/TrialBalanceSheetService.ts               | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/server/src/api/controllers/FinancialStatements/BalanceSheet.ts b/packages/server/src/api/controllers/FinancialStatements/BalanceSheet.ts
index 51df3c9fa..bc9499889 100644
--- a/packages/server/src/api/controllers/FinancialStatements/BalanceSheet.ts
+++ b/packages/server/src/api/controllers/FinancialStatements/BalanceSheet.ts
@@ -41,7 +41,7 @@ export default class BalanceSheetStatementController extends BaseFinancialReport
   get balanceSheetValidationSchema(): ValidationChain[] {
     return [
       ...this.sheetNumberFormatValidationSchema,
-      query('accounting_method').optional().isIn(['cash', 'accural']),
+      query('accounting_method').optional().isIn(['cash', 'accrual']),
 
       query('from_date').optional(),
       query('to_date').optional(),
diff --git a/packages/server/src/api/controllers/Organization.ts b/packages/server/src/api/controllers/Organization.ts
index 6eda6d627..c746a0484 100644
--- a/packages/server/src/api/controllers/Organization.ts
+++ b/packages/server/src/api/controllers/Organization.ts
@@ -58,7 +58,7 @@ export default class OrganizationController extends BaseController {
   private get organizationValidationSchema(): ValidationChain[] {
     return [
       check('name').exists().trim(),
-      check('industry').optional().isString(),
+      check('industry').optional({ nullable: true }).isString().trim().escape(),
       check('location').exists().isString().isISO31661Alpha2(),
       check('base_currency').exists().isISO4217(),
       check('timezone').exists().isIn(moment.tz.names()),
diff --git a/packages/server/src/database/seeds/core/20200810121809_seed_settings.ts b/packages/server/src/database/seeds/core/20200810121809_seed_settings.ts
index 4e02409d0..534c4b584 100644
--- a/packages/server/src/database/seeds/core/20200810121809_seed_settings.ts
+++ b/packages/server/src/database/seeds/core/20200810121809_seed_settings.ts
@@ -8,7 +8,7 @@ export default class SeedSettings extends TenantSeeder {
   up() {
     const settings = [
       // Orgnization settings.
-      { group: 'organization', key: 'accounting_basis', value: 'accural' },
+      { group: 'organization', key: 'accounting_basis', value: 'accrual' },
 
       // Accounts settings.
       { group: 'accounts', key: 'account_code_unique', value: true },
diff --git a/packages/server/src/interfaces/BalanceSheet.ts b/packages/server/src/interfaces/BalanceSheet.ts
index a175c405f..dc2fe6f0b 100644
--- a/packages/server/src/interfaces/BalanceSheet.ts
+++ b/packages/server/src/interfaces/BalanceSheet.ts
@@ -44,7 +44,7 @@ export interface IBalanceSheetQuery extends IFinancialSheetBranchesQuery {
   numberFormat: INumberFormatQuery;
   noneTransactions: boolean;
   noneZero: boolean;
-  basis: 'cash' | 'accural';
+  basis: 'cash' | 'accrual';
   accountIds: number[];
 
   percentageOfColumn: boolean;
diff --git a/packages/server/src/interfaces/TrialBalanceSheet.ts b/packages/server/src/interfaces/TrialBalanceSheet.ts
index bd6c19331..a3cc37568 100644
--- a/packages/server/src/interfaces/TrialBalanceSheet.ts
+++ b/packages/server/src/interfaces/TrialBalanceSheet.ts
@@ -4,7 +4,7 @@ export interface ITrialBalanceSheetQuery {
   fromDate: Date | string;
   toDate: Date | string;
   numberFormat: INumberFormatQuery;
-  basis: 'cash' | 'accural';
+  basis: 'cash' | 'accrual';
   noneZero: boolean;
   noneTransactions: boolean;
   onlyActive: boolean;
diff --git a/packages/server/src/services/FinancialStatements/ProfitLossSheet/utils.ts b/packages/server/src/services/FinancialStatements/ProfitLossSheet/utils.ts
index b9a707f88..8f17be584 100644
--- a/packages/server/src/services/FinancialStatements/ProfitLossSheet/utils.ts
+++ b/packages/server/src/services/FinancialStatements/ProfitLossSheet/utils.ts
@@ -17,7 +17,7 @@ export const getDefaultPLQuery = (): IProfitLossSheetQuery => ({
     formatMoney: 'total',
     precision: 2,
   },
-  basis: 'accural',
+  basis: 'accrual',
 
   noneZero: false,
   noneTransactions: false,
diff --git a/packages/server/src/services/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetService.ts b/packages/server/src/services/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetService.ts
index bf7b9e611..e06ed6b02 100644
--- a/packages/server/src/services/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetService.ts
+++ b/packages/server/src/services/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetService.ts
@@ -35,7 +35,7 @@ export default class TrialBalanceSheetService extends FinancialSheet {
         formatMoney: 'total',
         precision: 2,
       },
-      basis: 'accural',
+      basis: 'accrual',
       noneZero: false,
       noneTransactions: true,
       onlyActive: false,